safecheck-client 3.0.39-4 → 3.0.39-41

package/src/filiale/kelai/pc/UserInfoAudit.vue

@@ -57,9 +57,8 @@
             </div>
             <div class="col-sm-4 " style="width: auto; margin-top: 8px">
               <button class="button_search button_spacing" @click="search">查询</button>
-              <!--<button class="button_new button_spacing" @click="$parent.$parent.verify()">审核</button>-->
-              <!--<button class="button_export button_spacing" @click="$parent.$parent.verifyAll()">一键审核</button>-->
-
+              <button class="button_new button_spacing" @click="$parent.$parent.verifyAll()">批量审核</button>
+              <button class="button_export button_spacing" @click="$parent.$parent.rejectAll()">批量不通过</button>
             </div>
           </div>
 
@@ -68,7 +67,7 @@
       <data-grid class="list_area table_sy" :model="model" partial='list' v-ref:grid>
         <template partial='head'>
           <tr>
-            <!--<th><nobr></nobr></th>-->
+            <th><nobr></nobr></th>
             <th><nobr>用户编号</nobr></th>
             <th><nobr>用户名称</nobr></th>
             <th><nobr>提交人</nobr></th>
@@ -81,7 +80,7 @@
           </tr>
         </template>
         <template partial='body'>
-          <!--<td style="text-align: center"><nobr><input type="checkbox" v-model="row.checked" v-bind:checked="row.checked"  @click="$parent.$parent.$parent.addChecked(row)"></nobr></td>-->
+          <td style="text-align: center"><nobr><input type="checkbox" v-model="row.checked" @click="$parent.$parent.$parent.addChecked(row)"></nobr></td>
           <td style="text-align: center"><nobr>{{row.f_userinfo_code}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_user_name}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_modifier}}</nobr></td>
