safecheck-client 3.0.33-gongyi → 3.0.34-gongyi

package/src/components/paper/PaperList.vue

@@ -217,6 +217,11 @@
                           :value-single="true">
                 </v-select>
               </div>
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">安检科室</label>
+                <right-tree-safe islist  :source="$parent.$parent.source"  v-on:re-res="$parent.$parent.reres2" :textContent="'选择科室'" >
+                </right-tree-safe>
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -411,14 +416,30 @@
           f_offsite_time: 'no'
         },
         sliceArea: [],
+        f_dep:'',
         cbc:[],
         housetype: [],
         positions: [],
         userTypes: [],
+        source:
+          'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
+          'tool.getFullTree(dep.where(row.hasSpecialRole($安检册二次分配$)))',
         meter_classifys:[]//气表类型
       }
     },
     methods: {
+      reres2(val){
+        if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined' || !val.resids[0] || val.resids.length>1){
+          console.log('未选择',val)
+          this.f_dep = ''
+          return
+        }
+        console.log('val2',val)
+        const resids = val.orgobj.filter(res=>res.resourcetype==='department')
+        if (resids.length>0){
+          this.f_dep = resids[0].name
+        }
+      },
       setConList(){
         this.userTypes=this.$appdata.getParam('用户类型') ? [{
           label: '全部',
@@ -676,6 +697,9 @@
       selfSearch(args) {
         //console.log("9999999999999999")
         //args.condition+=" and f_check_type='民用'"
+        if(this.f_dep){
+          args.condition += ` and f_dep='${this.f_dep}'`
+        }
         this.model.search(args.condition, args.model, args.condValue)
       }
     },

package/src/components/pc/CheckBookList.vue

@@ -15,10 +15,10 @@
                 condition=" f_checker_name = '{}'">
               </role-selector-safe>
             </div>
-            <div :class="$parent.$parent.style">
+            <div :class="$parent.$parent.style" v-if="$parent.$parent.permission === 'c1'">
               <label class="font_normal_body">安检科室</label>
-              <right-tree islist :userid="$parent.$parent.userid" :source="$parent.$parent.source"  v-on:re-res="$parent.$parent.reres2" :textContent="'选择科室'" :selectData="''" v-ref:f_reciever>
-              </right-tree>
+              <right-tree-safe islist :userid="$parent.$parent.userid" :source="$parent.$parent.source"  v-on:re-res="$parent.$parent.reres2" :textContent="'选择科室'" :selectData="''" v-ref:f_reciever>
+              </right-tree-safe>
           </div>
 
             <div :class="$parent.$parent.style"   >
@@ -105,10 +105,10 @@
 
           </div>
           <div class="row" v-show="$parent.$parent.$parent.showItem">
-            <div :class="$parent.$parent.style">
+            <div :class="$parent.$parent.style"  v-if="$parent.$parent.permission === 'c1'">
               <label class="font_normal_body">安检科室</label>
-              <right-tree islist :userid="$parent.$parent.userid" :source="$parent.$parent.source"  v-on:re-res="$parent.$parent.reres2" :textContent="选择科室" :selectData="''" v-ref:f_reciever>
-              </right-tree>
+              <right-tree-safe islist :userid="$parent.$parent.userid" :source="$parent.$parent.source"  v-on:re-res="$parent.$parent.reres2" :textContent="选择科室" :selectData="''" v-ref:f_reciever>
+              </right-tree-safe>
             </div>
 
             <div :class="$parent.$parent.style"   >
@@ -151,6 +151,9 @@
             <th>
               <nobr>创建人</nobr>
             </th>
+            <th>
+              <nobr>所属科室</nobr>
+            </th>
             <th>
               <nobr>所属安检员</nobr>
             </th>
@@ -172,6 +175,7 @@
           <td  style="text-align: center;">{{ row.f_check_book_name }}</td>
           <td  style="text-align: center;">{{ row.f_create_date }}</td>
           <td  style="text-align: center;">{{ row.f_create_person }}</td>
+          <td  style="text-align: center;">{{ row.f_dep }}</td>
           <td  style="text-align: center;">{{ row.f_checker_name }}</td>
           <td  style="text-align: center;">{{ row.f_run_date }}</td>
           <td  style="text-align: center;">{{ row.f_around_time }}{{ row.f_around_unit }}</td>
@@ -200,8 +204,8 @@
             <!--            </div>-->
             <div class="col-sm-6 form-group"  style="margin-top: 20px" v-if="permission === 'c1' && showModal ">
               <label class="font_normal_body">安检科室</label>
-              <right-tree islist :userid="userid" :source="source"  v-on:re-res="reres" :textContent="选择科室" :selectData="" v-ref:f_reciever>
-              </right-tree>
+              <right-tree-safe islist :userid="userid" :source="source"  v-on:re-res="reres" :textContent="'选择科室'" :select-data="{id:checkBook.f_depid}" v-ref:f_reciever>
+              </right-tree-safe>
             </div>
             <div class="col-sm-6 form-group"  style="margin-top: 20px" v-if="permission === 'c2' ">
               <label class="font_normal_body">安&ensp;检&ensp;员</label>
@@ -325,7 +329,7 @@ export default {
   },
   methods: {
     reres(val) {
-      if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined'){
+      if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined' || val.resids.length>1){
         return
       }
       console.log('val2',val)
@@ -337,7 +341,9 @@ export default {
     }
     },
     reres2(val){
-      if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined'){
+      if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined' || !val.resids[0] || val.resids.length>1){
+        console.log('未选择',val)
+        this.f_depid = ''
         return
       }
       console.log('val2',val)
@@ -347,6 +353,10 @@ export default {
       }
     },
     topPlanItem(val){
+      if(!val.f_depid){
+        this.$showMessage('请补全科室后在进行下发')
+        return
+      }
       this.isSend = true
       console.log('val', val)
 
@@ -365,7 +375,9 @@ export default {
         f_create_time : Util.toStandardDateString(),
         f_safecheck_type : '年度普检',
         f_checker : checkBook.f_checker_name,
-        f_checker_id:checkBook.f_checker_id
+        f_checker_id:checkBook.f_checker_id,
+        f_depid:checkBook.f_depid,
+        f_dep:checkBook.f_dep
       }
 
       if (checkBook.f_around_unit === '年'){
@@ -468,6 +480,7 @@ export default {
         f_create_person: '',
         f_orgid: '',
         f_depid:'',
+        f_dep:'',
         f_checker_name: '',
         f_checker_id:''
       }
@@ -478,7 +491,9 @@ export default {
 
     },
     updateCheckBook(val){
+      console.log(val)
       this.checkBook=val
+      console.log(this.checkBook)
       this.showModal = true
     },
     search (args) {
@@ -489,7 +504,6 @@ export default {
       }
       if (this.f_depid && this.permission === 'c1'){
         args.condition +=` and tcb.f_depid = '${this.f_depid}'`
-
       }
       return this.model.search(args.condition, args.model)
     },