safecheck-client 3.0.33-gongyi → 3.0.34-1

package/src/components/rongcheng/SafecheckDevices.vue

@@ -34,7 +34,7 @@
                             v-if="row.type == 'date'"
                             v-show="row.isshow"
                             :disabled-days-of-Week="[]"
-                            :format="'yyyy-MM-dd 00:00:00'"
+                            :format=row.format
                             :show-reset-button="reset" readonly="readonly">
                 </datepicker>
               </div>
@@ -222,6 +222,12 @@
         f_issue_reading:{},
         //上期表读数
         f_prior_reading:{},
+        // 安装日期
+        f_install_date:{},
+        // 使用年限
+        f_use_limit:{},
+        // 到期日期
+        f_scrap_date:{},
         // 气量异常差值允许误差
         gasDeviation: (
           function (_this) {
@@ -371,7 +377,7 @@
         }
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
-        console.log('this.f_items[prop]:' + prop)
+        //tag
         let fileName
         if(order==1 && (!this.f_items[prop].f_path || this.f_items[prop].f_path.includes("nopic.png"))) {
           fileName = Util.guid() + '-' + 'device'+this.device.n + '-' + this.idx + '-'+'f_items'+prop+ '.jpg'
@@ -386,22 +392,22 @@
         })
       },
       cameraCallBack(prop, fileName,order) {
-        console.log("传入参数---"+order)
+        //tag
         if(order==2){
           HostApp.__this__.$set( 'f_items['+prop+'].f_second_path', fileName + '?' + Math.random())
-          console.log("path11111111111111111111111111:"+this.f_items[prop].f_second_path)
-          console.log(HostApp.__this__.f_items[prop].f_second_path)
+          //tag
+          //tag
         }else{
           HostApp.__this__.$set( 'f_items['+prop+'].f_path', fileName + '?' + Math.random())
-          console.log("path000000000000000000000000000:"+this.f_items[prop].f_path)
-          console.log(HostApp.__this__.f_items[prop].f_path)
+          //tag
+          //tag
         }
         HostApp.__callback__ = null
         HostApp.__this__ = null
       },
       delfile(prop, fileName,order) {
-        console.log('照片路径')
-        console.log(JSON.stringify(fileName))
+        //tag
+        //tag)
         if(fileName == Vue.nopic)
           return
         else {
@@ -445,11 +451,11 @@
             // 监听下拉框，如果有隐患，需要拍照
             this.$watch('f_items['+n+'].selected',function(val) {
                 // 下拉框值
-                console.log('val'+JSON.stringify(val))
+                //tag)
                 // 下拉框所属设备
-                console.log('this.piece.f_device_type==》'+this.piece.f_device_type)
+                //tag
                 // 下拉框所属项
-                console.log('this.f_items[n].f_item_name==》'+this.f_items[n].f_item_name)
+                //tag
                 let shImage = false
                 if(val.indexOf('其他') == -1){
                   this.f_items[n].f_else = ''
@@ -472,7 +478,7 @@
                       }else if (this.config[this.device.device].items[item].type == 'inputSelector'){
                         value = val
                       }
-                      console.log('options[i]'+JSON.stringify(options[i]))
+                      //tag)
                       // 如果未选择，清空图片、隐患信息等
                       if((type == 'selector' && val.length == 0) || (type == 'inputSelector' && val == '')){
                         this.f_items[n].f_path = ''
@@ -483,14 +489,14 @@
                       }
                       if((type == 'selector' && multiple == false && options[i].data == val[0]) || (type == 'inputSelector' && options[i].data == val) || (type == 'selector' && multiple == true && val.indexOf(options[i].data) > -1)){
                         // 找到选中的项了
-                        console.log('firstIf')
+                        //tag
                         if(options[i].isdefect == true ){
                           shImage = true
                         }
                         if(options[i].isdefect == false || this.f_items[n].f_item_value == ''){
                           shImage = false
                         }
-                        console.log('shImage'+shImage)
+                        //tag
                         if(shImage){
                           this.f_items[n].f_is_defect =true
                           this.f_items[n].f_defect_level = options[i].level
@@ -511,7 +517,7 @@
               }
             )
             // this.$watch('other',function(val){
-            //   console.log('other val===>'+val)
+            //   //tag
             //   if(this.selectindex != null) {
             //     let index = this.f_items[this.selectindex].f_item_value.indexOf('其他')
             //     if(index > -1){
@@ -523,11 +529,11 @@
           }else if(this.f_items[n].type  == 'radio') {
             // 监听单选框，如果有隐患，需要拍照
             this.$watch('f_items[' + n + '].f_item_value', function (val) {
-              console.log('radio selected ===> ' + JSON.stringify(val))
+              //tag)
               let options = this.f_items[n].options
-              console.log('this.f_items[n].options ===> ' + JSON.stringify(this.f_items[n].options))
+              //tag)
               for (let i = 0; i < options.length; i++) {
-                console.log('option ===> ' + JSON.stringify(options[i]))
+                //tag)
                 // 找到选中的项了
                 if (options[i].value == val) {
                   // 如果有隐患，拍图片
@@ -537,7 +543,7 @@
                     this.f_items[n].f_path = Vue.nopic
                     this.f_items[n].f_live_dispose = '否'
                     this.f_items[n].tooltip = options[i].tooltip
-                    console.log('this.f_items[n] ===> ' + JSON.stringify(this.f_items[n]))
+                    //tag)
                     return
                   }
                 }
@@ -551,14 +557,14 @@
           }else if(this.f_items[n].type  == 'checkbox') {
             // 监听单选框，如果有隐患，需要拍照
             this.$watch('f_items[' + n + '].f_item_value', function (val) {
-              console.log('checkbox selected ===> ' + JSON.stringify(val))
+              //tag)
               // 如果是手动赋值，不执行下面逻辑
               if (this.f_items[n].isReSet) {
                 this.f_items[n].isReSet = false
                 return
               }
               let options = this.f_items[n].options
-              console.log('this.f_items[n].options ===> ' + JSON.stringify(this.f_items[n].options))
+              //tag)
               // 取出选中项中有隐患的详细信息
               let selected = options.filter(item => { return val.indexOf(item.value) != -1 && item.isdefect })
 
@@ -586,7 +592,7 @@
                   this.f_items[n].f_live_dispose = '否'
                   this.f_items[n].tooltip = selected[0].tooltip
                 }
-                console.log('this.f_items[n] ===> ' + JSON.stringify(this.f_items[n]))
+                //tag)
                 return
               }
               this.f_items[n].f_path = ''
@@ -597,21 +603,21 @@
             })
           }
         }
-        console.log('deviceitem.f_items=====>'+JSON.stringify(this.f_items))
+        //tag)
       },
       //计算已用气量/金额
       getTableBaseNumber() {
-        console.log('检测本期表读数发生变化了 ===> ')
+        //tag
         if(!this.f_items[this.f_issue_reading.index].f_item_value || parseFloat(this.f_items[this.f_prior_reading.index].f_item_value).toString() == "NaN"){
           return
         }
-        console.log('检测本期表读数发生变化了 ===>2 ')
+        //tag
         //判断是金额表还是气量表
         if(this.item.f_plan_meters[0].f_meter_type=='机表' || this.item.f_plan_meters[0].f_collection_type=='按气量'){
-          console.log("气量表")
-          console.log("气量表1"+this.f_items[this.f_table_base.index].f_item_value)
-          console.log("气量表2"+this.f_items[this.f_issue_reading.index].f_item_value)
-          console.log("气量表3"+this.f_items[this.f_prior_reading.index].f_item_value)
+          //tag
+          //tag
+          //tag
+          //tag
           // 先清空
           this.f_items[this.f_table_base.index].f_item_value = null
           //已用气量=本期表读数-上期表读数
@@ -620,20 +626,19 @@
             this.f_items[this.f_table_base.index].f_item_value = null
           }
         }else{
-          console.log("金额表")
           // 先清空
-          this.f_items[this.f_fee_base.index].f_item_value = null
+          // this.f_items[this.f_fee_base.index].f_item_value = null
           //已用金额=本期表读数-上期表读数
-          this.f_items[this.f_fee_base.index].f_item_value= this.f_items[this.f_issue_reading.index].f_item_value-this.f_items[this.f_prior_reading.index].f_item_value
-          if (isNaN(this.f_items[this.f_fee_base.index].f_item_value)) {
-            this.f_items[this.f_fee_base.index].f_item_value = null
-          }
+          // this.f_items[this.f_fee_base.index].f_item_value= this.f_items[this.f_issue_reading.index].f_item_value-this.f_items[this.f_prior_reading.index].f_item_value
+          // if (isNaN(this.f_items[this.f_fee_base.index].f_item_value)) {
+          //   this.f_items[this.f_fee_base.index].f_item_value = null
+          // }
         }
 
       },
       //计算剩余气量和金额
       getGasBalanceNumber() {
-        console.log('检测本期表读数发生变化了 ===> ')
+        //tag
         if(this.item.f_plan_meters[0].f_meter_type=='机表' || this.item.f_plan_meters[0].f_collection_type=='按气量'){//按气量
 
           if(!this.f_items[this.f_issue_reading.index].f_item_value || parseFloat(this.f_items[this.f_total_gas.index].f_item_value).toString() == "NaN"){
@@ -644,18 +649,29 @@
           if (isNaN(this.f_items[this.f_gas_balance.index].f_item_value)) {
             this.f_items[this.f_gas_balance.index].f_item_value = null
           }
-        }else{//按金额parseFloat(this.f_items[this.f_total_gas.index].f_item_value).toString() == "NaN"
-          if (!this.f_items[this.f_issue_reading.index].f_item_value || parseFloat(this.f_items[this.f_total_fee.index].f_item_value).toString() == "NaN") {
-            return
-          }
-          //剩余金额 = 累购-本期表读数
-          this.f_items[this.f_fee_balance.index].f_item_value=this.f_items[this.f_total_fee.index].f_item_value-this.f_items[this.f_issue_reading.index].f_item_value
-          if (isNaN(this.f_items[this.f_fee_balance.index].f_item_value)) {
-            this.f_items[this.f_fee_balance.index].f_item_value = null
-          }
+        }else{
+          //按金额
+          // if (!this.f_items[this.f_issue_reading.index].f_item_value || parseFloat(this.f_items[this.f_total_fee.index].f_item_value).toString() == "NaN") {
+          //   return
+          // }
+          // //剩余金额 = 累购-本期表读数
+          // this.f_items[this.f_fee_balance.index].f_item_value=this.f_items[this.f_total_fee.index].f_item_value-this.f_items[this.f_issue_reading.index].f_item_value
+          // if (isNaN(this.f_items[this.f_fee_balance.index].f_item_value)) {
+          //   this.f_items[this.f_fee_balance.index].f_item_value = null
+          // }
         }
 
       },
+      // 计算到期日期
+      getscrapNumber() {
+        //tag
+        if(!this.f_items[this.f_install_date.index].f_item_value || !this.f_items[this.f_use_limit.index].f_item_value ){
+          return
+        }
+        let data = new Date(this.f_items[this.f_install_date.index].f_item_value)
+        data.setFullYear(data.getFullYear() + parseInt(this.f_items[this.f_use_limit.index].f_item_value))
+        this.f_items[this.f_scrap_date.index].f_item_value = data.toISOString().split('T')[0];
+      },
       readmeter(){
         if(!this.f_items[this.f_issue_reading.index].f_item_value && parseFloat(this.f_items[this.f_issue_reading.index].f_item_value).toString() == "NaN"){
           this.$showMessage("请输入本期表读数！")
@@ -671,7 +687,7 @@
           f_checkerid:this.paper.f_checker_id,
           f_tablebase:this.f_items[this.f_issue_reading.index].f_item_value
         }
-        console.log("param"+JSON.stringify(param))
+        //tag)
         HostApp.__this__ = this
         HostApp.logicWithHint({
           // logic别名，key必须为logic
@@ -687,11 +703,11 @@
         })
       },
       readmeterCallBack(jo){
-        console.log("返回结果--------"+JSON.stringify(jo))
+        //tag)
         if(jo.state == 'ok'){
           let res = JSON.parse(jo.result)
-          console.log("1------------"+JSON.stringify(res))
-          console.log("2------------"+JSON.stringify(res))
+          //tag)
+          //tag)
           if(res.code==200){
             if(res.data=='已欠费'){
               this.$showMessage(`抄表成功,该用户已欠费，欠费金额: ￥${res.oughtfee}`)
@@ -708,16 +724,16 @@
         }
       },
       disSelect(index, itemValue) {
-        console.log('this.f_items[index] ===> ' + JSON.stringify(this.f_items[index]))
-        console.log('itemValue ===> ' + JSON.stringify(itemValue))
+        //tag)
+        //tag)
         if (this.f_items[index].f_item_value == itemValue) {
           this.$set(`f_items[${index}].f_item_value`, '')
         }
       }
     },
     ready() {
-      console.log('deviec--role=>'+this.role)
-      console.log('device=>',this.device)
+      //tag
+      //tag
       if(Vue.config.safecheck != undefined){
         if(Vue.config.safecheck.ApproveConfig != undefined){
           if(Vue.config.safecheck.ApproveConfig.livedispose != undefined) {
@@ -725,21 +741,21 @@
           }
         }
       }
-      console.log('开始准备数据')
-      console.log('this.paper ===> ' + JSON.stringify(this.paper))
-      console.log('this.paper[\'device\'+this.device.n] ===> ' + JSON.stringify(this.paper['device'+this.device.n]))
-      console.log('this.paper[\'device\'+this.device.n][this.idx] ===> ' + JSON.stringify(this.paper['device'+this.device.n][this.idx]))
+      //tag
+      //tag)
+      //tag)
+      //tag)
       //创建页面所需数据
       this.$set('piece', this.paper['device'+this.device.n][this.idx])
-      console.log('set之后的piece====》'+JSON.stringify(this.piece))
-      console.log('this.config====》'+JSON.stringify(this.config))
+      //tag)
+      //tag)
       let n = 0
       for (let item in this.config[this.device.device].items) {
         let index = this.config[this.device.device].items[item].index-1
         this.$set('page.options' + index, [])
-        console.log('this.config[this.device.device].items='+JSON.stringify(this.config[this.device.device].items))
-        console.log('item='+JSON.stringify(item))
-        console.log('this.device.device='+JSON.stringify(this.device.device))
+        //tag)
+        //tag)
+        //tag)
         // 先根据配置组接页面
         let f_item_value
         if(this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'checkbox'){
@@ -748,7 +764,7 @@
           for (let defitem in this.config[this.device.device].items[item].options) {
             let defopt = this.config[this.device.device].items[item].options[defitem]
             if (defopt.isdefault) {
-              console.log('defopt', defopt)
+              //tag
               f_item_value[0] = defopt.data
             }
           }
@@ -758,7 +774,7 @@
         }else{
           f_item_value = this.config[this.device.device].items[item].f_item_value ? this.config[this.device.device].items[item].f_item_value : ''
         }
-        console.log('f_item_value ====== > '+JSON.stringify(f_item_value))
+        //tag)
         let it = {
           type: this.config[this.device.device].items[item].type,
           f_item_name: item,
@@ -769,14 +785,15 @@
           isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
           readonly: this.config[this.device.device].items[item].readonly == true?true:false,
           remark: this.config[this.device.device].items[item].remark ? this.config[this.device.device].items[item].remark : '',
+          format: this.config[this.device.device].items[item].format ? this.config[this.device.device].items[item].format : 'yyyy-MM-dd 00:00:00',
           f_path: '',
           f_second_path:'',
           tooltip:'',
           f_live_dispose:'',
           f_else:''
         }
-        console.log('index ===> ' + JSON.stringify(index))
-        console.log('it ===> ' + JSON.stringify(it))
+        //tag)
+        //tag)
         this.$set('f_items['+index+']',it)
         if (this.config[this.device.device].items[item].type == 'selector' ||this.config[this.device.device].items[item].type == 'inputSelector') {
           if(this.config[this.device.device].items[item].type == 'selector'){
@@ -799,7 +816,7 @@
 
           this.$set('f_items['+index+'].options',this.page['options' + index])
 
-          console.log('lllllllllllllllllllthis.f_items===>'+JSON.stringify(this.f_items))
+          //tag)
         } else if (this.config[this.device.device].items[item].type == 'radio' || this.config[this.device.device].items[item].type == 'checkbox') {
           for (let i in this.config[this.device.device].items[item].options) {
             this.page['options' + index].push({
@@ -811,13 +828,13 @@
           }
           this.$set('f_items[' + index + '].options', this.page['options' + index])
           this.$set('f_items[' + index + '].f_item_value', f_item_value)
-          console.log('添加radio后的this.f_items===>'+JSON.stringify(this.f_items))
+          //tag)
         }
         n = n + 1
       }
-      console.log('this.piece=>'+JSON.stringify(this.piece))
-      console.log('this.f_items=>'+JSON.stringify(this.f_items))
-      console.log('this.piece.f_items'+JSON.stringify(this.piece.f_items))
+      //tag)
+      //tag)
+      //tag)
       if(JSON.stringify(this.piece) == '{}') {
         // 如果没有，则新建
         this.$set('piece.f_items',this.f_items)
@@ -827,67 +844,67 @@
         for (let f in this.f_items){
           for(let p in this.piece.f_items) {
             if (this.f_items[f].f_item_name == this.piece.f_items[p].f_item_name) {
-              console.log('1=>'+JSON.stringify(this.f_items[f].f_item_name))
-              console.log('2=>'+JSON.stringify(this.piece.f_items[p].f_item_name))
-              console.log('this.f_items[f] ===> ' + JSON.stringify(this.f_items[f]))
-              console.log('this.piece.f_items[p] ===> ' + JSON.stringify(this.piece.f_items[p]))
+              //tag)
+              //tag)
+              //tag)
+              //tag)
               this.f_items[f] = Object.assign(this.f_items[f], this.piece.f_items[p])
-              console.log('----> this.f_items[f] ===> ' + JSON.stringify(this.f_items[f]))
+              //tag)
               if (this.f_items[f].type == 'selector' || this.f_items[f].type == 'inputSelector') {
-                console.log('this.piece.f_items[p].f_item_value==>'+ JSON.stringify(this.piece.f_items[p].f_item_value))
-                console.log('this.f_items[f].selected==>' + JSON.stringify(this.f_items[f].selected))
+                //tag)
+                //tag)
                 this.f_items[f].selected = this.piece.f_items[p].f_item_value
-                console.log('this.f_items[f].selected==>' + JSON.stringify(this.f_items[f].selected))
+                //tag)
               }
               // 取出特殊值
               if (this.f_items[f].f_item_name == '初始表底') {
-                console.log('初始表底: ' + JSON.stringify(f))
+                //tag)
                 this.f_initial_base.index = f
               } else if (this.f_items[f].f_item_name == '上期表读数') {
-                console.log('上期表读数: ' + JSON.stringify(f))
+                //tag)
                 this.f_prior_reading.index = f
               } else if (this.f_items[f].f_item_name == '本期表读数') {
-                console.log('本期表读数: ' + JSON.stringify(f))
+                //tag)
                 this.f_issue_reading.index = f
                 this.$watch('f_items[' + f + '].f_item_value', function () {
                   this.getTableBaseNumber()
                   this.getGasBalanceNumber()
                 })
               } else if (this.f_items[f].f_item_name == '累购气量') {
-                console.log('累购气量: ' + JSON.stringify(f))
+                //tag)
                 this.f_total_gas.index = f
               } else if (this.f_items[f].f_item_name == '已用气量') {
-                console.log('已用气量: ' + JSON.stringify(f))
+                //tag)
                 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 == '剩余气量') {
-                console.log('剩余气量: ' + JSON.stringify(f))
+                //tag)
                 this.f_gas_balance.index = f
                 /*this.$watch('f_items[' + f + '].f_item_value', function () {
                   this.getGasAberrantNumber('')
                 })*/
               } else if (this.f_items[f].f_item_name == '气量异常差值') {
-                console.log('气量异常差值: ' + JSON.stringify(f))
+                //tag)
                 this.f_gas_aberrant_number.index = f
               } else if (this.f_items[f].f_item_name == '累购金额') {
-                console.log('累购金额: ' + JSON.stringify(f))
+                //tag)
                 this.f_total_fee.index = f
               } else if (this.f_items[f].f_item_name == '已用金额') {
-                console.log('已用金额: ' + JSON.stringify(f))
+                //tag)
                 this.f_fee_base.index = f
                 /*this.$watch('f_items[' + f + '].f_item_value', function () {
                   this.getFeeAberrantNumber('已用金额')
                 })*/
               } else if (this.f_items[f].f_item_name == '剩余金额') {
-                console.log('剩余金额: ' + JSON.stringify(f))
+                //tag)
                 this.f_fee_balance.index = f
                 /*this.$watch('f_items[' + f + '].f_item_value', function () {
                   this.getFeeAberrantNumber('')
                 })*/
               } else if (this.f_items[f].f_item_name == '金额异常差值') {
-                console.log('金额异常差值: ' + JSON.stringify(f))
+                //tag)
                 this.f_fee_aberrant_number.index = f
               }
             }
@@ -903,8 +920,24 @@
               }
             }
           }
+          if (this.f_items[f].f_item_name == '安装日期') {
+            //tag)
+            this.f_install_date.index = f
+            this.$watch('f_items[' + f + '].f_item_value', function () {
+              this.getscrapNumber()
+            })
+          }else if (this.f_items[f].f_item_name == '使用年限') {
+            //tag)
+            this.f_use_limit.index = f
+            this.$watch('f_items[' + f + '].f_item_value', function () {
+              this.getscrapNumber()
+            })
+          }else if (this.f_items[f].f_item_name == '到期日期') {
+            //tag)
+            this.f_scrap_date.index = f
+          }
         }
-        console.log('循环完f_items====》'+JSON.stringify(this.f_items))
+        //tag)
         this.$set('piece.f_items',this.f_items)
       }
       this.towatch()
@@ -915,10 +948,10 @@
       //判断当前是否有选中项
       for (let row in this.f_items){
         if(this.f_items[row].selected  && this.f_items[row].selected != '' && this.f_items[row].selected instanceof Array){
-          console.log('selected是数组')
+          //tag
           this.f_items[row].f_item_value = this.f_items[row].selected
         }else if(this.f_items[row].selected  && this.f_items[row].selected != ''){
-          console.log('selected不是数组')
+          //tag
           this.f_items[row].f_item_value = this.f_items[row].selected
         }
         // if(this.f_items[row].f_item_value instanceof Array && this.f_items[row].f_item_value.length != 0 ){
@@ -935,7 +968,7 @@
       // }
       //   picture.push(a)
       this.$set(`paper['device${this.device.n}'][${this.idx}]`, this.piece)
-      console.log('完成')
+      //tag
     },
     computed:{