safecheck-client 3.0.33-gongyi → 3.0.35-gongyi-1

package/src/components/planmanage/PlanManage.vue

@@ -23,12 +23,12 @@
             <table style="width:100%;table-layout:fixed" >
               <tr class="safe-planfont">
                 <td rowspan="4"><input type="checkbox" style="pointer-events:auto" v-show="row.plan_count==0 || row.f_issued=='未下发'"  onClick="event.cancelBubble = true" :checked="checkplan.check.isChecked(row.f_check_item_id)"  @change="checkplan.check.setCheckes(row.id)"/></td>
-                <td colspan="6" class="safe_p">{{row.f_plan_name}}</td>
+                <td colspan="6" class="safe_p"><span :title="row.f_plan_name">{{row.f_plan_name}}</span></td>
                 <td colspan="2" style="text-align: center"><img width="20px" style="pointer-events:auto" onClick="event.cancelBubble = true" @click="showUpPlans(row)" src="../../../static/images/edit.png"/></td>
               </tr>
               <tr class="safe-bodyfont" style="color:#4792de">
                 <td colspan="6">{{row.f_issued}}</td>
-                <td colspan="2" class="safe_p">{{row.f_checker?row.f_checker:'共享'}}</td>
+                <td colspan="2" class="safe_p"><span :title="row.f_checker">{{row.f_checker?row.f_checker:'共享'}}</span></td>
               </tr>
               <tr class="safe-bodyfont">
                 <td colspan="4">{{row.f_plan_year}}-{{row.f_plan_month}}</td>
@@ -59,7 +59,7 @@
         </div>
       </div>
       <!--右侧列表**************************************************************************-->
-      <div class="binary-right" style="width: 84%;overflow: auto">
+      <div class="binary-right" style="width: 84%;overflow: hidden">
         <div style="height: 5%">
           <div class="col-sm-4">
             <label class="font_normal_body">公&emsp;&emsp;司</label>
@@ -266,6 +266,12 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">所属科室:</label>
+              <right-tree islist :source="source"  v-on:re-res="reres" :textContent="'选择科室'" v-ref:f_reciever>
+              </right-tree>
+            </div>
+
           </div>
         </div>
         <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -367,6 +373,8 @@
               checker:{},
               f_checker:null,
               f_safecheck_type:'',
+              f_depid:'',
+              f_dep:''
             },
             planCondition:{},
             showCondtion:false,
@@ -384,7 +392,10 @@
               name:this.$login.f.name,
               orgid:this.$login.f.orgid,
               orgstr:this.$login.f.orgs,
-            }
+            },
+            source:
+              'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
+              'tool.getFullTree(dep.where(row.hasSpecialRole($安检册二次分配$)))',
             //需要测试直接把下面放开即可
             /*userlogin:{
               id:'141701',
@@ -398,6 +409,18 @@
         await this.loadpage()
       },
       methods:{
+        reres(val) {
+          if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined' || val.resids.length>1){
+            return
+          }
+          console.log('val2',val)
+          const resids = val.orgobj.filter(res=>res.resourcetype==='department')
+          console.log('val2',resids)
+          if (resids.length>0){
+            this.createPlan.f_depid = resids[0].id
+            this.createPlan.f_dep = resids[0].name
+          }
+        },
         async loadpage(){
           //await this.checkplan.searchList("/rs/sql/预约计划下发", {},{groupitem:"",f_filialeids:"('"+this.userlogin.orgid+"')",orderitem:"f_create_time desc"})
           await this.loadCheckPlan()
@@ -473,7 +496,9 @@
               f_checker_id:null,
               checker:{},
               f_checker:null,
-              f_safecheck_type:''
+              f_safecheck_type:'',
+              f_depid:'',
+              f_dep:''
           }
           await this.loadCheckPlan()
           this.isSend=false
@@ -504,6 +529,10 @@
             Vue.showMessage("请选择安检类型！")
             return false
           }
+          if(!this.createPlan.f_depid){
+            Vue.showMessage("请选择所属安检科室！")
+            return false
+          }
           return true
         },
         //查询安检员selectChanged