safecheck-client 3.0.35-21 → 3.0.35-24

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.35-21",
+  "version": "3.0.35-24",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/components/android/CheckPlanDown.vue

@@ -86,7 +86,7 @@ export default {
   title: '共享计划下载',
   data () {
     return {
-      model: new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/getShareCheckPlan`,5,{f_fengongsi:`'${Vue.user.orgid}'`}),
+      model: new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/getShareCheckPlan`,5,{f_fengongsi:`'${Vue.user.orgid}'`,checkerid:`'${Vue.user.id}'`}),
       checkPlanInfo: [],
       localcheckPlanInfo:[]
     }

package/src/components/planmanage/PlanManage.vue

@@ -251,6 +251,18 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-4" v-show="createPlan.isShare=='是' && ismulchecker">
+              <label class="font_normal_body">安&ensp;检&ensp;员:</label>
+              <v-select
+                class="select select_list"
+                :value.sync="createPlan.checkers"
+                v-model="createPlan.checkers"
+                :options='checker'
+                placeholder='请选择'
+                :multiple="true"
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4" v-show="createPlan.isShare=='否'">
               <label class="font_normal_body">安&ensp;检&ensp;员:</label>
               <v-select
@@ -350,6 +362,18 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-4" v-show="upCheckPlan.isShare=='是' && ismulchecker">
+              <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
@@ -396,6 +420,7 @@
         title: '计划管理',
         data() {
           return {
+            ismulchecker:this.$appdata.getSingleValue('计划安检员多选')?true:false,
             a:'1',
             opt:[{label:"按时间降序",value:"按时间降序"},{label:"按时间升序",value:"按时间升序"}],
             currentorder:'按时间降序',
@@ -410,7 +435,9 @@
               f_checker_id:'',
               isShare:'',
               f_checker:'',
-              checker:{}
+              f_checkerstr:'',
+              checker:{},
+              checkers:[]
             },
             isSend:false,
             createPlan:{
@@ -421,7 +448,9 @@
               f_issued:'否',
               f_checker_id:null,
               checker:{},
+              checkers:[],
               f_checker:null,
+              f_checkerstr:null,
               f_safecheck_type:'',
             },
             planCondition:{},
@@ -523,6 +552,12 @@
             return
           }
           if(this.createPlan.isShare=="是"){
+              if(this.ismulchecker && this.createPlan.checkers.length > 0){
+                this.createPlan.checkers.forEach((value) => {
+                  this.createPlan.f_checkerstr += `${value},`
+                })
+                this.createPlan.f_checkerstr = this.createPlan.f_checkerstr.slice(0, -1)
+              }
             this.createPlan.f_checker_id=null
             this.createPlan.f_checker=null
           }else{
@@ -545,7 +580,9 @@
               f_issued:'否',
               f_checker_id:null,
               checker:{},
+              checkers:[],
               f_checker:null,
+              f_checkerstr:null,
               f_safecheck_type:'',
               f_create_operator:''
           }
@@ -608,7 +645,7 @@
         //按条件查询所有安检计划
         async loadCheckPlan() {
           this.isSend=true
-          this.checkplan.check.checkes=[]
+          this.checkplan.check.checkescheckes=[]
           let fieldValue=''
           switch(this.currentorder){
             case "按时间降序":
@@ -677,6 +714,12 @@
           console.log(this.upCheckPlan)
 
           if(this.upCheckPlan.isShare=="是"){
+            if(this.ismulchecker && this.upCheckPlan.checkers.length > 0){
+              this.upCheckPlan.checkers.forEach((value) => {
+                this.upCheckPlan.f_checkerstr += `${value},`
+              })
+              this.upCheckPlan.f_checkerstr = this.upCheckPlan.f_checkerstr.slice(0, -1)
+            }
             this.upCheckPlan.f_checker_id=null
             this.upCheckPlan.f_checker=null
           }else{
@@ -686,6 +729,8 @@
           this.isSend=true
           let res=await new HttpResetClass().load("POST", "/rs/logic/updateCheckPlan", {
             data:{
+              checkers:this.createPlan.checkers,
+              f_checkerstr:this.createPlan.f_checkerstr,
               f_checker:this.upCheckPlan.f_checker,
               f_safecheck_type:this.upCheckPlan.f_safecheck_type,
               f_checker_id:this.upCheckPlan.f_checker_id,

package/src/components/report/CheckPlanAreaList.vue

@@ -172,12 +172,21 @@
             <td style="text-align:center">{{row.f_buyu}}</td>
             <td style="text-align:center"><nobr>{{row.f_jujian}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
-            <!--<td style="text-align: center;">-->
-            <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showhistory(row)">查看</button>-->
-            <!--</td>-->
           </tr>
         </template>
-        <template partial='foot'></template>
+        <template partial="foot">
+          <tr>
+            <td  style="text-align:center"><strong>合计：</strong></td>
+            <td  style="text-align:center" :colspan="$parent.$parent.$parent.nameForSql.length"></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_plan_total}}</strong></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_weijian}}</strong></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_yijian}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_ruhu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_buyu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_jujian}}</strong></nobr></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_plan_total>0?(model.sums.f_yijian/model.sums.f_plan_total*100).toFixed(2)+'%':0}}</strong></td>
+          </tr >
+        </template>
       </data-grid>
     </criteria-paged>
   </div>
@@ -194,7 +203,7 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999),
+        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         row: {},
@@ -437,7 +446,18 @@
         }
         //tag
         this.model.rows=JSON.parse(JSON.stringify(temp))
+      },
+    'model.rows.length'() {
+      // 如果查询无结果，将合计置为0
+      if(this.model.rows.length < 1){
+        this.model.sums.f_plan_total = 0
+        this.model.sums.f_weijian = 0
+        this.model.sums.f_yijian = 0
+        this.model.sums.f_ruhu = 0
+        this.model.sums.f_buyu = 0
+        this.model.sums.f_jujian = 0
       }
+    }
     },
     computed:{
       exportParameter(){