safecheck-client 3.0.33-99 → 3.0.34-1

package/src/filiale/liaoyuan/pc.js

@@ -1,18 +1,18 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  'defect-list-weixiu': (resolve) => { require(['./pc/DefectListWeixiu'], resolve) },
-  'defect-paper-weixiu': (resolve) => { require(['./pc/DefectPaperWeiXiu'], resolve) },
-  'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
-  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
-  'check-search-user':(resolve) => {require(['./pc/CheckSearchUser'], resolve)},
-  'role-selector-safe':(resolve) => {require(['./pc/RoleSelector.vue'], resolve)},
-  'check-plan-list':(resolve) => {require(['./pc/checkPlanList'], resolve)}
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'defect-list-weixiu': (resolve) => { require(['./pc/DefectListWeixiu'], resolve) },
+  'defect-paper-weixiu': (resolve) => { require(['./pc/DefectPaperWeiXiu'], resolve) },
+  'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
+  'check-search-user':(resolve) => {require(['./pc/CheckSearchUser'], resolve)},
+  'role-selector-safe':(resolve) => {require(['./pc/RoleSelector.vue'], resolve)},
+  'check-plan-list':(resolve) => {require(['./pc/checkPlanList'], resolve)}
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/qianneng/pc/PaperList.vue

@@ -149,9 +149,21 @@
                 @re-res="$parent.$parent.getRes"
                 :value.sync="model.f_checker_id"
                 v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
+                :value-multiple="true"
+                :value-close="false"
+                condition="f_checker_name in {}">
               </role-selector-safe>
             </div>
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">部&emsp;&emsp;门</label>
+                <v-select class="select_list select"
+                          placeholder='部门' style="width: 60%"
+                          :value.sync="model.f_department_name" v-model="model.f_department_name"
+                          :options='$parent.$parent.deplist'
+                          condition="f_department_name in {}"
+                          :multiple="true">
+                </v-select>
+              </div>
             <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
               <label class="font_normal_body">片&emsp;&emsp;区</label>
               <v-select class="select_list select"
@@ -514,10 +526,27 @@
           f_offsite_time: 'no'
         },
         sliceArea: [],
+        deplist:[],
         cbc:[]
       }
     },
     methods: {
+      /*获取部门*/
+    getdep(){
+     let http= new HttpResetClass()
+      http.load('POST', '/rs/sql/safe_singleTable_OrderBy',
+        {data:
+            {
+              items:"*",
+              tablename:"t_department",
+              orderitem:"id",
+              condition:`parentid = '${this.$login.f.orgid}'`}
+        }, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+         res.data.forEach((result)=>{
+           this.deplist.push({label:result.name,value:result.name})
+         })
+       })
+      },
       //获取省市区列表
       getPcd(val){
         this.pcds = [{label:'全部',value:''}]
@@ -704,6 +733,7 @@
       //this.pianqu()
       this.Mreadibook(`('${this.$login.f.orgid}')`)
       co(gen)
+     this.getdep()
     },
     watch: {
       'model.f_no_checkplan'(val) {