safecheck-client 3.0.32-25 → 3.0.32-26

package/package.json

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

package/src/components/rongcheng/DefectPaper.vue

@@ -407,7 +407,7 @@
         defectType:[],
         userTypes:[{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
         defectLeave:'',
-        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'}],
+        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'},{label: '其他隐患'}],
         thead: '',
         headData: ['入户状态','用户名','用户电话','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','一级隐患数','一级隐患','二级隐患数','二级隐患','三级隐患数','三级隐患','其他隐患','隐患内容'],
         bodyData: ['f_entry_status','f_user_name','f_user_phone','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_fist_count','f_fist_content','f_second_count','f_second_content','f_third_count','f_third_content','f_other_count','f_defect_content'],
@@ -468,6 +468,9 @@
           if(this.defectLeave=='三级隐患'){
             args.condition += ` and f_third_count > 0`
           }
+          if(this.defectLeave=='其他隐患'){
+            args.condition += ` and f_other_count > 0`
+          }
         }
         if(this.defectType.length>0){
           args.condition += ` and (`

package/src/components/rongcheng/SafecheckUserInfo.vue

@@ -51,6 +51,7 @@
                      v-model="f_usetype"
                      width="67%"
                      placeholder='请选择'
+                     :value-single="true"
                      :options="f_usetypes"
                      clear-button></v-select>
         </div>

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

@@ -771,7 +771,7 @@ export default {
       //tag ===> ' + JSON.stringify(Number(this.gasDeviation)))
       // 计算差值是否在范围内
       if (Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value) > Number(this.gasDeviation)|| Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value) < Number(this.gasDeviation) * -1) {
-        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
         this.f_items[this.f_gas_aberrant_number.index].f_deal_dispose = '未处理'
         this.$showMessage('有差值请再次核对')
         if (this.paper.f_meter_type.indexOf('卡表') > 0 && Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value) <= 1){
@@ -816,7 +816,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
         this.f_items[this.f_fee_aberrant_number.index].f_deal_dispose = '未处理'
         this.$showMessage('有差值请再次核对')
         if (this.paper.f_meter_type.indexOf('卡表') > 0 && Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value) <= 1){
@@ -851,7 +851,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
         this.f_items[this.f_fee_aberrant_number.index].f_deal_dispose = '未处理'
         this.$showMessage('有差值请再次核对')
         if (this.paper.f_meter_type.indexOf('卡表') > 0 && Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value) <= 1){
@@ -889,7 +889,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
         this.$showMessage('有差值请再次核对')
         if (this.paper.f_meter_type.indexOf('卡表') > 0 && Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value) <= 1){
           this.f_items[this.f_gas_aberrant_number.index].f_is_defect = false
@@ -1128,6 +1128,15 @@ export default {
             } else if (this.f_items[f].f_item_name == '累购金额') {
               //tag)
               this.f_total_fee.index = f
+            }else if(this.f_items[f].f_item_name == '表基数'){
+              this.f_fee_base.index = f
+              this.$watch('f_items[' + f + '].f_item_value', function () {
+                this.getFeeAberrantNumber('已用金额')
+              })
+              this.f_table_base.index = f
+              this.$watch('f_items[' + f + '].f_item_value', function () {
+                this.getGasAberrantNumber('已用气量')
+              })
             } else if (this.f_items[f].f_item_name == '已用金额') {
               //tag)
               this.f_fee_base.index = f