safecheck-client 3.0.30-62 → 3.0.30-62-t4

package/src/filiale/bayan/android/PhoneUpUserinfo.vue

@@ -285,21 +285,21 @@
                       :options="deviceBrandOption[row.f_devices_type]"
                       close-on-select value-single></v-select> -->
           </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">设备型号:</label>
-            <input type="text" class="form-control rightipt" v-model="row.f_devices_model" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">生产日期:</label>
-            <!--<input type="text" class="form-control rightipt"   v-model="row.f_make_date"  />-->
-            <datepicker class="rightipt" :value.sync="row.f_make_date" v-model="row.f_make_date"
-                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" readonly="readonly">
-            </datepicker>
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">使用年限:</label><input type="number" class="form-control rightipt"
-                                                            v-model="row.f_service_life" />
-          </div>
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">设备型号:</label>-->
+<!--            <input type="text" class="form-control rightipt" v-model="row.f_devices_model" />-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">生产日期:</label>-->
+<!--            &lt;!&ndash;<input type="text" class="form-control rightipt"   v-model="row.f_make_date"  />&ndash;&gt;-->
+<!--            <datepicker class="rightipt" :value.sync="row.f_make_date" v-model="row.f_make_date"-->
+<!--                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" readonly="readonly">-->
+<!--            </datepicker>-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">使用年限:</label><input type="number" class="form-control rightipt"-->
+<!--                                                            v-model="row.f_service_life" />-->
+<!--          </div>-->
           <!--          <div class="row auto" style="margin: 5px 0">
             <label class="righttxt">到期日期:</label>
             &lt;!&ndash;<input type="text" class="form-control rightipt"   v-model="row.f_expire_date"  />&ndash;&gt;
@@ -311,31 +311,31 @@
                         :show-reset-button="reset" readonly="readonly">
             </datepicker>
           </div>-->
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">安&ensp;装&ensp;人:</label><input type="text" class="form-control rightipt"
-                                                                      v-model="row.f_input_person" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">安装日期:</label>
-            <!--<input type="text" class="form-control rightipt"   v-model="row.f_input_date"  />-->
-            <datepicker class="rightipt" :value.sync="row.f_input_date" v-model="row.f_input_date"
-                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" readonly="readonly">
-            </datepicker>
-          </div>
-          <div class="row auto" style="margin:  5px 0">
-            <label class="righttxt">设备数量:</label><input type="number" class="form-control rightipt"
-                                                            v-model="row.f_devices_num" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">管道类型:</label>
-            <v-select  class="rightipt"  :value.sync="row.f_pipe_type"
-                  v-model="row.f_pipe_type"
-                  placeholder='请选择管道类型'
-                  :width='wid'
-                  readonly
-                  :options="pipetypes"
-                  close-on-select value-single></v-select>
-          </div>
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">安&ensp;装&ensp;人:</label><input type="text" class="form-control rightipt"-->
+<!--                                                                      v-model="row.f_input_person" />-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">安装日期:</label>-->
+<!--            &lt;!&ndash;<input type="text" class="form-control rightipt"   v-model="row.f_input_date"  />&ndash;&gt;-->
+<!--            <datepicker class="rightipt" :value.sync="row.f_input_date" v-model="row.f_input_date"-->
+<!--                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" readonly="readonly">-->
+<!--            </datepicker>-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin:  5px 0">-->
+<!--            <label class="righttxt">设备数量:</label><input type="number" class="form-control rightipt"-->
+<!--                                                            v-model="row.f_devices_num" />-->
+<!--          </div>-->
+<!--          <div class="row auto" style="margin: 5px 0">-->
+<!--            <label class="righttxt">管道类型:</label>-->
+<!--            <v-select  class="rightipt"  :value.sync="row.f_pipe_type"-->
+<!--                  v-model="row.f_pipe_type"-->
+<!--                  placeholder='请选择管道类型'-->
+<!--                  :width='wid'-->
+<!--                  readonly-->
+<!--                  :options="pipetypes"-->
+<!--                  close-on-select value-single></v-select>-->
+<!--          </div>-->
           <!--<div class="row auto" style="margin: 5px 0">
             <label class="righttxt">设备状态:</label><input type="text" class="form-control rightipt" readonly  v-model="row.f_userinfodevices_state"  />
           </div>-->
