safecheck-client 3.1.1-gaomi-5 → 4.0.1

package/src/components/rongcheng/SafecheckOrderV.vue

@@ -36,23 +36,24 @@
                   <!--<label>请输入超期原因:</label><br/>-->
                   <!--<textarea style="width: 100%;" v-model=""></textarea>-->
                   <!--</div>-->
+                  <div class="col-xs-12 col-sm-12 col-md-12 flex-between" style="margin-top: 10px;">
                     <div class="col-xs-3 col-sm-3 col-md-3">
-                    <button class="col-sm-2 btn btn-primary" @click="save('temp')" >
+                      <button type="button" name="button" class="col-sm-2 btn btn-primary" @click="save('temp')">
                         临时保存
                       </button>
                     </div>
                     <div class="col-xs-3 col-sm-3 col-md-3">
-                      <button class="col-sm-2 btn btn-primary" @click="save('finish')" >
+                      <button class="col-sm-2 btn btn-primary" @click="save('finish')">
                         本地缓存
                       </button>
                     </div>
                     <div class="col-xs-3 col-sm-3 col-md-3">
-                      <button type="button" name="button" class="col-sm-2 btn btn-primary" @click="uploadCheckPaper" :disabled="isdisable">
+                      <button type="button" name="button" class="col-sm-2 btn btn-primary" @click="uploadCheckPaper">
                         上传
                       </button>
                     </div>
                     <div class="col-xs-3 col-sm-3 col-md-3">
-                      <button type="button" name="button" class="col-sm-2 btn btn-primary" @click="ToRepair" :disabled="isdisable">
+                      <button type="button" name="button" class="col-sm-2 btn btn-primary" @click="ToRepair">
                         转维修
                       </button>
                     </div>
@@ -62,8 +63,10 @@
               </div>
             </div>
           </div>
+        </div>
       </ul>
     </div>
+
   </div>
 </template>
 
@@ -111,7 +114,6 @@
           f_devices: [],
           f_defect_content:''
         },
-        deviceinfo:{},
         isUpload:false,
         onlySave:true, //判断保存还是保存并上传
         livedispose:'',
@@ -124,7 +126,6 @@
         pic_to_be_viewed: '',
         showBack:true,
         devices: [],
-        isdisable:false,
         f_devices : [],
         isToRepair:false,
         clickBack:true, //是否点击返回按钮
@@ -176,7 +177,6 @@
               "气表品牌":{"index":3,"type":"string","readonly":true},
               "进气方向":{"index":4,"type":"selector",
                 "multiple": false,
-                "checkmust":true,
                 "options": [
                   {
                     "data": "左表",
@@ -191,17 +191,17 @@
                 ]
               },
               "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
-              "上期表读数":{"index":6,"type":"number","readonly":true,"isshow":true},
+              "上期表读数":{"index":6,"type":"number","readonly":true,isshow:true},
               "本期表读数":{"index":7,"type":"number","checkmust":true},
               "累购气量":{"index":8,"type":"number","readonly":true},
               "累购金额":{"index":8,"type":"number","readonly":true},
-              "已用气量":{"index":9,"type":"number","checkmust": false},//基表数
-              "已用金额":{"index":9,"type":"number","checkmust": false},
-              "剩余气量":{"index":10,"type":"number","checkmust": false},//累购-已用
+              "已用气量":{"index":9,"type":"number","checkmust": true},//基表数
+              "已用金额":{"index":9,"type":"number","checkmust": true},
+              "剩余气量":{"index":10,"type":"number","checkmust": true},//累购-已用
               //显示屏数  --实际剩余气量
-              "剩余金额":{"index":10,"type":"number","checkmust": false},
-              "气量异常差值":{"index":11,"type":"number","readonly": true,"isshow":false},
-              "金额异常差值":{"index":11,"type":"number","readonly": true,"isshow":false}
+              "剩余金额":{"index":10,"type":"number","checkmust": true},
+              "气量异常差值":{"index":11,"type":"number","readonly": true},
+              "金额异常差值":{"index":11,"type":"number","readonly": true}
             }
             // 注意，配置项的index必须与上面的固定配置保持'顺序'
           },
@@ -318,7 +318,6 @@
             config:this.config,
             device:this.devices[item.number-1],
             idx:idx,
-            item:this.item,
             role:'inspect'
           }
           console.log('tabSelect函数中赋值')
