safecheck-client 3.0.39-4 → 3.0.39-41

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') {

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

@@ -979,6 +979,7 @@ export default {
             "燃气表照片":{"index":12,"type":"picture","checkmust": false},
             "户累购气量":{"index":18,"type":"number","readonly":true},
             "户累购金额":{"index":19,"type":"number","readonly":true},
+            "已用气量":{"index":20,"type":"number","checkmust": false},//基表数
           }
         }
       },