safecheck-client 3.0.39-8 → 3.0.39-80

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,75 @@ export default {
     f_source: ''
   },
   methods: {
+    getLocation(){
+      const location = HostApp.getDetailAddress()
+      const longitude = HostApp.getPreference('longitude')
+      const latitude = HostApp.getPreference('latitude')
+
+      new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: "*",
+          tablename: "t_user_address",
+          orderitem: "id",
+          condition: `f_lng='${longitude.data}' and f_lat='${latitude.data}' `
+        }
+      }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        //tag)
+        if (res.data.length > 0) {
+          this.$showMessage('存在相同的经纬度，请重新定位！', ['confirm', 'cancel'])
+        }else{
+          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 +705,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 +745,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 +828,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 +1159,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)

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

@@ -4,12 +4,10 @@
       <div class="panel-body panel-self">
         <div class="col-xs-12" style="padding: 2px 0">
           <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
-          <!--<a class="panel-title col-xs-7 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" @click="searchHistory(userinfo.f_userinfoid)">{{ userinfo.f_userinfo_code }}</a>-->
-          <p class="panel-title col-xs-7 text-left input-font">
-            <label @click="searchHistory(userinfo.f_userinfoid)"
-                   style="color: #00b3ee;text-decoration:none;">{{ userinfo.f_userinfo_code }}</label><label
-            v-if="upUserinfoSta=='是'" style="color: #00b3ee;text-decoration:none;"
-            @click="upuserinfo(userinfo.f_userinfoid)">信息变更</label>
+          <p class="panel-title col-xs-9 text-left input-font">
+            <label @click="searchHistory(userinfo.f_userinfoid)" style="color: #00b3ee;text-decoration:none;">{{ userinfo.f_userinfo_code }}</label>
+            <label v-if="upUserinfoSta=='是'" style="color: #00b3ee;text-decoration:none;" @click="upuserinfo(userinfo.f_userinfoid)">信息变更</label>
+            <label  style="color: #00b3ee;text-decoration:none;"  @click="navigateToMap(userinfo)">导航</label>
           </p>
         </div>
         <div class="col-xs-12" style="padding: 2px 0">
@@ -174,14 +172,14 @@
       </div>
 
     </div>
-<!--    <div :class="style__" class="form-group" v-show="f_usegas == '未使用'">-->
-<!--      <sapn class="text-left col-md-12 col-sm-12 col-xs-12">处置方式：</sapn>-->
-<!--      <div class="col-xs-12 col-sm-12 col-md-12">-->
-<!--        <input type="checkbox" v-model="f_no_gas_device">无燃气具-->
-<!--        <input type="checkbox" v-model="f_close_valve">关闭表前阀-->
-<!--        <input type="checkbox" v-model="f_unload_battery">取下表内电池-->
-<!--      </div>-->
-<!--    </div>-->
+    <!--    <div :class="style__" class="form-group" v-show="f_usegas == '未使用'">-->
+    <!--      <sapn class="text-left col-md-12 col-sm-12 col-xs-12">处置方式：</sapn>-->
+    <!--      <div class="col-xs-12 col-sm-12 col-md-12">-->
+    <!--        <input type="checkbox" v-model="f_no_gas_device">无燃气具-->
+    <!--        <input type="checkbox" v-model="f_close_valve">关闭表前阀-->
+    <!--        <input type="checkbox" v-model="f_unload_battery">取下表内电池-->
+    <!--      </div>-->
+    <!--    </div>-->
     <div class="auto app-text" style="margin-top: 5px;" v-if="this.$parent.$parent.role != 'view'">
       <div class="panel" style="padding: 10px 7px 10px 0px;">
         <div class="panel-body panel-self">
@@ -281,11 +279,20 @@ export default {
     this.$set('biaoxinghao', '')
   },
   ready () {
-    //tag
-    //tag)
-    // //tag)
-    // this.$set('userinfo.f_meter_no',this.userinfo.planmeterss.f_meter_no)
-    // //tag)
+    if(this.userinfo.f_userinfoid){
+      new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        data:{
+          items:"*",
+          tablename:"t_user_address",
+          orderitem:"id",
+          condition:`f_userinfo_id= '${this.userinfo.f_userinfoid}'`}
+      }, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+        if(res.data.length>0){
+          this.$set('userinfo.f_lat', res.data[0].f_lat)
+          this.$set('userinfo.f_lng', res.data[0].f_lng)
+        }
+      })
+    }
     this.$set('beforephone', this.userinfo.f_user_phone)
     this.$set('gmlist', [])
     //tag
@@ -308,6 +315,22 @@ export default {
     this.safecheckStateReady()
   },
   methods: {
+    navigateToMap(userinfo) {
+      // 检查是否有经纬度信息
+      if (userinfo.f_lat && userinfo.f_lng) {
+        try {
+          HostApp.openThirdPartyMap({
+            lon:userinfo.f_lng,
+            lat:userinfo.f_lat,
+            address:userinfo.f_address
+          })
+        } catch (e) {
+          this.$showMessage('无法启动导航功能,请检查是否安装了高德地图app');
+        }
+      } else {
+        this.$showMessage('当前用户无坐标信息，请进行维护');
+      }
+    },
     updatebiaohao (f_meter_no, f_userinfo_id) {
       this.$showMessage('将用户 ' + this.userinfo.f_user_name + '的机表表号从' + this.userinfo.planmeterss.f_meter_no + '修改为' + f_meter_no, ['confirm', 'cancel']).then((butt) => {
         if (butt == 'confirm') {