safecheck-client 3.0.33-130 → 3.0.33-133

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