@@ -126,128 +125,165 @@ export default {
       excessive:false,
       userInformation:{},
       f_approval_states:this.$appdata.getParam('审核状态'),
+      checkedRows: [] // 新增：用于存储选中的行
     }
   },
   methods: {
     search(args){
       args += 'f_time= (select max(f_time) from t_modify_userinfo B where A.f_userinfoid = B.f_userinfoid)'
-     this.model.search(args)
+      this.model.search(args)
+      this.checkedRows = [] // 清空选中项
     },
     change(row) {
-      //tag)
       new HttpResetClass().load('post',`/rs/logic/filemanage_getFilesDetail`, {
-        //f_userinfo_code:'12381344',
         f_userinfo_id:row.f_userinfoid
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
-        //tag
-        //this.userInformation=res.data
         this.$set('userInformation',res.data)
-        //tag
         this.$set('info',row)
         this.showModal = true
       })
-
     },
-    async todo(row){
+    addChecked(row) {
+      if (row.checked) {
+        this.checkedRows.push(row)
+      } else {
+        this.checkedRows.$remove(row)
+      }
+    },
+    async todo(row) {
       let r = confirm("确认修改该资料？")
-      if(r) {
-        this.excessive=true
-        let userinfoms=Object.assign({},this.userInformation.baseinfo.base)
-        //userinfoms.f_user_name=row.f_user_name
-        userinfoms.f_operator_record=row.f_modifier
-        userinfoms.f_operatorid_record=row.f_modifier_id
-        //userinfoms.f_remark=row.f_remark
-        //tag
-        if(this.userInformation.meterinfo[0].f_meter_classify!='物联网表'){
-          this.userInformation.meterinfo[0].f_meternumber=row.f_meternumber
+      if (r) {
+        this.excessive = true
+        let userinfoms = Object.assign({}, this.userInformation.baseinfo.base)
+        userinfoms.f_operator_record = row.f_modifier
+        userinfoms.f_operatorid_record = row.f_modifier_id
+
+        if (this.userInformation.meterinfo[0].f_meter_classify != '物联网表') {
+          this.userInformation.meterinfo[0].f_meternumber = row.f_meternumber
         }
-        userinfoms.userfiles=[]
+        userinfoms.userfiles = []
         userinfoms.userfiles.push(this.userInformation.meterinfo[0])
-        userinfoms.f_orgid_record=null
-        userinfoms.f_orgname_record=null
-        userinfoms.f_depid_record=null
-        userinfoms.f_depname_record=null
-        let useraddressms=Object.assign({},this.userInformation.addressinfo)
-        useraddressms.f_pcd=row.f_pcd
-        useraddressms.f_pcd_id=row.f_pcd_id
-        useraddressms.f_street=row.f_street
-        useraddressms.f_street_id=row.f_street_id
-        useraddressms.f_residential_area=row.f_residential_area
-        useraddressms.f_residential_area_id=row.f_residential_area_id
-        useraddressms.f_building=row.f_building?row.f_building:null
-        useraddressms.f_building_id=row.f_building_id
-        useraddressms.f_unit=row.f_unit?row.f_unit:null
-        useraddressms.f_floor=row.f_floor?row.f_floor:null
-        useraddressms.f_room=row.f_room?row.f_room:null
-        useraddressms.f_building_suffix= row.f_building_suffix?row.f_building_suffix:null
-        useraddressms.f_unit_suffix= row.f_unit_suffix?row.f_unit_suffix:null
-        useraddressms.f_floor_suffix= row.f_floor_suffix?row.f_floor_suffix:null
-        useraddressms.f_room_suffix= row.f_room_suffix?row.f_room_suffix:null
-        //useraddressms.f_slice_area=row.f_slice_area
-        useraddressms.f_address=row.f_address
-        useraddressms.f_special=row.f_special
-        useraddressms.f_iscity=row.f_iscity
-        useraddressms.f_operator=row.f_modifier
-        useraddressms.f_operatorid=row.f_modifier_id
-        try{
-          let res1=await new HttpResetClass().load('POST','/rs/logic/filemanage_fileSave', {data: {userinfo: userinfoms,modifyReason:this.f_source?`${this.f_source}审核通过更改档案信息`:'',address:{id:this.userInformation.addressinfo.id,oldid:this.userInformation.addressinfo.id}}},{resolveMsg: null, rejectMsg: null})
-          //tag)
-          if(res1.data.status==200){
-            let res2=await new HttpResetClass().load('POST','/rs/logic/address_updateuseraddress', useraddressms,{resolveMsg: null, rejectMsg: null})
-            //tag)
-            if(res2.data.id){
-              //tag)
-              this.info.f_approved='已审核'
-              this.info.f_approved_by=this.$login.f.name
-              this.info.f_approved_time=Util.toStandardTimeString()
-              //tag)
-              let res3=await new HttpResetClass().load('POST','/rs/logic/SaveEntity', {data:{row:this.info,tablename:'t_modify_userinfo'}},{resolveMsg: null, rejectMsg: null})
-                //tag)
-                if(res3.data.code==200){
-                  this.$showMessage("审核成功,用户信息已更新！")
-                  this.excessive=false
-                }else{
-                  this.$showMessage("审核失败！")
-                  this.excessive=false
-                }
-            }else{
+        userinfoms.f_orgid_record = null
+        userinfoms.f_orgname_record = null
+        userinfoms.f_depid_record = null
+        userinfoms.f_depname_record = null
+        let useraddressms = Object.assign({}, this.userInformation.addressinfo)
+        useraddressms.f_pcd = row.f_pcd
+        useraddressms.f_pcd_id = row.f_pcd_id
+        useraddressms.f_street = row.f_street
+        useraddressms.f_street_id = row.f_street_id
+        useraddressms.f_residential_area = row.f_residential_area
+        useraddressms.f_residential_area_id = row.f_residential_area_id
+        useraddressms.f_building = row.f_building ? row.f_building : null
+        useraddressms.f_building_id = row.f_building_id
+        useraddressms.f_unit = row.f_unit ? row.f_unit : null
+        useraddressms.f_floor = row.f_floor ? row.f_floor : null
+        useraddressms.f_room = row.f_room ? row.f_room : null
+        useraddressms.f_building_suffix = row.f_building_suffix ? row.f_building_suffix : null
+        useraddressms.f_unit_suffix = row.f_unit_suffix ? row.f_unit_suffix : null
+        useraddressms.f_floor_suffix = row.f_floor_suffix ? row.f_floor_suffix : null
+        useraddressms.f_room_suffix = row.f_room_suffix ? row.f_room_suffix : null
+        useraddressms.f_address = row.f_address
+        useraddressms.f_special = row.f_special
+        useraddressms.f_iscity = row.f_iscity
+        useraddressms.f_operator = row.f_modifier
+        useraddressms.f_operatorid = row.f_modifier_id
+        try {
+          let res1 = await new HttpResetClass().load('POST', '/rs/logic/filemanage_fileSave', {data: {userinfo: userinfoms, modifyReason: this.f_source ? `${this.f_source}审核通过更改档案信息` : '', address: {id: this.userInformation.addressinfo.id, oldid: this.userInformation.addressinfo.id}}}, {resolveMsg: null, rejectMsg: null})
+          if (res1.data.status == 200) {
+            let res2 = await new HttpResetClass().load('POST', '/rs/logic/address_updateuseraddress', useraddressms, {resolveMsg: null, rejectMsg: null})
+            if (res2.data.id) {
+              row.f_approved = '已审核'
+              row.f_approved_by = this.$login.f.name
+              row.f_approved_time = Util.toStandardTimeString()
+              let res3 = await new HttpResetClass().load('POST', '/rs/logic/SaveEntity', {data: {row: row, tablename: 't_modify_userinfo'}}, {resolveMsg: null, rejectMsg: null})
+              if (res3.data.code == 200) {
+                this.$showMessage("审核成功,用户信息已更新！")
+                this.excessive = false
+              } else {
+                this.$showMessage("审核失败！")
+                this.excessive = false
+              }
+            } else {
               this.$showMessage("更新地址信息失败！")
-              this.excessive=false
+              this.excessive = false
             }
-          }else{
+          } else {
             this.$showMessage("修改用户信息失败！")
-            this.excessive=false
+            this.excessive = false
           }
-        }catch(msg){
-          if( typeof msg == 'object' && msg.data){
-            this.$showMessage("修改用户信息失败！"+msg.data)
-          }else{
+        } catch (msg) {
+          if (typeof msg == 'object' && msg.data) {
+            this.$showMessage("修改用户信息失败！" + msg.data)
+          } else {
             this.$showMessage("审核失败,可以尝试重新点击审核按钮再次进行审核！！")
           }
-          this.excessive=false
+          this.excessive = false
         }
       }
     },
-    isnull(val){
-      if(val == null){
+    isnull(val) {
+      if (val == null) {
         return ''
-      }else{
+      } else {
         return val
       }
     },
-    undo(row){
-      this.info.f_approved='未通过'
-      this.info.f_approved_by=this.$login.f.name
-      this.info.f_approved_time=Util.toStandardTimeString()
-      new HttpResetClass().load('POST','/rs/logic/SaveEntity', {data:{row:this.info,tablename:'t_modify_userinfo'}},{resolveMsg: null, rejectMsg: null}).then((res3)=>{
-        //tag)
+    async verifyAll() {
+      if (this.checkedRows.length === 0) {
+        this.$showMessage("请选择要批量审核的记录！")
+        return
+      }
+      let r = confirm("确认批量审核选中的资料？")
+      if (r) {
+        this.excessive = true
+        for (let i = 0; i < this.checkedRows.length; i++) {
+          let row = this.checkedRows[i]
+          if (row.f_approved === '未审核') {
+            await new HttpResetClass().load('post',`/rs/logic/filemanage_getFilesDetail`, {
+              f_userinfo_id:row.f_userinfoid
+            }, {resolveMsg: null, rejectMsg: null}).then(async (res) => {
+              this.$set('userInformation',res.data)
+              this.$set('info',row)
+              await this.todo(row)
+            })
+          }
+        }
+        this.excessive = false
+        this.search('') // 刷新列表
+        this.$showMessage("批量审核完成！")
+      }
+    },
+    async rejectAll() {
+      if (this.checkedRows.length === 0) {
+        this.$showMessage("请选择要批量不通过的记录！")
+        return
+      }
+      let r = confirm("确认批量不通过选中的资料？")
+      if (r) {
+        this.excessive = true
+        for (let i = 0; i < this.checkedRows.length; i++) {
+          let row = this.checkedRows[i]
+          if (row.f_approved === '未审核') {
+            await this.undo(row)
+          }
+        }
+        this.excessive = false
+        this.search('') // 刷新列表
+        this.$showMessage("批量不通过完成！")
+      }
+    },
+    async undo(row){
+      row.f_approved='未通过'
+      row.f_approved_by=this.$login.f.name
+      row.f_approved_time=Util.toStandardTimeString()
+      await new HttpResetClass().load('POST','/rs/logic/SaveEntity', {data:{row:row,tablename:'t_modify_userinfo'}},{resolveMsg: null, rejectMsg: null}).then((res3)=>{
         if(res3.data.code==200){
           this.$showMessage("审核成功,审核结果:未通过！")
         }else{
           this.$showMessage("审核失败！")
         }
       })
-
     }
   }
 }

package/src/filiale/liaoyuan/pc/NewCheckpaper.vue

@@ -955,14 +955,14 @@ export default {
               // this.$goto('paper-message-blank', {userinfo:this.data,devices:this.devices,config:this.config,role:this.role}, 'self')
               this.isshow = true
               asyncReady(this).then(() => {
-                ////tag
-                ////tag)
-                if (this.data.f_check_type=='民用'){
+                if (this.data.f_check_type){
+                  if (this.data.f_check_type=='民用'){
+                    this.deviceconfig=Vue.config.safecheck.DevicesConfig
+                  }else if (this.data.f_check_type=='非民用'){
+                    this.deviceconfig=Vue.config.safecheck.DevicesSetConfig
+                  }
+                }else {
                   this.deviceconfig=Vue.config.safecheck.DevicesConfig
-                  ////tag)
-                }else if (this.data.f_check_type=='非民用'){
-                  this.deviceconfig=Vue.config.safecheck.DevicesSetConfig
-                  ////tag)
                 }
                 if (this.planmeter.f_meter_classify=='机表'){
                   let aaa=Object.assign({},this.configjb["燃气表"].items,this.deviceconfig["燃气表"].items)

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

@@ -15,27 +15,27 @@
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">用户名称:</label><input type="text" class="form-control rightipt"
-                                                      v-model="userinfo.baseinfo.base.f_user_name" readonly/>
+                                                          v-model="userinfo.baseinfo.base.f_user_name" readonly/>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">用户状态:</label><input type="text" class="form-control rightipt" readonly
-                                                      v-model="userinfo.baseinfo.base.f_user_state"/>
+                                                          v-model="userinfo.baseinfo.base.f_user_state"/>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">用户电话:</label><input type="text" class="form-control rightipt"
-                                                      v-model="userinfo.baseinfo.base.f_user_phone"/>
+                                                          v-model="userinfo.baseinfo.base.f_user_phone"/>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">租户姓名:</label><input type="text" class="form-control rightipt"
-                                                      v-model="userinfo.baseinfo.base.f_rent_name"/>
+                                                          v-model="userinfo.baseinfo.base.f_rent_name"/>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">租户电话:</label><input type="text" class="form-control rightipt"
-                                                      v-model="userinfo.baseinfo.base.f_zuhu_phone"/>
+                                                          v-model="userinfo.baseinfo.base.f_zuhu_phone"/>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">建档日期:</label><input type="text" class="form-control rightipt"
-                                                      v-model="userinfo.baseinfo.base.f_createfile_date" readonly/>
+                                                          v-model="userinfo.baseinfo.base.f_createfile_date" readonly/>
         </div>
         <!--        <div class="row auto" style="margin: 5px 0">
                   <label class="righttxt">开户日期:</label><input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_open_date" readonly  />
@@ -45,17 +45,23 @@
           <div class="rightipt" style="display: flex;justify-content: space-around;margin-top: 5px">
             <div><input type="radio" v-model="addressType" name="addressType" @change="changeAddressType"
                         id="phone_addressType1" value="普通地址"/><label style="font-weight: normal;padding-left: 2px"
-                                                                     for="phone_addressType1">普通地址</label></div>
+                                                                         for="phone_addressType1">普通地址</label></div>
             <div><input type="radio" v-model="addressType" name="addressType" @change="changeAddressType"
                         id="phone_addressType2" value="特殊地址"/><label style="font-weight: normal;padding-left: 2px"
-                                                                     for="phone_addressType2">特殊地址</label></div>
+                                                                         for="phone_addressType2">特殊地址</label></div>
+          </div>
+
+        </div>
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">经度:</label>
+          <input readonly type="text" class="form-control rightipt" v-model="userinfo.addressinfo.f_lng"/>
+        </div>
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">纬度:</label>
+          <input readonly type="text" class="form-control rightipt" v-model="userinfo.addressinfo.f_lat"/>
+          <div style="margin-left: 10px;" @click="getLocation">
+            <img src="../../../assets/定位.png" alt="定位" style="width: 24px; height: 24px; cursor: pointer;" />
           </div>
-          <!--<input type="text" style="width: 75%;float:right" class="form-control"  v-model="row.f_devices_type"  />-->
-          <!--<input type="text" class="form-control rightipt" readonly v-model="userinfo.addressinfo.f_pcd"  />-->
-          <!--<v-select :value.sync="userinfo.addressinfo.f_iscity" class="input-font" style="margin-left: 5%;"
-                    :width="'60%'"
-                    v-model="userinfo.addressinfo.f_iscity"
-                    :options='cityTypes' placeholder='地区类型'  close-on-select clear-button value-single @change="area_change()"></v-select>-->
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">地区类型:</label>
@@ -108,27 +114,27 @@
         </div>-->
         <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址'">
           <label class="righttxt">楼&ensp;&ensp;&ensp;&ensp;号:</label><input type="text" @change="changeNewAddress"
-                                                                            class="form-control rightipt"
-                                                                            v-model="userinfo.addressinfo.f_building"/>
+                                                                              class="form-control rightipt"
+                                                                              v-model="userinfo.addressinfo.f_building"/>
         </div>
         <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址'">
           <label class="righttxt">单&ensp;&ensp;&ensp;&ensp;元:</label><input type="text" @change="changeNewAddress"
-                                                                            class="form-control rightipt"
-                                                                            v-model="userinfo.addressinfo.f_unit"/>
+                                                                              class="form-control rightipt"
+                                                                              v-model="userinfo.addressinfo.f_unit"/>
         </div>
         <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址'">
           <label class="righttxt">楼&ensp;&ensp;&ensp;&ensp;层:</label><input type="text" @change="changeNewAddress"
-                                                                            class="form-control rightipt"
-                                                                            v-model="userinfo.addressinfo.f_floor"/>
+                                                                              class="form-control rightipt"
+                                                                              v-model="userinfo.addressinfo.f_floor"/>
         </div>
         <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址'">
           <label class="righttxt">门&ensp;牌&ensp;号:</label><input type="text" @change="changeNewAddress"
-                                                                 class="form-control rightipt"
-                                                                 v-model="userinfo.addressinfo.f_room"/>
+                                                                    class="form-control rightipt"
+                                                                    v-model="userinfo.addressinfo.f_room"/>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">详细地址:</label><input type="text" class="form-control rightipt" readonly
-                                                      v-model="userinfo_old.addressinfo.f_address"/>
+                                                          v-model="userinfo_old.addressinfo.f_address"/>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">新&ensp;地&ensp;址:</label>
@@ -144,8 +150,8 @@
 
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">备&ensp;&ensp;&ensp;&ensp;注:</label><textarea class="form-control rightipt"
-                                                                               style="height: 150px"
-                                                                               v-model="userinfo.addressinfo.f_comments"></textarea>
+                                                                                 style="height: 150px"
+                                                                                 v-model="userinfo.addressinfo.f_comments"></textarea>
           <!--<input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_remark"  />-->
         </div>
       </div>
@@ -257,6 +263,10 @@
           <label class="righttxt">气表类型:</label>
           <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_meter_classify" readonly/>
         </div>
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">现场表具型号:</label>
+          <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_xc_meter_style"/>
+        </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">表前阀状态:</label>
           <!--<input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_position"  readonly/>-->
@@ -297,19 +307,19 @@
           </div>
           <div class="row auto" style="margin: 5px 0">
             <label class="righttxt">设备品牌:</label>
-<!--            <v-select class="rightipt" :value.sync="row.f_brand"
-                      v-model="row.f_brand"
-                      placeholder='请选择'
-                      :width='wid'
-                      readonly
-                      :options="deviceBrandOption[row.f_devices_type]"
-                      close-on-select value-single></v-select>-->
+            <!--            <v-select class="rightipt" :value.sync="row.f_brand"
+                                  v-model="row.f_brand"
+                                  placeholder='请选择'
+                                  :width='wid'
+                                  readonly
+                                  :options="deviceBrandOption[row.f_devices_type]"
+                                  close-on-select value-single></v-select>-->
             <input type="text" class="form-control rightipt"
                    v-model="row.f_brand"/>
           </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"/>
+                                                            v-model="row.f_devices_model"/>
           </div>
           <div class="row auto" style="margin: 5px 0">
             <label class="righttxt">生产日期:</label>
@@ -324,7 +334,7 @@
           </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"/>
+                                                            v-model="row.f_service_life"/>
           </div>
           <!--          <div class="row auto" style="margin: 5px 0">
                       <label class="righttxt">到期日期:</label>
@@ -339,7 +349,7 @@
                     </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"/>
+                                                                      v-model="row.f_input_person"/>
           </div>
           <div class="row auto" style="margin: 5px 0">
             <label class="righttxt">安装日期:</label>
@@ -354,7 +364,7 @@
           </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"/>
+                                                            v-model="row.f_devices_num"/>
           </div>
           <div class="row auto" style="margin: 5px 0">
             <label class="righttxt">管道类型:</label><input type="text" class="form-control rightipt"   v-model="row.f_pipe_type"  />
@@ -448,7 +458,10 @@ export default {
       showBox: false,
       directOptions: [{label: '是', value: '是'}, {label: '否', value: '否'}],
       deviceBrandOption: {},
-      isNeedAudit: this.$appdata.getSingleValue('信息变更是否需要审核') == 'false' ? false : true
+      isNeedAudit: this.$appdata.getSingleValue('信息变更是否需要审核') == 'false' ? false : true,
+      detailedAddress:'',
+      administrativeDivision:''
+
     }
   },
   props: {
@@ -459,6 +472,60 @@ export default {
     f_source: ''
   },
   methods: {
+    getLocation(){
+      const location = HostApp.getDetailAddress()
+      const longitude = HostApp.getPreference('longitude')
+      const latitude = HostApp.getPreference('latitude')
+      this.userinfo.addressinfo.f_lng=longitude.data
+      this.userinfo.addressinfo.f_lat=latitude.data
+      this.userinfo.addressinfo.f_address=location.data
+      const parsed = this.parseAddress(location.data);
+      console.log('行政区划部分:', parsed.administrativeDivision);
+      this.selectPcd.f_pcd=parsed.administrativeDivision
+      this.selectPcd.id=1
+      console.log('详细地址部分:', parsed.detailedAddress)
+      this.detailedAddress=parsed.detailedAddress
+    },
+    parseAddress(address) {
+      // 匹配省市区县的正则表达式
+      const regex = /^(.*?(?:省|自治区|直辖市)?(?:[A-Za-z\u4e00-\u9fa5]*?(?:市))?(?:[A-Za-z\u4e00-\u9fa5]*?(?:区|县|市))?)((?:[A-Za-z\u4e00-\u9fa5\d]|.)*)$/;
+
+      const match = address.match(regex);
+      if (match) {
+        return {
+          administrativeDivision: match[1].trim(),
+          detailedAddress: match[2].trim()
+        };
+      } else {
+        // 备用方案：通过常见后缀分割
+        const splitIndex = this.findAdministrativeBoundary(address);
+        if (splitIndex > 0) {
+          return {
+            administrativeDivision: address.substring(0, splitIndex),
+            detailedAddress: address.substring(splitIndex)
+          };
+        }
+      }
+      // 如果无法分割，返回默认值
+      return {
+        administrativeDivision: address,
+        detailedAddress: ''
+      };
+    },
+    findAdministrativeBoundary(address) {
+      // 常见的行政区划后缀
+      const suffixes = ['区', '县', '市'];
+      // 从后往前查找第一个匹配的后缀
+      for (let i = address.length - 1; i >= 0; i--) {
+        for (let suffix of suffixes) {
+          if (address[i] === suffix &&
+            (i < address.length - 1)) {
+            return i + 1;
+          }
+        }
+      }
+      return -1;
+    },
     scan() {
       HostApp.__this__ = this,
         HostApp.scanCode({callback: "javascript:HostApp.__this__.getCode();"})
@@ -623,6 +690,8 @@ export default {
           this.userinfo.addressinfo.f_slice_area = this.selectArea.f_slice_area ? this.selectArea.f_slice_area : ''
           this.excessive = true
           let address = {}
+          address.f_lng=this.userinfo.addressinfo.f_lng
+          address.f_lat=this.userinfo.addressinfo.f_lat
           address.f_filialeid = this.userinfo.addressinfo.f_filialeid
           address.f_pcd = this.selectPcd.f_pcd
           address.f_pcd_id = this.selectPcd.id
@@ -661,6 +730,7 @@ export default {
           this.userinfo_old.meterinfo[0].f_bqf_state = this.userinfo.meterinfo[0].f_bqf_state
           this.userinfo_old.meterinfo[0].f_if_direct = this.userinfo.meterinfo[0].f_if_direct
           this.userinfo_old.meterinfo[0].f_meternumber = this.userinfo.meterinfo[0].f_meternumber
+          this.userinfo_old.meterinfo[0].f_xc_meter_style = this.userinfo.meterinfo[0].f_xc_meter_style
           userinfoms.userfiles = []
           this.userinfo_old.meterinfo[0].devicesinfo = this.model
           userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
@@ -743,6 +813,7 @@ export default {
           this.userinfo_old.meterinfo[0].f_bqf_state = this.userinfo.meterinfo[0].f_bqf_state
           this.userinfo_old.meterinfo[0].f_if_direct = this.userinfo.meterinfo[0].f_if_direct
           this.userinfo_old.meterinfo[0].f_meternumber = this.userinfo.meterinfo[0].f_meternumber
+          this.userinfo_old.meterinfo[0].f_xc_meter_style = this.userinfo.meterinfo[0].f_xc_meter_style
           userinfoms.userfiles = []
           this.userinfo_old.meterinfo[0].devicesinfo = this.model
           userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
@@ -1073,7 +1144,8 @@ export default {
     getAddressTS() {
       return (this.userinfo.addressinfo.f_pcd ? this.userinfo.addressinfo.f_pcd : '') +
         (this.userinfo.addressinfo.f_street ? this.userinfo.addressinfo.f_street : '') +
-        (this.userinfo.addressinfo.f_residential_area ? this.userinfo.addressinfo.f_residential_area : '')
+        (this.userinfo.addressinfo.f_residential_area ? this.userinfo.addressinfo.f_residential_area : '')+
+        (this.detailedAddress ? this.detailedAddress: '')
     }
   },
   watch: {

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

@@ -729,7 +729,7 @@ export default {
       this.f_items[this.f_gas_aberrant_number.index].f_is_defect = false
       if(val=='已用气量'){
         //剩余气量 = 累购-已用
-        this.f_items[this.f_gas_balance.index].f_item_value= this.f_items[this.f_total_gas.index].f_item_value-this.f_items[this.f_table_base.index].f_item_value
+        this.f_items[this.f_gas_balance.index].f_item_value= (this.f_items[this.f_total_gas.index].f_item_value-this.f_items[this.f_table_base.index].f_item_value).toFixed(2)
         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
         }

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

@@ -1943,6 +1943,9 @@ export default {
       this.$set('data.f_state',this.item.f_state)
       this.$set('data.f_source', this.source?this.source:'安检')
       this.$set('data.f_other_checker_name', '')
+      const obj = HostApp.getGpsDetailAddress()
+      this.$set('data.f_longitude', obj.longitude)
+      this.$set('data.f_latitude', obj.latitude)
       //tag
       // 用户信息
       this.$set('data.f_user_name', this.item.f_user_name)