@@ -614,7 +614,7 @@
         //tag
         if (this.selectStreet.id) {
           let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
-          new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_area",
@@ -708,7 +708,7 @@
             userinfoms.userphone = this.userphone
             this.userinfo_old.meterinfo[0].devicesinfo = this.model
             userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
-            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_fileSave`, {
               data: {
                 userinfo: userinfoms,
                 modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -724,7 +724,7 @@
                 data.f_address = this.userinfo.addressinfo.f_address ? this.userinfo.addressinfo.f_address : this.userinfo_old.addressinfo.f_address
                 //
                 data.f_operator = Vue.user.name
-                new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/address_updateuseraddress`, { data: data }).then((res2) => {
+                new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/address_updateuseraddress`, { data: data }).then((res2) => {
                   this.$showMessage("修改用户地址信息成功！")
                 }).catch(error => {
                   this.$showMessage("修改用户地址信息！")
@@ -779,7 +779,7 @@
             userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
             userinfoms.userphone = this.userphone
             //tag)
-            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_fileSave`, {
               data: {
                 userinfo: userinfoms,
                 modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -897,7 +897,7 @@
           this.selectArea = { id: '' }
           this.area = []
           let pcdText = ` and f_street_id=${this.selectStreet.id}`
-          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_area",
@@ -933,7 +933,7 @@
           this.userinfo.addressinfo.f_slice_area = ''
           this.streets = []
           let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_street",
@@ -1024,7 +1024,7 @@
         if (this.selectStreet.id) {
           this.area = []
           let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
-          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_area",
@@ -1054,7 +1054,7 @@
           //tag
           this.streets = []
           let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_street",
@@ -1112,7 +1112,7 @@
         };
         console.log('提交限购数据', JSON.stringify(param));
         let http = new HttpResetClass();
-        await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/limitGas`, {
+        await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/limitGas`, {
           data: param
         });
       },
@@ -1195,7 +1195,7 @@
         this.excessive = true
         //Vue.user.orgid ${this.f_userinfo_id} 10101    ${Vue.user.orgid}
 
-        let pcdlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let pcdlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "*",
             tablename: "t_pcd",
@@ -1208,7 +1208,7 @@
           this.pcds.push({ label: result.f_pcd, value: result })
         })
         ////tag)
-        let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_getFilesDetail`, {
+        let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_getFilesDetail`, {
           //f_userinfo_code:'12381344',
           f_userinfo_id: this.f_userinfo_id
         }, { resolveMsg: null, rejectMsg: null })
@@ -1228,7 +1228,7 @@
         this.addressType = this.userinfo.addressinfo.f_special == 1 ? '特殊地址' : '普通地址'
         //this.userinfo.addressinfo.f_special=1
         //tag
-        let userphone = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let userphone = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "*",
             tablename: "t_user_phone",
