sale-client 4.2.92 → 4.2.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.2.92",
+  "version": "4.2.94",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManageNew/UserEssentialInfoTest.vue

@@ -291,16 +291,16 @@ export default {
         f_house_type: true
       },
       validateRules: {},
-      inputtores: this.$appdata.getParam('抄表员'),
-      credentials: this.$appdata.getParam('证件类型'),
-      costtypes: this.$appdata.getParam('缴费类型'),
-      banknames: this.$appdata.getParam('银行名称'),
+      inputtores: this.$appdata.getParam('抄表员') ? this.$appdata.getParam('抄表员') : [],
+      credentials: this.$appdata.getParam('证件类型') ? this.$appdata.getParam('证件类型') : [],
+      costtypes: this.$appdata.getParam('缴费类型') ? this.$appdata.getParam('缴费类型') : [],
+      banknames: this.$appdata.getParam('银行名称') ? this.$appdata.getParam('银行名称') : [],
       userstates: this.$appdata.getParam('预备客户状态参数') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('预备客户状态参数')] : [{label: '预备', value: '预备'}],
-      housetype: this.$appdata.getParam('房屋类型'),
-      mgq: this.$appdata.getParam('是否煤改气'),
-      costtype: this.$appdata.getParam('付款类型'),
+      housetype: this.$appdata.getParam('是否煤改气') ? this.$appdata.getParam('是否煤改气') : [],
+      mgq: this.$appdata.getParam('是否煤改气') ? this.$appdata.getParam('是否煤改气') : [],
+      costtype: this.$appdata.getParam('付款类型') ? this.$appdata.getParam('付款类型') : [],
       printstate: this.$appdata.getParam('建档打印类型') ? [{label: '暂不选择', value: '暂不选择'}, ...this.$appdata.getParam('建档打印类型')] : [{label: '暂不选择', value: '暂不选择'}],
-      peopleMax: this.$appdata.getSingleValue('最大人口数'),
+      peopleMax: this.$appdata.getSingleValue('最大人口数') ? this.$appdata.getParam('最大人口数') : [],
       jurisdiction: this.$login.r,
       edituserstate: false,
       // highMeterPlugin: {},
@@ -341,14 +341,15 @@ export default {
     // },
 
     getConfigValidate (name, defaultVal) {
-      this.$resetValidation()
+      console.log(name, defaultVal)
       if (this.formconfig && this.formconfig[name]) {
         let Validate = {}
         if (this.formconfig[name].required) {
           Object.assign(Validate, {required: true})
         } else {
-          // 这里是防止默认值位true 第一遍加载时 formconfig 中没值导致校验中required一直是true的情况
-          if (this.$v && this.$v[name] && this.$v[name].required) {
+          console.log(name, this.formconfig[name])
+          // 这里是防止默认值为true 第一遍加载时 formconfig 中没值导致校验中required一直是true的情况
+          if (defaultVal && this.$v && this.$v[name] && this.$v[name].required) {
             this.$set(this.$v[name], 'required', false)
           }
         }

package/src/filiale/xinkang/sale.js

@@ -3,21 +3,21 @@ import Vue from 'vue'
 
 export default function () {
 // 左侧用户基本信息展示
-  Vue.component('sale-userinfo', (resolve) => { require(['./base/leftview/Userinfo'], resolve) })
-
-  Vue.component('card-list', (resolve) => { require(['./base/rightview/CardList'], resolve) })
-  Vue.component('transfer-manage', (resolve) => { require(['./TransferManage'], resolve) })
-// 单个表具信息
-  Vue.component('file-meter-info', (resolve) => { require(['./MeterinfoTest'], resolve) })
-// 收费页面
-  Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })
-// 用户基本信息
-  Vue.component('file-user-essential-info', (resolve) => { require(['./UserEssentialInfoTest'], resolve) })
-// 批量开关阀
-  Vue.component('sale-web-meter-batch-operation-valve', (resolve) => { require(['./WebMeterBatchOperationValve'], resolve) })
-// 换表
-  Vue.component('change-meter', (resolve) => { require(['./ChangeMeter'], resolve) })
-  // 收费查询
-  Vue.component('charge-query-user', (resolve) => { require(['./ChargeQueryUser'], resolve) })
+//   Vue.component('sale-userinfo', (resolve) => { require(['./base/leftview/Userinfo'], resolve) })
+//
+//   Vue.component('card-list', (resolve) => { require(['./base/rightview/CardList'], resolve) })
+//   Vue.component('transfer-manage', (resolve) => { require(['./TransferManage'], resolve) })
+// // 单个表具信息
+//   Vue.component('file-meter-info', (resolve) => { require(['./MeterinfoTest'], resolve) })
+// // 收费页面
+//   Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })
+// // 用户基本信息
+//   Vue.component('file-user-essential-info', (resolve) => { require(['./UserEssentialInfoTest'], resolve) })
+// // 批量开关阀
+//   Vue.component('sale-web-meter-batch-operation-valve', (resolve) => { require(['./WebMeterBatchOperationValve'], resolve) })
+// // 换表
+//   Vue.component('change-meter', (resolve) => { require(['./ChangeMeter'], resolve) })
+//   // 收费查询
+//   Vue.component('charge-query-user', (resolve) => { require(['./ChargeQueryUser'], resolve) })
   Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
 }