@@ -349,7 +348,7 @@
       },
       getImgGen(){
         let http = new HttpResetClass()
-        http.load('POST','rs/sql/tel_singleTable_OrderBy', {data: {
+        http.load('POST','api/af-safecheck/sql/safe_singleTable_OrderBy', {data: {
             items: '*',
             tablename: 't_files',
             condition: `id in (${this.ids})`,
@@ -427,9 +426,9 @@
 
         if(this.data.f_entry_status != '入户')
           return null
-        /*hasError = this.verifyUser()
+        hasError = this.verifyUser()
         if(hasError)
-          return hasError*/
+          return hasError
         hasError = this.verifyDevices()
         if(hasError)
           return hasError
@@ -482,7 +481,7 @@
                   for (let i in this.data[device][item].f_items) {
                     for (let it in this.config[dev].items) {
                       if (it == this.data[device][item].f_items[i].f_item_name) {
-                        if (this.config[dev].items[it].checkmust == true && !this.data[device][item].f_items[i].f_item_value && parseFloat(this.data[device][item].f_items[i].f_item_value).toString() == "NaN") {
+                        if (this.config[dev].items[it].checkmust == true && !this.data[device][item].f_items[i].f_item_value) {
                           return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + "未检查"
                         }
                       }
@@ -507,12 +506,12 @@
         console.log('this.data.f_overall_imgs==>'+JSON.stringify(this.data.f_overall_imgs))
         if(Vue.android && (!this.data.f_overall_imgs || this.data.f_overall_imgs.length == 0) && this.data.f_entry_status == '入户')
           return prefix + '必须有安检总体照片'
-        /*if(Vue.android && (!this.data.f_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
-          return prefix + '必须有用户签名'*/
+        if(Vue.android && (!this.data.f_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
+          return prefix + '必须有用户签名'
         if(Vue.android && this.data.f_defect_notified && this.data.f_notified_path == Vue.nopic)
           return prefix + '下发安检通知书则必须给通知书拍照'
-        /*if(!this.data.f_client_evaluation && this.data.f_entry_status == '入户')
-          return  prefix + '请选择服务评价'*/
+        if(!this.data.f_client_evaluation && this.data.f_entry_status == '入户')
+          return  prefix + '请选择服务评价'
       },
 
       getAllDefect() {
@@ -718,6 +717,7 @@
           }
           this.checkResult = {}
         }
+        codata.f_is_meterreadding = '未抄表'
         console.log(`typeof-checkResults-->${typeof checkResults}`)
         console.log('checkResults ==> ' + JSON.stringify(checkResults))
         codata.f_defect_content = JSON.stringify(checkResults)
@@ -728,7 +728,6 @@
       uploadCheckPaper(){
         console.log('进入上传')
         let errString = this.errorVerify()
-        this.isdisable = true
         if (errString) {
           console.log(errString)
           console.log('Vue.android',Vue.android)
@@ -739,7 +738,6 @@
             // }
             this.$showMessage(errString)
           }
-          this.isdisable = false
           return
         } else {
           this.$set('data.f_offsite_time', Util.toStandardTimeString())
@@ -749,16 +747,6 @@
           this.data.f_complete = '已完成'
           this.disableTimer()
         }
-        if(this.item.f_user_type=='民用' && this.item.f_plan_meters[0].f_meter_type=='机表' && this.data.f_entry_status=='入户' && this.data.f_is_meterreadding=='未抄表'){
-          /*this.$showMessage('该用户为机表用户，未进行抄表！', ['confirm', 'cancel']).then((res) => {
-            if (res !== 'confirm') {
-              this.baseinfo.base.f_user_state = ['正常']
-            }
-          })*/
-          this.$showMessage("检测到当前机表用户未进行抄表，请先进行抄表再上传！")
-          this.isdisable = false
-          return
-        }
         console.log('uploadCheckPaper-->isUpload'+this.isUpload)
         this.onlySave = false
         let res =  this.save()
@@ -929,8 +917,6 @@
         let codata = this.getAllDefect()
         if(this.isToRepair && JSON.parse(this.data.f_defect_content).result != '有隐患'){
           this.$showMessage("未发现隐患，请点击上传")
-          this.isToRepair=false
-          this.isdisable = false
           return
         }
         console.log(`codata类型-->${typeof codata}`)
@@ -1195,7 +1181,6 @@
       },
       saveCallBack(jo){
         console.log(JSON.stringify(jo))
-        this.isdisable = false
         if(jo.state == 'ok'){
           let res = JSON.parse(jo.result)
           console.log('保存结果===》'+JSON.stringify(res))
@@ -1250,7 +1235,6 @@
               //   }
               // })
               codata.f_devices = this.f_devices
-              codata.isTorepair = this.isToRepair
               let param = {
                 f_check_item_id: this.data.f_check_item_id,
                 f_checker_id: this.data.f_checker_id,
@@ -1287,10 +1271,9 @@
             return
           }
         }else{
-          this.$showMessage('服务器内部错误,保存失败！')
+          this.$showMessage('移动网络异常,请稍后再试,保存失败！')
           return
         }
-
       },
       uploadCallBack(jo){
         //获取微信推送路径
@@ -1304,20 +1287,19 @@
         }
         console.log(JSON.stringify(jo))
         console.log('jo ===> ' + JSON.stringify(jo))
-        this.isdisable = false
         if(jo.state == 'ok'){
           let res = JSON.parse(jo.result)
           console.log('上传结果===》'+JSON.stringify(res))
           console.log('上传结果的f_paper_id===》'+JSON.stringify(res.id))
           if(res.code == 200){
             //上传抄表信息
-            if(this.item.f_user_type=='民用' && this.item.f_safecheck_type=='年度普检' && this.data.f_entry_status=='入户' && this.data.f_is_meterreadding=='未抄表'){
+            if(this.item.f_user_type=='民用' && this.item.f_safecheck_type=='年度普检'){
               //let codata = this.getAllDefect()
-              let res3= this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`,{
+              let res3= this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`,{
                 data:{
                   items:" f_userfiles_id",
                   tablename:"t_userfiles",
-                  condition:`f_userinfo_id=${this.item.f_userinfoid}  and (f_table_state='正常' or f_table_state='停用')`,
+                  condition:"f_userinfo_id="+this.item.f_userinfoid,
                   orderitem:"f_userfiles_id"
                 }
               }).then(res3 => {
@@ -1334,7 +1316,7 @@
                 })
 
                 console.log("抄表底数！"+f_tablebase1+"------userfilesid"+res3.data[0].f_userfiles_id +'------'+this.data.f_checker_name+this.data.f_checker_id+this.data.f_checker_name)
-                this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/handCommonEnter`, {data:{
+                this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/handCommonEnter`, {data:{
                     f_userfiles_id:res3.data[0].f_userfiles_id,
                     f_operator:this.data.f_checker_name,
                     f_operatorid:this.data.f_checker_id,
@@ -1349,7 +1331,7 @@
                     let param={
                       itemid:res.id
                     }
-                    this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/rc_UpPaperHandMeterState`, {data:param})
+                    this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/rc_UpPaperHandMeterState`, {data:param})
                   }
                 })
 
@@ -1362,7 +1344,12 @@
             }
             console.log('this.isToRepair==============>'+this.isToRepair)
             if(this.isToRepair){
-              /*let defect=JSON.parse(this.data.f_defect_content)
+              console.log('开始转维修！1'+JSON.stringify(this.userinfo))
+              console.log('开始转维修！2'+JSON.stringify(this.item))
+              console.log('开始转维修！3'+JSON.stringify(this.data))
+              let defect=JSON.parse(this.data.f_defect_content)
+              console.log("defect----------"+JSON.stringify(defect))
+              console.log("defect----------"+JSON.stringify(defect.data))
               let repairContent=''
               defect.data.forEach(de =>{
                 let arr=Object.keys(de)
@@ -1393,8 +1380,8 @@
                 "orderType": "报修",
                 "faultCategory": "安检隐患",
                 "processingLevel": "普通",
-                "remarks": "" }*/
-              /*console.log('开始转维修！4'+JSON.stringify(repair))
+                "remarks": "" }
+              console.log('开始转维修！4'+JSON.stringify(repair))
               new HttpResetClass().load('POST','http://39.101.182.117:8909/api/cc/workorder.ashx?sign=5F27F9CA-2793-40CE-9834-0F033F71EDD2&method=postpreorder',repair,{resolveMsg: null, rejectMsg: null}).then(res =>{
                 console.log('调维修接口返回的结果！'+JSON.stringify(res))
                 if(res.data.success){
@@ -1403,17 +1390,13 @@
                     itemid:res.id,
                     gid:res.data.gid
                   }
-                  new HttpResetClass().load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/rc_UpPaperRepairState`,{data:param},{resolveMsg: null, rejectMsg: null})
+                  new HttpResetClass().load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/rc_UpPaperRepairState`,{data:param},{resolveMsg: null, rejectMsg: null})
                   this.$showMessage('转维修成功!')
                 }else{
                   this.$showMessage('转维修失败!')
                 }
-                this.isToRepair=false
                 this.$dispatch('confirm')
-              })*/
-              this.$showMessage('转维修成功!')
-              this.isToRepair=false
-              this.$dispatch('confirm')
+              })
               //this.todo()
             }else{
               this.$showMessage('上传成功!')
@@ -1425,19 +1408,13 @@
             this.$showMessage('该安检单已作废!')
             console.log('该安检单已作废')
             this.$dispatch('confirm')
-          }else if(res.code == 500){
-            this.$showMessage('图片上传失败，请检查图片，确认无误后再次进行上传！')
-            this.onlySave = true
-            this.isToRepair=false
           }else{
             this.$showMessage('上传失败！')
             this.onlySave = true
-            this.isToRepair=false
           }
         }else {
-          this.$showMessage('服务器内部错误,上传失败！')
+          this.$showMessage('移动网络异常,请稍后再试,上传失败！')
           this.onlySave = true
-          this.isToRepair=false
         }
       },
       safecheckToRepairCallBack(jo){
@@ -1459,7 +1436,7 @@
             this.onlySave = true
           }
         }else{
-          this.$showMessage('服务器内部错误,上传失败！')
+          this.$showMessage('移动网络异常,请稍后再试,上传失败！')
           this.onlySave = true
         }
       },
@@ -1526,8 +1503,8 @@
       },
       async isoverDate(){
         console.log('123456')
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
-            condition:"ti.id='"+this.item.id+"'"
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidGetuserinfo`, {data:{
+            condition:"f_plan_item_id='"+this.item.id+"'"
           }
         })
 
@@ -1563,31 +1540,16 @@
               }else{
                 this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
               }
-
-
               // this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
             }
           }else {
             // 非民用
             if (Vue.config.safecheck.DevicesSetConfig != undefined){
-
               if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
                 this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
               }else{
                 this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
               }
-              let dev={
-                index: 3,
-                items:{}}
-              if(this.deviceinfo.data.length>0){
-                for (let i=0;i<this.deviceinfo.data.length;i++){
-                  dev.items[this.deviceinfo.data[i].f_devices_model+'数量']={index: i*3+1,type:"number",f_item_value: this.deviceinfo.data[i].f_devices_num}
-                  dev.items[this.deviceinfo.data[i].f_devices_model+'品牌']={index: i*3+2,type:"string",f_item_value: this.deviceinfo.data[i].f_brand}
-                  dev.items[this.deviceinfo.data[i].f_devices_model+'检查情况']={index: i*3+3,type:"string"}
-                }
-              }
-              console.log("dev:"+JSON.stringify(dev))
-              this.config["燃气具检查"]=dev
               //this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
             }
           }
@@ -1665,7 +1627,7 @@
         this.data.f_checker_id = Vue.user.id
         this.data.f_checker_name = Vue.user.name
         this.data.f_check_type = this.item.f_user_type
-        this.data.f_safecheck_type = this.item.f_safecheck_type ? this.item.f_safecheck_type:'年度普检'
+        this.data.f_safecheck_type = this.item.f_safecheck_type
         //this.data.f_exceed_reason = ''//存放送气超期原因
         console.log('设置参数2')
         this.data.f_subcompany = this.item.f_subcompany
@@ -1680,8 +1642,6 @@
         this.$set('data.f_userinfo_code', this.item.f_userinfo_code)
         // 安检状态
         this.$set('data.f_entry_status', '入户')
-        this.$set('data.f_laser_check', null)
-        this.$set('data.f_is_meterreadding', '未抄表')
         this.$set('data.f_usegas', '已使用')
         this.$set('data.f_state',this.item.f_state)
         console.log('设置参数3')
@@ -1690,7 +1650,6 @@
         this.$set('data.f_user_phone', this.item.f_user_phone)
         this.$set('data.f_userinfoid', this.item.f_userinfoid)
         this.$set('data.f_address', this.item.f_address)
-        this.$set('data.f_small_area', this.item.f_small_area)
         this.$set('data.f_card_id', this.item.f_card_id)
         this.$set('data.f_area', this.item.f_area)
         this.$set('data.f_street', this.item.f_street)
@@ -1723,9 +1682,9 @@
             this.$set('data.device' + this.devices[de].n, [])
             for (let i = 0; i < this.item.f_plan_meters.length; i++) {
               if (this.item.f_plan_meters[i].f_meter_type) {
-                console.log('this.item.f_plan_meters[i] ===> ' + JSON.stringify(this.item.f_plan_meters[i])+"------------"+this.devices[de].device)
+                console.log('this.item.f_plan_meters[i] ===> ' + JSON.stringify(this.item.f_plan_meters[i]))
                 if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('机表') > 0) {
-                  console.log("是机表")
+                  console.log("111111111:"+this.devices[de].device)
                   this.data['device' + this.devices[de].n].push({
                     f_device_type: "燃气表",
                     f_items: [
@@ -1736,7 +1695,7 @@
                         f_item_name: "基表编号",
                         f_item_value: this.item.f_plan_meters[i].f_meter_no,
                         f_path: "",
-                        type: "string"
+                        type: "number"
                       },
                       {
                         f_defect_level: null,
@@ -1773,20 +1732,10 @@
                         f_item_value: this.item.f_plan_meters[i].f_prior_reading,
                         f_path: "",
                         type: "number"
-                      },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "本期表读数",
-                        f_item_value: '',
-                        f_path: "",
-                        type: "number"
                       }
                     ]
                   })
                 } else if (this.devices[de].device == "燃气表") {
-                  console.log("不是是机表")
                   // delete this.config['燃气表']['items']['表底数']
                   this.data['device' + this.devices[de].n].push({
                     f_device_type: "燃气表",
@@ -1798,7 +1747,7 @@
                         f_item_name: "基表编号",
                         f_item_value: this.item.f_plan_meters[i].f_meter_no,
                         f_path: "",
-                        type: "string"
+                        type: "number"
                       },
                       {
                         f_defect_level: null,
@@ -1835,21 +1784,11 @@
                         f_item_value: this.item.f_plan_meters[i].f_prior_reading,
                         f_path: "",
                         type: "number"
-                      },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "本期表读数",
-                        f_item_value: '',
-                        f_path: "",
-                        type: "number"
                       }
                     ]
                   })
                 }
                 if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type) {
-                  console.log("有this.item.f_plan_meters[i].f_collection_type")
                   this.data['device' + this.devices[de].n].forEach(device => {
                     console.log('device ===> ' + JSON.stringify(device))
                     console.log('this.item.f_plan_meters[i].f_collection_type ===> ' + JSON.stringify(this.item.f_plan_meters[i].f_collection_type))
@@ -1913,7 +1852,6 @@
                             f_device_id: "",
                             f_is_defect: "",
                             f_item_name: "金额异常差值",
-                            isshow:false,
                             f_item_value: null,
                             f_path: "",
                             type: "number"
@@ -1962,7 +1900,7 @@
                             f_device_id: "",
                             f_is_defect: "",
                             f_item_name: "剩余气量",
-                            f_item_value: '',
+                            f_item_value: this.item.f_plan_meters[i].f_total_gas-this.item.f_plan_meters[i].f_meter_base,
                             f_path: "",
                             type: "number"
                           },
@@ -1971,7 +1909,6 @@
                             f_device_id: "",
                             f_is_defect: "",
                             f_item_name: "气量异常差值",
-                            isshow:false,
                             f_item_value: null,
                             f_path: "",
                             type: "number"
@@ -1981,103 +1918,66 @@
                       }
                     }
                   })
-                }else if(this.devices[de].device == "燃气表"){
-                  console.log("没有this.item.f_plan_meters[i].f_collection_type")
-                  this.data['device' + this.devices[de].n].forEach(device => {
-                    console.log('device ===> ' + JSON.stringify(device))
-                    if (!this.data.f_collection_type) {
-                      this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
-                      delete this.config['燃气表']['items']['累购金额']
-                      delete this.config['燃气表']['items']['已用金额']
-                      delete this.config['燃气表']['items']['剩余金额']
-                      delete this.config['燃气表']['items']['金额异常差值']
-                      device.f_items.push(
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "初始表底",
-                          isshow: true,
-                          f_item_value: this.item.f_plan_meters[i].f_initial_base,
-                          f_path: "",
-                          type: "number"
-                        },
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "累购气量",
-                          f_item_value: this.item.f_plan_meters[i].f_total_gas,
-                          f_path: "",
-                          type: "number"
-                        },
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "已用气量",
-                          f_item_value: this.item.f_plan_meters[i].f_meter_base,
-                          f_path: "",
-                          type: "number"
-                        },
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "剩余气量",
-                          f_item_value: '',
-                          f_path: "",
-                          type: "number"
-                        },
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "气量异常差值",
-                          isshow:false,
-                          f_item_value: null,
-                          f_path: "",
-                          type: "number"
-                        }
-                      )
-                      console.log('this.config[\'燃气表\'][\'items\']  ---> ' + JSON.stringify(this.config['燃气表']['items']))
-                    }
-                  })
+                }else{
+                  if (!this.data.f_collection_type) {
+                    this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
+                    delete this.config['燃气表']['items']['累购金额']
+                    delete this.config['燃气表']['items']['已用金额']
+                    delete this.config['燃气表']['items']['剩余金额']
+                    delete this.config['燃气表']['items']['金额异常差值']
+                    device.f_items.push(
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "初始表底",
+                        isshow: true,
+                        f_item_value: this.item.f_plan_meters[i].f_initial_base,
+                        f_path: "",
+                        type: "number"
+                      },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "累购气量",
+                        f_item_value: this.item.f_plan_meters[i].f_total_gas,
+                        f_path: "",
+                        type: "number"
+                      },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "已用气量",
+                        f_item_value: this.item.f_plan_meters[i].f_meter_base,
+                        f_path: "",
+                        type: "number"
+                      },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "剩余气量",
+                        f_item_value: this.item.f_plan_meters[i].f_total_gas-this.item.f_plan_meters[i].f_meter_base,
+                        f_path: "",
+                        type: "number"
+                      },
+                      {
+                        f_defect_level: null,
+                        f_device_id: "",
+                        f_is_defect: "",
+                        f_item_name: "气量异常差值",
+                        f_item_value: null,
+                        f_path: "",
+                        type: "number"
+                      }
+                    )
+                    console.log('this.config[\'燃气表\'][\'items\']  ---> ' + JSON.stringify(this.config['燃气表']['items']))
+                  }
                 }
               }
             }
-            //工商户安检设备添加值
-            if(this.devices[de].device == "燃气具检查"){
-              console.log("this.data['device' + this.devices[de].n]"+JSON.stringify(this.data['device' + this.devices[de].n]))
-              console.log("this.devices[de]"+JSON.stringify(this.devices[de]))
-              this.data['device' + this.devices[de].n].forEach((device)=>{
-                for (let i=0;i<this.deviceinfo.data.length;i++){
-                  device.f_items.push(
-                    {
-                      f_defect_level: null,
-                      f_device_id: "",
-                      f_is_defect: "",
-                      f_item_name: this.deviceinfo.data[i].f_devices_model+'数量',
-                      isshow:false,
-                      f_item_value: this.deviceinfo.data[i].f_devices_num,
-                      f_path: "",
-                      type: "string"
-                    },
-                    {
-                      f_defect_level: null,
-                      f_device_id: "",
-                      f_is_defect: "",
-                      f_item_name: this.deviceinfo.data[i].f_devices_model+'品牌',
-                      isshow:false,
-                      f_item_value: this.deviceinfo.data[i].f_brand,
-                      f_path: "",
-                      type: "string"
-                    }
-                  )
-                }
-              })
-              console.log("this.data['device' + this.devices[de].n]"+JSON.stringify(this.data['device' + this.devices[de].n]))
-            }
           }
         }
         var pardate = {
@@ -2098,16 +1998,7 @@
     },
     async ready () {
       await this.isoverDate()
-      if(this.item.f_user_type == '非民用'){
-        this.deviceinfo=await new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`,{
-          data:{
-            items:" de.* ",
-            tablename:"t_devices de join t_userfiles uf on uf.f_userfiles_id=de.f_userfiles_id",
-            condition:`de.f_state='有效' and uf.f_userinfo_id=${this.item.f_userinfoid}`,
-            orderitem:"de.id"
-          }
-        },{resolveMsg: null, rejectMsg: null})
-      }
+      console.log('8888888')
       this.putDevices()
       //如果已检，则提取安检单
       if (this.item.f_state != '未检') {
@@ -2135,7 +2026,7 @@
           if (value.data.length != 0) {
             that.$set('data', value.data[0])
             console.log("this.data.f_collection_type:" + JSON.stringify(this.data.f_collection_type))
-            if (this.item.f_plan_meters[0].f_meter_type=='机表' || this.data.f_collection_type == '按气量') {
+            if (this.data.f_collection_type == '按气量') {
               delete this.config['燃气表']['items']['累购金额']
               delete this.config['燃气表']['items']['已用金额']
               delete this.config['燃气表']['items']['剩余金额']