safecheck-client 4.0.1-4 → 4.0.1-41

package/src/filiale/libo/pc.js

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

package/src/filiale/meihekou/android/MeterReading.vue

@@ -17,12 +17,16 @@
                      onkeyup="value=value.replace(/[^\d\.]/g,'')" readonly type="text">
             </div>
 
+            <!--            <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">-->
+            <!--              <label class="lb-left text-justify">上期结余</label>-->
+            <!--              <input v-model="meterData.f_curbalance" class="form-control"-->
+            <!--                     onkeyup="value=value.replace(/[^\d\.]/g,'')" readonly type="text">-->
+            <!--            </div>-->
             <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
-              <label class="lb-left text-justify">上期结余</label>
-              <input v-model="meterData.f_curbalance" class="form-control"
+              <label class="lb-left text-justify">用户余额</label>
+              <input v-model="meterData.user_f_balance" class="form-control"
                      onkeyup="value=value.replace(/[^\d\.]/g,'')" readonly type="text">
             </div>
-
             <!-- 上次抄表结果状态 -->
             <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
               <label class="lb-left text-justify">上次抄表结果状态</label>
@@ -65,8 +69,8 @@ export default {
       let http = new HttpResetClass()
       http.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
         data: {
-          items: 'a.*',
-          tablename: 't_handplan a left join (select f_userinfo_id,max(id) as id from t_handplan group by f_userinfo_id) b on a.id = b.id',
+          items: 'a.*,ui.f_balance as user_f_balance',
+          tablename: `t_handplan a left join (select f_userinfo_id,max(id) as id from t_handplan group by f_userinfo_id) b on a.id = b.id  left join t_userinfo ui on  b.f_userinfo_id=ui.f_userinfo_id and ui.f_user_state ='正常'`,
           condition: `b.f_userinfo_id = '${this.service.f_userinfoid}'`,
           orderitem: 'a.id'
         }

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

@@ -15,7 +15,7 @@
         </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" />
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">身份证号:</label><input type="text" class="form-control rightipt"
@@ -666,7 +666,8 @@ export default {
           this.excessive = true
           let userinfoms = Object.assign({}, this.userinfo_old.baseinfo.base)
           // userinfoms.f_user_name=row.f_user_name
-          userinfoms.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
+          userinfoms.f_user_name= this.userinfo.baseinfo.base.f_user_name,
+            userinfoms.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
           userinfoms.f_rent_phone=this.userinfo.baseinfo.base.f_rent_phone
           userinfoms.f_idnumber = this.userinfo.baseinfo.base.f_idnumber
           userinfoms.f_rent_name = this.userinfo.baseinfo.base.f_rent_name

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

@@ -992,7 +992,7 @@ export default {
       if(typeof this.config[this.device.device].items[item]=='function'){
         continue
       }
-      let index = this.config[this.device.device].items[item].index-1
+        let index = item
       this.$set('page.options' + index, [])
       //tag)
       //tag)
@@ -1036,9 +1036,9 @@ export default {
       //tag)
       let it = {
         type: this.config[this.device.device].items[item].type,
-        f_item_name: item,
+        f_item_name: this.config[this.device.device].items[item].itemname,
         checkmust: this.config[this.device.device].items[item].checkmust,
-        f_item_value: f_item_value,
+        f_item_value: this.config[this.device.device].items[item].f_item_value || f_item_value,
         is_verification:this.config[this.device.device].items[item].is_verification,
         verification_text:'',
         verification_state:'',// ai验证是否通过 npass(未通过)/pass(通过)
@@ -1051,7 +1051,7 @@ export default {
         unit: this.config[this.device.device].items[item].unit ? this.config[this.device.device].items[item].unit : '',
         tooltip:'',
         f_live_dispose:'',
-        f_deal_dispose:'',
+        f_deal_dispose: this.config[this.device.device].items[item].f_process_mode,
         f_else: '',
         f_p1_path: '',
         f_p2_path: '',
@@ -1116,7 +1116,7 @@ export default {
     if(!this.piece || JSON.stringify(this.piece) == '{}') {
       // 如果没有，则新建
       this.$set('piece.f_items',this.f_items)
-      this.$set('piece.f_device_type',this.device.device)
+      this.$set('piece.f_device_type', this.config[this.device.device].itemname)
     } else {
       // 已经存在，把之前的数据重新填入
       for (let f in this.f_items){