@@ -1283,7 +1283,7 @@
       console.log(this.showBox)
       if (this.showBox) {
         // 获取调压箱
-        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/adjustableboxQuery`, { data: { condition: '1 = 1' } }, {
+        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/adjustableboxQuery`, { data: { condition: '1 = 1' } }, {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {

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

@@ -430,7 +430,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -450,6 +449,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag

package/src/filiale/bayan/android/SafecheckOrderV.vue

@@ -84,6 +84,13 @@
                     close-on-select>
           </v-select>
         </div>
+        <div class="row" style="margin-top: 10px">
+          <label class="font_normal_body">选择站点</label>
+          <right-tree
+            islist
+            :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
+            @re-res="getSiteRes"></right-tree>
+        </div>
         <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType=='派发给维修员'">
           <label class="font_normal_body">维&ensp;修&ensp;员</label>
           <v-select
@@ -93,13 +100,6 @@
             placeholder='请选择维修员'
             close-on-select></v-select>
         </div>
-        <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType=='派发给站点'">
-          <label class="font_normal_body">站&ensp;&ensp;&ensp;&ensp;点</label>
-          <right-tree
-            islist
-            :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
-            @re-res="getSiteRes"></right-tree>
-        </div>
         <!--<div class="row" style="margin-top: 10px">
           <label class="font_normal_body">报修类型</label>
           <v-select :value.sync="selectData.f_repairtype"
@@ -144,7 +144,7 @@
 
   export default {
     title: '安检单',
-    props: ['f_plan_id', 'item', 'role','parentPage','source'],
+    props: ['f_plan_id', 'item', 'role','parentPage','source','openpaper'],
     // props: ['f_plan_id', 'role'],
     data() {
       return {
@@ -255,7 +255,7 @@
               "基表编号":{"index":1,"type":"string","readonly":true},
               "气表型号":{"index":2,"type":"string","readonly":true},
               "气表品牌":{"index":3,"type":"string","readonly":true},
-              "进气方向":{"index":4,"type":"string","readonly":true},
+              "进气方向":{"index":4,"type":"string","readonly":true,isshow:false},
               "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
               "上期表读数":{"index":6,"type":"number","readonly":true,isshow:false},
               "累购气量":{"index":7,"type":"number","readonly":true},
@@ -279,7 +279,7 @@
               "基表编号":{"index":1,"type":"string","readonly":true},
               "气表型号":{"index":2,"type":"string","readonly":true},
               "气表品牌":{"index":3,"type":"string","readonly":true},
-              "进气方向":{"index":4,"type":"string","readonly":true},
+              "进气方向":{"index":4,"type":"string","readonly":true,isshow:false},
               "初始表底":{"index":5,"type":"string","isshow":false,"readonly":true},
               "累购金额":{"index":6,"type":"string","readonly":true},
               "表累购金额":{"index":7,"type":"string","readonly":false},
@@ -362,7 +362,7 @@
         }
         console.log("准备保存！")
         this.disableTimer()
-        this.getEmp()
+        // this.getEmp()
         this.showModal2=true
       },
       cancel1(){
@@ -377,14 +377,37 @@
       getSiteRes(obj) {
         console.log('siteRes ---> ')
         console.log(obj)
-        if(obj.resids[0]){
-          this.selectData.f_meetunit = obj.res.join('.')
-          this.selectData.f_reciever = obj.resids.join('.')
-          this.selectData.f_outlets = obj.res[obj.res.length - 1]
+        if(this.selectData.dispatchType=='派发给站点'){
+          if(obj.resids[0]){
+            this.selectData.f_meetunit = obj.res.join('.')
+            this.selectData.f_reciever = obj.resids.join('.')
+            this.selectData.f_outlets = obj.res[obj.res.length - 1]
+          }else {
+            this.selectData.f_meetunit = ''
+            this.selectData.f_reciever = ''
+            this.selectData.f_outlets = ''
+          }
         }else {
-          this.selectData.f_meetunit = ''
-          this.selectData.f_reciever = ''
-          this.selectData.f_outlets = ''
+          if(obj.resids[0]){
+            this.selectData.f_meetunit = obj.res.join('.')
+          }else {
+            this.selectData.f_meetunit = ''
+            this.selectData.f_reciever = ''
+            this.selectData.f_outlets = ''
+          }
+          this.repairers = []
+          let vali = {
+            source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$)!=-1)`,
+            userid: `${obj.resids[0]}`
+          }
+          let http = new HttpResetClass()
+          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: vali}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            res.data.forEach((item) => {
+              if (item.state == '在职'){
+                this.repairers.push({label: `${item.name}`, value: item.name})
+              }
+            })
+          })
         }
       },
       rectification(){
@@ -417,7 +440,7 @@
           toRepair=null
         }else{
           console.log('派发给维修员---------'+this.selectData.f_repairman)
-          act={f_meetunit:'',f_reciever:this.selectData.f_repairman,f_service_acitivity_type:'派单'}
+          act={f_meetunit:this.selectData.f_meetunit,f_reciever:this.selectData.f_repairman,f_service_acitivity_type:'派单'}
           toRepair='一级派单'
         }
         let repData={
@@ -427,6 +450,7 @@
           depids:Vue.user.depids,
           f_remarks:this.selectData.f_remarks,
           f_repairtype:this.selectData.f_repairtype,
+          f_servicetype:'安检维修',
           f_attendant: Vue.user.name,
           loginUser:{name:Vue.user.name,ename:Vue.user.id,id:Vue.user.id},
         }
@@ -437,16 +461,16 @@
         this.save()
       },
       // 获取维修员
-      getEmp() {
-        this.repairers=[]
-        let per = {source: 'this.getRights().where(row.getType()==$user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1))', userid: `${Vue.user.id}`}
-        let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: per}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          res.data.forEach((user)=>{
-            this.repairers.push({label:user.name, value: user.name})
-          })
-        })
-      },
+      // getEmp() {
+      //   this.repairers=[]
+      //   let per = {source: 'this.getRights().where(row.getType()==$user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1))', userid: `${Vue.user.id}`}
+      //   let http = new HttpResetClass()
+      //   http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: per}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      //     res.data.forEach((user)=>{
+      //       this.repairers.push({label:user.name, value: user.name})
+      //     })
+      //   })
+      // },
       closely(isdelete){
         try {
           var startOrStopAudioClipStr;
@@ -588,7 +612,7 @@
       },
       getImgGen(){
         let http = new HttpResetClass()
-        http.load('POST','rs/sql/tel_singleTable_OrderBy', {data: {
+        http.load('POST','api/af-safecheck/sql/tel_singleTable_OrderBy', {data: {
             items: '*',
             tablename: 't_files',
             condition: `id in (${this.ids})`,
@@ -747,10 +771,13 @@
                       }
                     }
                     //检查安检下拉结果
-                    if (this.data[device][item].f_items[i].type == 'selector' || this.data[device][item].f_items[i].type == 'radio') {
+                    if (this.data[device][item].f_items[i].type == 'selector' || this.data[device][item].f_items[i].type == 'radio' || this.data[device][item].f_items[i].type == 'checkbox') {
                       if (this.data[device][item].f_items[i].f_is_defect == true && this.data[device][item].f_items[i].f_path == Vue.nopic) {
                         return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + this.data[device][item].f_items[i].f_item_value + "选中必须拍照"
                       }
+                      if (this.data[device][item].f_items[i].f_is_defect == true && (!this.data[device][item].f_items[i].f_deal_dispose || this.data[device][item].f_items[i].f_deal_dispose == '未处理')) {
+                        return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + this.data[device][item].f_items[i].f_item_value + "选中必须选择处理方式"
+                      }
                     }
                   }
                 }
@@ -1304,6 +1331,9 @@
             } else {
               this.rowCodata = codata
             }
+            if (this.rowCodata.f_deputy_director){
+              HostApp.setPreference('f_deputy_director',this.rowCodata.f_deputy_director)
+            }
             let param = {
               f_check_item_id: this.data.f_check_item_id,
               f_checker_id: this.data.f_checker_id,
@@ -1659,7 +1689,7 @@
             }
             // 预约安检回更预约安检单
             if(this.data.isupdateplanitem == 'true' && this.data.f_SafeToRepair_id){
-              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/ReturnSafeService`, {data:{
+              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/ReturnSafeService`, {data:{
                   f_paper_id:this.data.f_paper_id,
                   f_service_id:this.data.f_SafeToRepair_id
                 }
@@ -1804,7 +1834,7 @@
         return obj;
       },
       // async isoverDate(){
-      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
+      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidGetuserinfo`, {data:{
       //       condition:"f_plan_item_id='"+this.item.id+"'"
       //     }
       //   })
@@ -1920,6 +1950,7 @@
         this.data.isupdateplanitem = this.$appdata.getSingleValue('在线安检回更有计划') ? this.$appdata.getSingleValue('在线安检回更有计划') : 'false'
         // 预约安检单工单编号
         this.data.f_SafeToRepair_id = this.item.f_service_id
+        this.data.f_deputy_director = HostApp.getPreference('f_deputy_director').data || ''
         this.data.ename = Vue.user.ename
         this.data.f_outlets = Vue.user.f_parentname
         this.data.f_meetunit = Vue.user.orgpathnames
@@ -1975,8 +2006,7 @@
         this.$set('data.f_userfiles_id', this.item.f_plan_meters[0].f_userfiles_id)
         this.$set('data.f_valve_state', this.item.f_plan_meters[0].f_valve_state)
         this.$set('data.f_off_valve_reason', this.item.f_plan_meters[0].f_off_valve_reason)
-        this.$set('data.f_lgql_value', this.item.f_plan_meters[0].f_lgql_value)
-        this.$set('data.f_lgje_value', this.item.f_plan_meters[0].f_lgje_value)
+        this.$set('data.f_table_state', this.item.f_plan_meters[0].f_table_state)
         // this.$set('data.f_user_inhome_time', this.item.f_user_inhome_time)
         // this.$set('data.f_user_check_time', this.item.f_user_check_time)
         // this.$set('data.f_user_spare_phone', this.item.f_user_spare_phone)
@@ -2039,15 +2069,6 @@
                         f_path: "",
                         type: "string"
                       },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "进气方向",
-                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
-                        f_path: "",
-                        type: "string"
-                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -2101,15 +2122,6 @@
                         f_path: "",
                         type: "string"
                       },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "进气方向",
-                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
-                        f_path: "",
-                        type: "string"
-                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -2369,15 +2381,6 @@
                         f_path: "",
                         type: "string"
                       },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "进气方向",
-                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
-                        f_path: "",
-                        type: "string"
-                      },
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -2480,7 +2483,18 @@
           tittle:'安检详情',
           safe:true
         }
-        this.$goto('safecheck-userinfo', {userinfo:this.data}, 'repair')
+        this.$goto('safecheck-userinfo', {userinfo:this.data,openpaper:this.openpaper}, 'repair')
+      },
+      // bug修复：用户信息中实时显示以下最新数据（不管是从待办还是已办进）：用户累购，已用气量，上次安检已用气量，上次安检累计气量，上次安检累计金额
+      // 不建议这么做，统一需要展示的用户信息提到在线档案查看中
+      setTableInformation(){
+        if(this.item.f_plan_meters && this.item.f_plan_meters.length>0){
+          this.$set('data.f_total_gas', this.item.f_plan_meters[0].f_total_gas)
+          this.$set('data.f_meter_base', this.item.f_plan_meters[0].f_metergasnums)
+          this.$set('data.f_usage', this.item.f_plan_meters[0].f_usage)
+          this.$set('data.f_lgql_value', this.item.f_plan_meters[0].f_lgql_value)
+          this.$set('data.f_lgje_value', this.item.f_plan_meters[0].f_lgje_value)
+        }
       }
     },
     watch: {
@@ -2489,10 +2503,12 @@
         this.copy()
       }
     },
+
     async ready () {
       //送气超期功能
       //await this.isoverDate()
       this.putDevices()
+      this.setTableInformation()
       //如果已检，则提取安检单
       if (this.item.f_state != '未检') {
         if (this.role == 'inspect' || this.role == 'androidview') {
@@ -2519,21 +2535,21 @@
           if (value.data.length != 0) {
             that.$set('data', value.data[0])
             //tag)
-            if (this.data.f_collection_type == '按气量' && this.data.f_user_type == '民用') {
+            if (this.data.f_collection_type == '按气量' && (this.data.f_user_type == '民用' || this.data.f_check_type == '民用')) {
               delete this.config['燃气表']['items']['累购金额']
               delete this.config['燃气表']['items']['已用金额']
               delete this.config['燃气表']['items']['剩余金额']
               delete this.config['燃气表']['items']['金额异常差值']
-            } else if (this.data.f_collection_type == '按金额' && this.data.f_user_type == '民用') {
+            } else if (this.data.f_collection_type == '按金额' && (this.data.f_user_type == '民用' || this.data.f_check_type == '民用')) {
               delete this.config['燃气表']['items']['累购气量']
               delete this.config['燃气表']['items']['已用气量']
               delete this.config['燃气表']['items']['剩余气量']
               delete this.config['燃气表']['items']['气量异常差值']
             }
 
-            if (this.data.f_user_type == '非民用'){
-              that.config = that.config2
-            }
+            // if (this.data.f_user_type == '非民用' || this.data.f_check_type == '非民用'){
+            //   that.config.燃气表 = that.config2.燃气表
+            // }
 
             //tag)
             if (value.data[0].f_devices) {