safecheck-client 3.0.33-99 → 3.0.34-1

package/src/filiale/siyang/pc.js

@@ -0,0 +1,16 @@
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'plan-manage':(resolve) => { require(['./pc/PlanManage'], resolve) },
+  'paper-main':(resolve) => { require(['./pc/PaperList'], resolve) },
+  'new-check-paper':(resolve) => {require(['./pc/NewCheckpaper'], resolve)},
+  'check-user-list':(resolve) => { require(['./pc/checkUserList'], resolve) },
+  'paper-defect-main':(resolve) => { require(['./pc/PaperDefectMain'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/tianke/pc/checkScreen.vue

@@ -342,13 +342,15 @@
 
 
         let a3=[]
-        for(let i=0;i<this.level2.length;i++){
-          a3.push({
-            lnglat: [this.level2[i].f_longitude,this.level2[i].f_latitude], //点标记位置
-            name: '二级隐患',
-            id:i,
-            rowstr:this.level2[i]
-          })
+        for(let o=0;o<this.level2.length;o++){
+          if (this.level2[o].f_longitude && this.level2[o].f_latitude){
+            a3.push({
+              lnglat: [this.level2[o].f_longitude,this.level2[o].f_latitude], //点标记位置
+              name: '二级隐患',
+              id:o,
+              rowstr:this.level2[o]
+            })
+          }
         }
         // 将数组设置到 massMarks 图层
         this.level2Mulchs.setData(a3);
@@ -356,13 +358,15 @@
         this.level2Mulchs.setMap(this.map);
 
         let a4=[]
-        for(let i=0;i<this.level3.length;i++){
-          a4.push({
-            lnglat: [this.level3[i].f_longitude, this.level3[i].f_latitude], //点标记位置
-            name: '三级隐患',
-            id:i,
-            rowstr:this.level3[i]
-          })
+        for(let p=0;p<this.level3.length;p++){
+          if (this.level3[p].f_longitude&&this.level3[p].f_latitude){
+            a4.push({
+              lnglat: [this.level3[p].f_longitude, this.level3[p].f_latitude], //点标记位置
+              name: '三级隐患',
+              id:p,
+              rowstr:this.level3[p]
+            })
+          }
         }
         // 将数组设置到 massMarks 图层
         this.level3Mulchs.setData(a4);
@@ -371,13 +375,15 @@
 
 
         let a5=[]
-        for(let i=0;i<this.problems.length;i++){
-          a5.push({
-            lnglat: [this.problems[i].f_longitude, this.problems[i].f_latitude], //点标记位置
-            name: '普通问题',
-            id:i,
-            rowstr:this.problems[i]
-          })
+        for(let l=0;l<this.problems.length;l++){
+          if (this.problems[l].f_longitude&&this.problems[l].f_latitude){
+            a5.push({
+              lnglat: [this.problems[l].f_longitude, this.problems[l].f_latitude], //点标记位置
+              name: '普通问题',
+              id:l,
+              rowstr:this.problems[l]
+            })
+          }
         }
         // 将数组设置到 massMarks 图层
         this.problemsMulchs.setData(a5);

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

@@ -192,6 +192,27 @@
             </div>
           </div>
         </div>-->
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">气表品牌:</label>
+          <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_gasbrand_id "
+                    v-model="userinfo.meterinfo[0].f_gasbrand_id "
+                    placeholder='请选择'
+                    :width='wid'
+                    @change="brand_change"
+                    readonly
+                    :options="brandlist"
+                    close-on-select value-single></v-select>
+        </div>
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">气表型号:</label>
+          <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_gasmodel_id"
+                    v-model="userinfo.meterinfo[0].f_gasmodel_id"
+                    placeholder='请选择'
+                    :width='wid'
+                    readonly
+                    :options="modellist"
+                    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="userinfo.meterinfo[0].f_gas_person"/>
@@ -425,7 +446,9 @@
             'f_user_name'
           ],
           checkUserFilesField: [
-            'f_meternumber'
+            'f_meternumber',
+            'f_gasbrand_id',
+            'f_gasmodel_id'
           ],
           checkAddressField: [
             'f_pcd_id',
@@ -441,6 +464,8 @@
           ],
         },
         boxOptions: [],
+        brandlist: [],
+        modellist: [],
         showBox: false,
         directOptions: [{label: '是', value: '是'}, {label: '否', value: '否'}],
         deviceBrandOption: {},
@@ -455,6 +480,20 @@
       f_source: ''
     },
     methods: {
+      async getBrand() {
+        let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          data: {
+            items: "*",
+            tablename: "t_gasbrand",
+            orderitem: "id",
+            condition: `f_orgid = '${Vue.user.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        ////tag)
+        res.data.forEach((result) => {
+          this.brandlist.push({label: result.f_meter_brand , value: result.id})
+        })
+      },
       scan() {
         HostApp.__this__ = this,
           HostApp.scanCode({callback: "javascript:HostApp.__this__.getCode();"})
@@ -770,6 +809,8 @@
                       f_iscity: this.userinfo.addressinfo.f_iscity,
                       f_special: this.userinfo.addressinfo.f_special,
                       f_meternumber: this.userinfo.meterinfo[0].f_meternumber,
+                      f_gasbrand_id: this.userinfo.meterinfo[0].f_gasbrand_id,
+                      f_gasmodel_id: this.userinfo.meterinfo[0].f_gasmodel_id,
                       changemeterno: this.changemeterno
                     },
                     tablename: 't_modify_userinfo'
@@ -865,6 +906,23 @@
 
         this.changeNewAddress()
       },
+      async brand_change() {
+        /*根据气表品牌，查询气表类型*/
+        if (this.userinfo.meterinfo[0].f_gasbrand_id!== "") {
+          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+            data: {
+              items: "*",
+              tablename: "t_gasmodel",
+              orderitem: "id",
+              condition: `f_gasbrand_id= '${this.userinfo.meterinfo[0].f_gasbrand_id}'`
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          ////tag)
+          res.data.forEach((result) => {
+            this.modellist.push({label: result.f_meter_style, value: result.id})
+          })
+        }
+      },
       async pcd_change() {
         //tag
         if (this.selectPcd.id) {
@@ -1083,7 +1141,7 @@
         return
       }
       try {
-
+        this.getBrand()
         this.devices_types = Vue.$appdata.getParam('设备类型')
         console.log('this.devices_types=', JSON.stringify(this.devices_types))
         for (const devices_type of this.devices_types) {

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

@@ -920,13 +920,12 @@
         if(Util.required(this.data.f_user_name))
           return prefix + '用户名必须输入'
         if(!(/^\d{11}$/.test(this.data.f_user_phone))) {
-
           return '请输入正确的电话号码'
         }
         // if(Util.required(this.data.f_residential_area))
         //   return prefix + '小区名称必须输入'
-        if(Util.required(this.data.f_address))
-          return prefix + '地址必须输入'
+        // if(Util.required(this.data.f_address))
+        //   return prefix + '地址必须输入'
       },
       verifyDevices() {
         for (let dev in this.config) {

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

@@ -601,7 +601,7 @@ export default {
                 if (defects != '') {
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
                 }
-              } else if (items.type === 'string') {
+              } else if (items.type === 'string' && items.f_is_defect && items.f_item_value[0]) {
                 checkResult = '有隐患'
                 this.result = '有隐患'
                 deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)

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

@@ -170,8 +170,8 @@
                   <!--                    style="width: 60%">-->
                   <!--                  </datepicker>-->
                   <div class="form-group" style="float: left;width:60%">
-                    <input v-model="row.f_lose_efficacy" class="form-control" maxlength="100" placeholder="单位:天"
-                           type="text">
+                    <input v-model="row.f_lose_efficacy" class="form-control" maxlength="100" placeholder="单位:天" onkeyup="value=value.replace(/[^\d\.]/g,'')"
+                           type="number">
                   </div>
                 </div>
                 <div

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

@@ -1078,6 +1078,16 @@ export default {
         }
         this.checkResult = {}
       }
+      if (checkResults.data.length > 0) {
+        let msg = ''
+        for (let a = 0; a < checkResults.data.length; a++) {
+          for (let datumKey in checkResults.data[a]) {
+            msg += datumKey + ':' + checkResults.data[a][datumKey] + ';'
+          }
+        }
+        this.data.f_defect_text = msg
+        codata.f_defect_text = msg
+      }
       //tag
       //tag)
       codata.f_defect_content = JSON.stringify(checkResults)

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

@@ -25,8 +25,10 @@
         </div>
         <div class="col-xs-12" style="padding: 2px 0">
           <p class="panel-title col-xs-6 text-left font"  style="width: 30%;float: left"><b>用户电话:</b></p>
-          <p class="panel-title col-xs-6 text-left input-font">{{ userinfo.f_user_phone }}
-
+          <p class="panel-title col-xs-6 text-left input-font" style="width: 62%">{{ userinfo.f_user_phone }}
+            <img src="../../../assets/phone.png" style="width: 8%"
+                 v-on:click.stop.prevent='makeAPhoneCall(userinfo.f_user_phone)'/>
+          </p>
         </div>
         <div class="col-xs-12" style="padding: 2px 0">
           <p class="panel-title col-xs-6 text-left font"  style="width: 30%;float: left"><b>备用电话:</b></p>
@@ -288,6 +290,9 @@
       this.safecheckStateReady()
     },
     methods: {
+      makeAPhoneCall(phoneNumber) {
+        this.$androidUtil.makeAPhoneCall(phoneNumber)
+      },
       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"){