safecheck-client 3.0.35-56 → 3.0.35-58

package/src/filiale/siyang/pc/PlanManage.vue

@@ -307,7 +307,7 @@
             </div>
             <div class="form-group col-sm-4" >
               <label class="font_normal_body">计划年份:</label>
-           <v-select
+              <v-select
                 class="select select_list"
                 :value.sync="upCheckPlan.f_plan_year"
                 v-model="upCheckPlan.f_plan_year"
@@ -317,18 +317,7 @@
 
                 close-on-select
                 value-single>
-
-
               </v-select>
-<!--              <datepicker
-                placeholder='请选择'
-                style="width:60%"
-                :disabled-days-of-week="[]"
-                :format="'yyyy'"
-                :show-rest-button="reset"
-                :value.sync="upCheckPlan.f_plan_year"
-                v-model="upCheckPlan.f_plan_year">
-              </datepicker>-->
             </div>
             <div class="form-group col-sm-4" >
               <label class="font_normal_body">计划月份:</label>
@@ -356,6 +345,18 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-4" v-show="upCheckPlan.isShare=='是'">
+              <label class="font_normal_body">安&ensp;检&ensp;员:</label>
+              <v-select
+                class="select select_list"
+                :value.sync="upCheckPlan.checkers"
+                v-model="upCheckPlan.checkers"
+                :options='checker'
+                placeholder='请选择'
+                :multiple="true"
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4" v-show="upCheckPlan.isShare=='否'">
               <label class="font_normal_body">安&ensp;检&ensp;员:</label>
               <v-select
@@ -654,10 +655,10 @@
           this.showUpPlan=true
         },
         async upPlan(){
-          if(this.upCheckPlan.f_issued=='已下发'){
-            this.$showMessage("该计划已下发，无法进行修改！")
-            return
-          }
+          // if(this.upCheckPlan.f_issued=='已下发'){
+          //   this.$showMessage("该计划已下发，无法进行修改！")
+          //   return
+          // }
           if(!this.upCheckPlan.f_plan_name){
             Vue.showMessage("请输入安检计划名称！")
             return false
@@ -673,6 +674,12 @@
           console.log(this.upCheckPlan)
 
           if(this.upCheckPlan.isShare=="是"){
+            if(this.upCheckPlan.checkers.length > 0){
+              this.upCheckPlan.checkers.forEach((value) => {
+                this.upCheckPlan.f_checkerstr += `${value.name},`
+              })
+              this.upCheckPlan.f_checkerstr = this.upCheckPlan.f_checkerstr.slice(0, -1)
+            }
             this.upCheckPlan.f_checker_id=null
             this.upCheckPlan.f_checker=null
           }else{
@@ -682,7 +689,10 @@
           this.isSend=true
           let res=await new HttpResetClass().load("POST", "/rs/logic/updateCheckPlan", {
             data:{
+              issued:'true',
+              checkers:this.upCheckPlan.checkers,
               f_checker:this.upCheckPlan.f_checker,
+              f_checkerstr:this.upCheckPlan.f_checkerstr,
               f_safecheck_type:this.upCheckPlan.f_safecheck_type,
               f_checker_id:this.upCheckPlan.f_checker_id,
               f_plan_name:this.upCheckPlan.f_plan_name,

package/src/safecheck.js

@@ -300,6 +300,9 @@ export default function (filiale) {
   Vue.component('security-check-ledger2', (resolve) => {
     require(['./components/pc/SecurityCheckList'], resolve)
   })
+  Vue.component('security-check-ledger3', (resolve) => {
+    require(['./components/pc/SecurityCheckUser'], resolve)
+  })
   Vue.component('security-check-ledger1', (resolve) => {
     require(['./components/pc/SecurityCheckLedger'], resolve)
   })