safecheck-client 3.0.35-6 → 3.0.35-61

package/src/filiale/xilan/pc.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 //手机特殊目录注册到该文件中
 let specialComp = {
   'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/yangchunboneng/pc/CheckPlanAreaList.vue

@@ -275,7 +275,7 @@
           <td style="text-align: center">{{model.sums.f_chaichu}}</td>
           <td style="text-align: center">{{model.sums.f_tingyong}}</td>
           <td style="text-align: center">{{model.sums.f_weitongqi}}</td>
-          <td style="text-align: center">{{model.sums.f_tingyong}}</td>
+          <td style="text-align: center">{{model.sums.f_jujian}}</td>
           <td style="text-align: center">{{model.sums.f_buyu}}</td>
           <td style="text-align: center">{{model.sums.f_buyu2}}</td>
           <td style="text-align: center">{{model.sums.f_buyu3}}</td>

package/src/filiale/zhongsheng/android/SafecheckDevices.vue

@@ -755,11 +755,11 @@ export default {
       if (Number(this.gasDeviation) < 0) {
         console.log("ww"+JSON.stringify(this.f_items[this.f_gas_aberrant_number.index].f_item_value))
         if (this.f_items[this.f_gas_aberrant_number.index].f_item_value < Number(this.gasDeviation)) {
-          this.f_items[this.f_gas_aberrant_number.index].f_is_defect = true
+          // this.f_items[this.f_gas_aberrant_number.index].f_is_defect = true
         }
       } else {
         if (Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value) > Number(this.gasDeviation)) {
-          this.f_items[this.f_gas_aberrant_number.index].f_is_defect = false
+          // this.f_items[this.f_gas_aberrant_number.index].f_is_defect = false
         }
       }
 
@@ -797,7 +797,7 @@ export default {
       //tag ===> ' + JSON.stringify(Number(this.feeDeviation)))
       // 计算差值是否在范围内
       if (Math.abs(this.f_items[this.f_fee_aberrant_number.index].f_item_value) > Number(this.feeDeviation)) {
-        this.f_items[this.f_fee_aberrant_number.index].f_is_defect = true
+        // this.f_items[this.f_fee_aberrant_number.index].f_is_defect = true
       }
 
       //tag)
@@ -825,7 +825,7 @@ export default {
       // 计算差值是否在范围内
       //tag)
       if (Math.abs(this.f_items[this.f_meter_aberrant_number1.index].f_item_value) > Number(this.meterbase)) {
-        this.f_items[this.f_meter_aberrant_number1.index].f_is_defect = true
+        // this.f_items[this.f_meter_aberrant_number1.index].f_is_defect = true
       }
 
       //tag)

package/src/filiale/zhongsheng/pc/CheckPlanAreaList.vue

@@ -108,6 +108,9 @@
               <label for="f_checker_name">安检员</label>
               <input type="checkbox" id="f_user_number" value="f_user_number" v-model="$parent.$parent.nameForSql"/>
               <label for="f_checker_name">档案数量</label>
+              <label style="float: right">计划用户数:{{$parent.$parent.plan_num}}</label>
+              <label style="float: right">已检数:{{$parent.$parent.yes_safe_num}}</label>
+              <label style="float: right">未检数:{{$parent.$parent.no_safe_num}}</label>
             </div>
           </div>
         </div>
@@ -198,6 +201,9 @@ export default {
       listflag:false,
       nameflag:false,
       criteriaShow: false,
+      plan_num:0,
+      yes_safe_num:0,
+      no_safe_num:0,
       f_check_start:'',
       f_check_end:'',
       planName:[{label: '全部', value: ''}],
@@ -307,13 +313,17 @@ export default {
       if (!this.f_orgid) {
         this.getorg([this.$login.f.orgid])
       }
+      let condition = '1=1'
       if (this.f_orgid) {
         args.condition = `f_filialeid  in ${this.f_orgid} and ${args.condition}`
+        condition += ` and tcpi.f_filialeid  in ${this.f_orgid}`
       }
       if(this.f_check_start){
+        condition += ` and f_plan_year>=${new Date(this.f_check_start).getFullYear()} and f_plan_month>=${new Date(this.f_check_start).getMonth()+1} `
         args.condition += ` and f_year>=${new Date(this.f_check_start).getFullYear()} and f_month>=${new Date(this.f_check_start).getMonth()+1} `
       }
       if(this.f_check_end){
+        condition += ` and f_plan_year<=${new Date(this.f_check_end).getFullYear()} and f_plan_month<=${new Date(this.f_check_end).getMonth()+1} `
         args.condition += ` and f_year<=${new Date(this.f_check_end).getFullYear()} and f_month<=${new Date(this.f_check_end).getMonth()+1} `
       }
       this.$refs.paged.$refs.grid.$el.scrollTop = 0
@@ -322,10 +332,32 @@ export default {
         this.$showMessage("请至少选择一项进行汇总")
         return
       }
+      if (args.model.f_residential_area){
+        condition += ` and tcpi.f_residential_area like '%${args.model.f_residential_area}%'`
+      }
+      if (args.model.f_plan_name){
+        condition += ` and tcp.id = '${args.model.f_plan_name}'`
+      }
       this.model.paramSource = {groupName: `'${this.groupNameForSql}'`}
       this.model.search(args.condition, args.model)
+      this.initNum(condition)
+    },
+    initNum(condition){
+      new HttpResetClass().load('POST', `rs/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: "count(0) as num,sum(case when f_state = '已检' then 1 else 0 end) as yj,sum(case when f_state = '未检' then 1 else 0 end) as wj",
+          tablename: "t_check_plan_item tcpi left join t_check_plan tcp on tcpi.f_plan_id = tcp.id",
+          condition: `${condition}`,
+          orderitem: "1"
+        }
+      }, {resolveMsg: null, rejectMsg: null}).then(response=>{
+        this.plan_num = response.data[0].num || 0
+        this.yes_safe_num = response.data[0].yj || 0
+        this.no_safe_num = response.data[0].wj || 0
+      }).catch(error=>{
+        debugger
+      })
     },
-
     // 拼接groupName1
     getGroupName1 () {
       var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']

package/src/main.js

@@ -11,7 +11,7 @@ all()
 var Verificationfalg = false
 system(Verificationfalg)
 // system()
-safecheck('bayan')
+safecheck('fugou')
 // safecheck('rizhao')
 require('./bootstrap/less/bootstrap.less')
 require('./expandcss.less')