sale-client 3.6.499 → 3.6.500

package/package.json

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

package/src/components/revenue/HandManager/HandManager.vue

@@ -1269,7 +1269,6 @@
         this.$refs.paged.$refs.criteria.model.f_orgid = `${Vue.$login.f.orgid}`
         this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStartAndEndDateString()[0]
         this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStartAndEndDateString()[1]
-        this.search()
       },
       beforenter (index, row) {
         this.inputid = index + 1

package/src/filiale/bayan/FileUserFiles.vue

@@ -485,7 +485,7 @@ export default {
   methods: {
     userRegionChange (val) {
       console.log('看一下用户区域的变化', val)
-      if (val.length > 0) {
+      if (val && val.length > 0) {
         this.userBusinessHalls = this.$appdata.getParam(val[0] + '区域营业厅') ? [{label: '全部', value: ''}, ...this.$appdata.getParam(val[0] + '区域营业厅')] : []
       }
     },

package/src/filiale/bayan/FilesManage/FileUserFiles.vue

@@ -740,7 +740,7 @@ let loadParamGem = async function (self) {
     methods: {
       userRegionChange (val) {
         console.log('看一下用户区域的变化', val)
-        if (val.length > 0) {
+        if (val && val.length > 0) {
           this.userBusinessHalls = this.$appdata.getParam(val[0] + '区域营业厅') ? [{label: '全部', value: ''}, ...this.$appdata.getParam(val[0] + '区域营业厅')] : []
         }
       },

package/src/filiale/bayan/FilesManageNew/UserEssentialInfoTest.vue

@@ -5,20 +5,16 @@
         <div class="row">
           <div class="col-sm-4 form-group " :class="[!baseinfo.base.f_user_name ? 'has-error' : '']"
                v-if="getConfigShowItem('f_user_name')">
-            <label for="f_user_name"
-                   class="font_normal_body">*{{ getConfigLabelName('f_user_name', '用户姓名') }}</label>
+            <label for="f_user_name" class="font_normal_body">*{{getConfigLabelName('f_user_name','用户姓名')}}</label>
             <input type="text" v-model="baseinfo.base.f_user_name"
                    v-validate:f_user_name='getConfigValidate("f_user_name",true)'
-                   class="input_search" style="width:60%" :placeholder="getConfigPlaceholder('f_user_name','用户姓名')"
-                   v-next-el="phone">
+                   class="input_search" style="width:60%" :placeholder="getConfigPlaceholder('f_user_name','用户姓名')" v-next-el="phone">
           </div>
           <div style="" class="col-sm-4 form-group"
-               :class="[$v.f_user_phone.minlength || $v.f_user_phone.maxlength ? 'has-error' : '']"
-               v-if="getConfigShowItem('f_user_phone')">
-            <label for="f_user_phone"
-                   class="font_normal_body">*{{ getConfigLabelName('f_user_phone', '客户电话') }}</label>
+               :class="[$v.f_user_phone.minlength || $v.f_user_phone.maxlength ? 'has-error' : '']" v-if="getConfigShowItem('f_user_phone')">
+            <label for="f_user_phone" class="font_normal_body">*{{getConfigLabelName('f_user_phone','客户电话')}}</label>
             <input type="text" maxlength="11" v-model="baseinfo.base.f_user_phone"
-                   v-validate:f_user_phone=getConfigValidate("f_user_phone") class="input_search" style="width:60%"
+                   v-validate:f_user_phone="getConfigValidate('f_user_phone')" class="input_search" style="width:60%"
                    :placeholder="getConfigPlaceholder('f_user_phone','客户电话')"
                    v-el:phone v-next-el="area">
           </div>
@@ -34,23 +30,27 @@
         <div class="row">
           <div style="" class="col-sm-4 form-group">
             <label for="f_credentials" class="font_normal_body">&ensp;证件类型</label>
-            <v-select id="idCardType" :value.sync="baseinfo.base.f_credentials"
+            <v-select id="idCardType"
+                      :value.sync="baseinfo.base.f_credentials"
                       v-model="baseinfo.base.f_credentials"
                       :value-single="true"
-                      :options='credentials' placeholder='证件类型'
+                      :options='credentials'
+                      placeholder='证件类型'
                       style="width: 65%"
                       close-on-select></v-select>
           </div>
           <div style="" class="col-sm-8 form-group"
-               :class="[$v.f_idnumber2.identityCardValid ? 'has-error' : '']"
-               v-if="(baseinfo.base.f_credentials === '身份证'|| baseinfo.base.f_credentials[0] === '身份证') && config.f_idnumber  ">
+               key="身份证号码"
+               :class="[$v.f_idnumber.identityCardValid ? 'has-error' : '']"
+               v-if="baseinfo.base.f_credentials.includes('身份证')">
             <label for="f_idnumber" class="font_normal_body color-red">*证件号码</label>
             <input type="text" maxlength="18" v-model="baseinfo.base.f_idnumber"
-                   v-validate:f_idnumber2='{identityCardValid: true}' class="input_search" style="width:80%"
+                   v-validate:f_idnumber='{identityCardValid: true}' class="input_search" style="width:80%"
                    placeholder="证件号码">
           </div>
           <div style="" class="col-sm-8 form-group"
-               v-if="(baseinfo.base.f_credentials !== '身份证'&&baseinfo.base.f_credentials[0] !== '身份证') || !config.f_idnumber ">
+               key="证件号码"
+               v-else>
             <label class="font_normal_body">&ensp;证件号码</label>
             <input type="text" v-model="baseinfo.base.f_idnumber" class="input_search" style="width:80%"
                    placeholder="证件号码">
@@ -59,15 +59,12 @@
         <div class="row">
           <div class="col-sm-12 form-group" :class="[$v.f_address.required ? 'has-error' : '']">
             <label for="f_address" class="font_normal_body">*地址信息</label>
-            <input type="text" v-model="addressinfo.f_address" :value.sync="addressinfo.f_address"
-                   v-validate:f_address='{required: true }'
-                   class="input_search" disabled="disabled" style="width:75%;" placeholder="用户地址">
+            <input type="text" v-model="addressinfo.f_address" v-validate:f_address="{required: true}"
+                   class="input_search" disabled="disabled" style="width:75%;" placeholder="用户地址" >
             <span>
-              <button class="button_search button_spacing" type="button" style="width: max-content" v-if="!isedit"
-                      @click="selectaddress()">选择地址</button>
+              <button class="button_search button_spacing" type="button" style="width: max-content" v-if="!isedit" @click="selectaddress()">选择地址</button>
               <!--              <button class="button_search button_spacing" type="button" style="width: max-content" v-if="isedit" @click="modifyaddress()">修改地址</button>-->
-              <button class="button_search button_spacing" type="button" style="width: max-content" v-if="isedit"
-                      @click="selectaddress()">修改地址</button>
+              <button class="button_search button_spacing" type="button" style="width: max-content" v-if="isedit" @click="selectaddress()">修改地址</button>
             </span>
           </div>
         </div>
@@ -76,10 +73,9 @@
                v-show="(formconfig && formconfig.f_used_name && formconfig.f_used_name.required) || !onlyshowmust"
                :class="[$v.f_used_name.required ? 'has-error' : '']"
                class="col-sm-4 form-group" v-if="getConfigShowItem('f_used_name')">
-            <label style="letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em" for="f_used_name"
-                   class="font_normal_body w3">&ensp;{{ getConfigLabelName('f_used_name', '曾用名') }}</label>
+            <label style="letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em" for="f_used_name" class="font_normal_body w3">&ensp;{{getConfigLabelName('f_used_name','曾用名')}}</label>
             <input type="text" v-model="baseinfo.base.f_used_name" class="input_search" style="width:60%"
-                   v-validate:f_used_name=getConfigValidate("f_used_name",false)
+                   v-validate:f_used_name="getConfigValidate('f_used_name',false)"
                    :placeholder="getConfigPlaceholder('f_used_name','曾用名')">
           </div>
           <div style="" class="col-sm-4 form-group"
@@ -87,16 +83,14 @@
                :class="[$v.f_rent_phone.required ? 'has-error' : '']" v-if="getConfigShowItem('f_rent_phone')">
             <label for="f_rent_phone" class="font_normal_body">&ensp;备用电话</label>
             <input type="text" v-model="baseinfo.base.f_rent_phone" class="input_search" style="width:60%"
-                   v-validate:f_rent_phone=getConfigValidate("f_rent_phone",false)
+                   v-validate:f_rent_phone="getConfigValidate('f_rent_phone',false)"
                    placeholder="备用电话">
           </div>
           <div class="col-sm-4 form-group"
                v-show="(formconfig && formconfig.f_people_num && formconfig.f_people_num.required) || !onlyshowmust"
                :class="[$v.f_people_num.dctest ? 'has-error' : '']" v-if="getConfigShowItem('f_people_num')">
-            <label for="f_people_num" style="letter-spacing: 0.5em;margin-right: -0.5em"
-                   class="font_normal_body w3">{{ getConfigLabelName('f_people_num', '人口数') }}</label>
-            <input type="number" v-model="baseinfo.base.f_people_num" v-show="!peopleMax"
-                   v-validate:f_people_num='{dctest: [0, ">=" ]}'
+            <label for="f_people_num" style="letter-spacing: 0.5em;margin-right: -0.5em" class="font_normal_body w3">{{getConfigLabelName('f_people_num','人口数')}}</label>
+            <input type="number" v-model="baseinfo.base.f_people_num" v-show="!peopleMax" v-validate:f_people_num='{dctest: [0, ">=" ]}'
                    :disabled="!jurisdiction.includes('修改人口数')" class="input_search" style="width:60%"
                    placeholder="家庭人口数">
             <v-select id="f_people_num" :value.sync="baseinfo.base.f_people_num"
@@ -114,31 +108,28 @@
                v-show="(formconfig && formconfig.f_balance && formconfig.f_balance.required) || !onlyshowmust"
                :class="[$v.f_balance.required ? 'has-error' : '']"
                class="col-sm-4 form-group" v-if="getConfigShowItem('f_balance')">
-            <label for="f_balance"
-                   class="font_normal_body">&ensp;{{ getConfigLabelName('f_balance', '用户余额') }}</label>
+            <label for="f_balance" class="font_normal_body">&ensp;{{getConfigLabelName('f_balance','用户余额')}}</label>
             <input type="text" v-model="baseinfo.base.f_balance" class="input_search" style="width:60%"
-                   v-validate:f_balance=getConfigValidate("f_balance",false)
+                   v-validate:f_balance="getConfigValidate('f_balance',false)"
                    :placeholder="getConfigPlaceholder('f_balance','用户余额')"
                    :disabled="!jurisdiction.includes('档案信息查询修改')">
           </div>
           <div style="" class="col-sm-4 form-group" v-if="getConfigShowItem('f_is_mgq')"
                v-show="(formconfig && formconfig.f_is_mgq && formconfig.f_is_mgq.required) || !onlyshowmust"
                :class="[$v.f_is_mgq.required ? 'has-error' : '']">
-            <label for="f_is_mgq" style="letter-spacing: 0.5em;margin-right: -0.5em"
-                   class="font_normal_body w3">{{ getConfigLabelName('f_is_mgq', '煤改气') }}</label>
+            <label for="f_is_mgq" style="letter-spacing: 0.5em;margin-right: -0.5em" class="font_normal_body w3">{{getConfigLabelName('f_is_mgq','煤改气')}}</label>
             <input type="text" v-show="false" v-model="baseinfo.base.f_is_mgq"
-                   v-validate:f_is_mgq=getConfigValidate("f_is_mgq",false)>
-            <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_is_mgq" v-model="baseinfo.base.f_is_mgq"
+                   v-validate:f_is_mgq="getConfigValidate('f_is_mgq',false)">
+            <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_is_mgq"  v-model="baseinfo.base.f_is_mgq"
                       :placeholder="getConfigPlaceholder('f_is_mgq','是否煤改气')"
-                      :options='mgq' style="width: 65%" close-on-select></v-select>
+                      :options='mgq' style="width: 65%"       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group" v-if="getConfigShowItem('f_book_no')"
                v-show="(formconfig && formconfig.f_book_no && formconfig.f_book_no.required) || !onlyshowmust"
                :class="[$v.f_book_no.required ? 'has-error' : '']">
-            <label for="f_contract"
-                   class="font_normal_body">&ensp;{{ getConfigLabelName('f_book_no', '燃气本号') }}</label>
-            <input type="text" v-model="baseinfo.base.f_book_no" class="input_search" style="width:60%"
-                   v-validate:f_book_no=getConfigValidate("f_book_no",false)
+            <label for="f_contract" class="font_normal_body">&ensp;{{getConfigLabelName('f_book_no','燃气本号')}}</label>
+            <input type="text"  v-model="baseinfo.base.f_book_no" class="input_search" style="width:60%"
+                   v-validate:f_book_no="getConfigValidate('f_book_no',false)"
                    :placeholder="getConfigPlaceholder('f_book_no','用户证号')">
           </div>
         </div>
@@ -146,56 +137,44 @@
           <div style="" class="col-sm-4 form-group" v-if="getConfigShowItem('f_rent_name')"
                v-show="(formconfig && formconfig.f_rent_name && formconfig.f_rent_name.required) || !onlyshowmust"
                :class="[$v.f_rent_name.required ? 'has-error' : '']">
-            <label for="f_rent_name"
-                   class="font_normal_body">&ensp;{{ getConfigLabelName('f_rent_name', '租户姓名') }}</label>
+            <label for="f_rent_name" class="font_normal_body">&ensp;{{getConfigLabelName('f_rent_name','租户姓名')}}</label>
             <input type="text" v-model="baseinfo.base.f_rent_name" class="input_search" style="width:60%"
-                   v-validate:f_rent_name=getConfigValidate("f_rent_name",false)
+                   v-validate:f_rent_name="getConfigValidate('f_rent_name',false)"
                    :placeholder="getConfigPlaceholder('f_rent_name','租户姓名')">
           </div>
           <div style="" class="col-sm-4 form-group" v-if="getConfigShowItem('f_zuhu_phone')"
                v-show="(formconfig && formconfig.f_zuhu_phone && formconfig.f_zuhu_phone.required) || !onlyshowmust"
                :class="[$v.f_zuhu_phone.required ? 'has-error' : '']">
-            <label for="f_zuhu_phone"
-                   class="font_normal_body">{{ getConfigLabelName('f_zuhu_phone', '租户电话') }}</label>
+            <label for="f_zuhu_phone" class="font_normal_body">{{getConfigLabelName('f_zuhu_phone','租户电话')}}</label>
             <input type="text" v-model="baseinfo.base.f_zuhu_phone" class="input_search" style="width:60%"
-                   v-validate:f_zuhu_phone=getConfigValidate("f_zuhu_phone",false)
+                   v-validate:f_zuhu_phone="getConfigValidate('f_zuhu_phone',false)"
                    :placeholder="getConfigPlaceholder('f_zuhu_phone','租户电话')">
           </div>
           <div style="" class="col-sm-4 form-group"
                v-show="(formconfig && formconfig.f_cost_type && formconfig.f_cost_type.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_cost_type')">
-            <label for="f_is_mgq"
-                   class="font_normal_body ">&ensp;{{ getConfigLabelName('f_cost_type', '付款类型') }}</label>
-            <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_cost_type" v-model="baseinfo.base.f_cost_type"
+            <label for="f_is_mgq" class="font_normal_body ">&ensp;{{getConfigLabelName('f_cost_type','付款类型')}}</label>
+            <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_cost_type"  v-model="baseinfo.base.f_cost_type"
                       :options='costtype'
-                      :placeholder="getConfigPlaceholder('f_cost_type','付款类型')" style="width: 65%"
-                      close-on-select></v-select>
+                      :placeholder="getConfigPlaceholder('f_cost_type','付款类型')"  style="width: 65%"       close-on-select></v-select>
           </div>
         </div>
         <div class="row">
           <div class="col-sm-8 form-group" v-if="getConfigShowItem('f_contract_id')"
                v-show="(formconfig && formconfig.f_contract_id && formconfig.f_contract_id.required) || !onlyshowmust"
                :class="[$v.f_contract_id.required ? 'has-error' : '']">
-            <label for="f_contract"
-                   class="font_normal_body">&ensp;{{ getConfigLabelName('f_contract_id', '合同编号') }}</label>
+            <label for="f_contract" class="font_normal_body">&ensp;{{getConfigLabelName('f_contract_id','合同编号')}}</label>
             <input type="text" v-model="baseinfo.base.f_contract_id" class="input_search" style="width:80%"
-                   v-validate:f_contract_id=getConfigValidate("f_contract_id",false)
+                   v-validate:f_contract_id="getConfigValidate('f_contract_id',false)"
                    :placeholder="getConfigPlaceholder('f_contract_id','合同编号')">
           </div>
-          <!--<div style="" class="col-sm-4 form-group">-->
-          <!--<label for="f_print_lc" class="font_normal_body ">&ensp;打印状态</label>-->
-          <!--<v-select id="f_print_lc" :value.sync="baseinfo.base.f_print_lc"  v-model="baseinfo.base.f_print_lc"-->
-          <!--:value-single="true" :disabled="!jurisdiction.includes('档案信息查询修改')"-->
-          <!--:options='mgq' placeholder='是否打印'   style="width: 65%"       close-on-select></v-select>-->
-          <!--</div>-->
           <div class="col-sm-4 form-group"
                v-show="(formconfig && formconfig.f_contract_id && formconfig.f_contract_id.required) || !onlyshowmust"
                :class="[$v.f_contract_id.required ? 'has-error' : '']">
-            <label for="f_print_dh"
-                   class="font_normal_body ">&ensp;{{ getConfigLabelName('f_print_dh', '打印类别') }}</label>
+            <label for="f_print_dh" class="font_normal_body ">&ensp;{{getConfigLabelName('f_print_dh','打印类别')}}</label>
             <input type="text" v-show="false" v-model="baseinfo.base.f_print_dh"
-                   v-validate:f_print_dh=getConfigValidate("f_print_dh",false)>
-            <v-select id="f_print_dh" :value.sync="baseinfo.base.f_print_dh" v-model="baseinfo.base.f_print_dh"
+                   v-validate:f_print_dh="getConfigValidate('f_print_dh',false)">
+            <v-select id="f_print_dh" :value.sync="baseinfo.base.f_print_dh"  v-model="baseinfo.base.f_print_dh"
                       :value-single="true" :disabled="baseinfo.base.f_print_dh_stats" :search="false"
                       :options='printstate' placeholder='流程单 | 点火单' style="width: 65%" close-on-select></v-select>
           </div>
@@ -206,20 +185,22 @@
           <div style="" class="col-sm-12 form-group" v-if="getConfigShowItem('f_comments')"
                v-show="(formconfig && formconfig.f_comments && formconfig.f_comments.required) || !onlyshowmust"
                :class="[$v.f_comments.required ? 'has-error' : '']">
-            <label for="f_paper_accoun" style="letter-spacing: 2em;margin-right: -2em;margin-left: -2em"
-                   class="font_normal_body w2">&ensp;{{ getConfigLabelName('f_comments', '备注') }}</label>
+            <label for="f_paper_accoun" style="letter-spacing: 2em;margin-right: -2em;margin-left: -2em" class="font_normal_body w2">&ensp;{{getConfigLabelName('f_comments','备注')}}</label>
             <input class="input_search" style="width:86.5%;height: 40px" v-model="baseinfo.base.f_comments"
                    :placeholder="getConfigPlaceholder('f_comments','请输入备注信息')"
-                   v-validate:f_comments=getConfigValidate("f_comments",false)>
+                   v-validate:f_comments="getConfigValidate('f_comments',false)">
           </div>
-          <div class="col-sm-4 form-group" v-if="getConfigShowItem('f_house_type')"
-               v-show="(formconfig && formconfig.f_house_type && formconfig.f_house_type.required) || !onlyshowmust"
+
+          <div class="col-sm-4 form-group"
+               v-show="((formconfig && formconfig.f_house_type && formconfig.f_house_type.required) || !onlyshowmust) && getConfigShowItem('f_house_type')"
                :class="[$v.f_house_type.required ? 'has-error' : '']">
-            <label for="f_user_state"
-                   class="font_normal_body">&ensp;{{ getConfigLabelName('f_house_type', '房屋类型') }}</label>
+            <label for="f_user_state" class="font_normal_body">&ensp;{{getConfigLabelName('f_house_type','房屋类型')}}</label>
             <input type="text" v-show="false" v-model="baseinfo.base.f_house_type"
-                   v-validate:f_house_type=getConfigValidate("f_house_type",false)>
-            <v-select :value.sync="baseinfo.base.f_house_type" :search="false" :value-single="true"
+                   v-validate:f_house_type="getConfigValidate('f_house_type')"/>
+            <v-select :value.sync="baseinfo.base.f_house_type"
+                      v-model="baseinfo.base.f_house_type"
+                      :search="false"
+                      :value-single="true"
                       :options='housetype' close-on-select
                       :placeholder="getConfigPlaceholder('f_house_type','房屋类型')">
             </v-select>
@@ -230,7 +211,7 @@
             <label for="f_user_nature" class="font_normal_body"
                    title="用户性质">&ensp;{{ getConfigLabelName('f_user_region', '用户区域') }}</label>
             <input type="text" v-show="false" v-model="baseinfo.base.f_user_region"
-                   v-validate:f_user_nature=getConfigValidate("f_user_region",false)>
+                   v-validate:f_user_nature=getConfigValidate('f_user_region',false)>
             <v-select :value.sync="baseinfo.base.f_user_region"
                       :search="false"
                       :value-single="true"
@@ -246,7 +227,7 @@
             <label for="f_user_nature" class="font_normal_body"
                    title="用户性质">&ensp;&ensp;{{ getConfigLabelName('f_user_business_hall', '营业厅') }}</label>
             <input type="text" v-show="false" v-model="baseinfo.base.f_user_business_hall"
-                   v-validate:f_user_business_hall=getConfigValidate("f_user_nature",false)>
+                   v-validate:f_user_business_hall=getConfigValidate('f_user_nature',false)>
             <v-select :value.sync="baseinfo.base.f_user_business_hall"
                       :search="false"
                       :value-single="true"
@@ -315,7 +296,6 @@
 
 <script>
 import {HttpResetClass} from 'vue-client'
-// import HighMeter from '../../plugins/HighMeterPlugin'
 
 let getEditUserState = async function (self) {
   try {
@@ -346,6 +326,7 @@ export default {
         f_idnumber: true,
         f_house_type: true
       },
+      validateRules: {},
       inputtores: this.$appdata.getParam('抄表员'),
       credentials: this.$appdata.getParam('证件类型'),
       costtypes: this.$appdata.getParam('缴费类型'),
@@ -354,10 +335,7 @@ export default {
       housetype: this.$appdata.getParam('房屋类型'),
       mgq: this.$appdata.getParam('是否煤改气'),
       costtype: this.$appdata.getParam('付款类型'),
-      printstate: this.$appdata.getParam('建档打印类型') ? [{
-        label: '暂不选择',
-        value: '暂不选择'
-      }, ...this.$appdata.getParam('建档打印类型')] : [{label: '暂不选择', value: '暂不选择'}],
+      printstate: this.$appdata.getParam('建档打印类型') ? [{label: '暂不选择', value: '暂不选择'}, ...this.$appdata.getParam('建档打印类型')] : [{label: '暂不选择', value: '暂不选择'}],
       peopleMax: this.$appdata.getSingleValue('最大人口数'),
       userRegions: this.$appdata.getParam('区域'),
       userBusinessHalls: [],
@@ -370,14 +348,11 @@ export default {
     }
   },
   ready () {
-    console.log('f_filialeid222，，，', this.f_filialeid)
     getEditUserState(this)
     this.$resetValidation()
-    // this.highMeterPlugin = new HighMeter(this,this.readIDCardCallback)
+    this.initValidateRules()
   },
   beforeDestroy () {
-    console.log('销毁')
-    // this.highMeterPlugin.Stop()
   },
   methods: {
     userRegionChange () {
@@ -386,25 +361,57 @@ export default {
         this.userBusinessHalls = this.$appdata.getParam(this.baseinfo.base.f_user_region + '区域营业厅')
       }
     },
-    getConfigValidate (name, defaultVal) {
-      this.$resetValidation()
-      if (this.formconfig && this.formconfig[name]) {
-        let Validate = {}
-        if (this.formconfig[name].required) {
-          Object.assign(Validate, {required: true})
+    initValidateRules () {
+      const fields = [
+        'f_user_name', 'f_user_phone', 'f_idnumber', 'f_address', 'f_used_name',
+        'f_rent_phone', 'f_people_num', 'f_balance', 'f_is_mgq', 'f_book_no',
+        'f_rent_name', 'f_zuhu_phone', 'f_cost_type', 'f_contract_id', 'f_print_dh',
+        'f_comments', 'f_house_type', 'f_bank_accopen', 'f_bank_account'
+      ]
+
+      fields.forEach(field => {
+        this.validateRules[field] = {}
+      })
+
+      this.validateRules['f_user_phone'] = { minlength: 11, maxlength: 11 }
+
+      this.updateValidateRules()
+    },
+
+    updateValidateRules () {
+      if (!this.formconfig) return
+
+      Object.keys(this.formconfig).forEach(field => {
+        const fieldConfig = this.formconfig[field]
+        const rules = {}
+
+        if (fieldConfig.required) {
+          rules.required = true
         }
-        if (this.formconfig[name].minlength || this.formconfig[name].minlength === 0) {
-          Object.assign(Validate, {minlength: this.formconfig[name].minlength})
+
+        if (fieldConfig.minlength || fieldConfig.minlength === 0) {
+          rules.minlength = fieldConfig.minlength
         }
-        if (this.formconfig[name].maxlength) {
-          Object.assign(Validate, {maxlength: this.formconfig[name].maxlength})
+
+        if (fieldConfig.maxlength) {
+          rules.maxlength = fieldConfig.maxlength
         }
-        return Validate
+
+        this.validateRules[field] = Object.assign({}, this.validateRules[field], rules)
+      })
+    },
+
+    getConfigValidate (name, defaultVal) {
+      this.$resetValidation()
+
+      if (this.validateRules[name] && Object.keys(this.validateRules[name]).length > 0) {
+        return this.validateRules[name]
       } else if (name === 'f_user_phone') {
-        return {minlength: 11, maxlength: 11}
+        return { minlength: 11, maxlength: 11 }
       } else if (defaultVal) {
         return {required: defaultVal}
       }
+
       return {}
     },
     getConfigShowItem (name, defaultVal = true) {
@@ -445,6 +452,12 @@ export default {
     doNothing () {
       // console.log('啥也不做')
     },
+    resetValidation () {
+      this.baseinfo = Object.assign({}, this.baseinfo)
+      this.$nextTick(() => {
+        this.$resetValidation();
+      })
+    },
     readIDCardCallback (compoent, msg) {
       // console.log('进入高拍仪',msg)
       if (msg.err !== 0) {
@@ -453,30 +466,27 @@ export default {
       // document.getElementById("idCardType").getElementsByClassName("btn-content")[0].innerHTML="身份证"
       compoent.baseinfo.base.f_idnumber = msg.strID
       compoent.baseinfo.base.f_user_name = msg.strName.trim()
-      compoent.baseinfo.base.f_credentials = ['身份证']
+      compoent.baseinfo.base.f_credentials = '身份证'
     }
   },
   watch: {
-    // 重置验证结果，当证件类型切换时，验证结果不能立即刷新，需要重置
-    'baseinfo.base.f_credentials[0]' () {
-      // console.log('验证器重置')
-      this.$resetValidation()
+    'baseinfo.base.f_credentials' () {
+      this.$resetValidation();
       this.baseinfo.base.f_print_dh = (this.baseinfo.base.f_print_dh && this.baseinfo.base.f_print_dh != '' && this.baseinfo.base.f_print_dh != '否') ? this.baseinfo.base.f_print_dh : this.config.f_print_dh
     },
     'baseinfo.base.f_cost_type[0]' () {
-      //  console.log('验证器重置')
       this.$resetValidation()
       this.baseinfo.base.f_print_dh = (this.baseinfo.base.f_print_dh && this.baseinfo.base.f_print_dh != '' && this.baseinfo.base.f_print_dh != '否') ? this.baseinfo.base.f_print_dh : this.config.f_print_dh
     },
-    // 当选择销户，需要给其提醒是否进行销户
-    'baseinfo.base.f_user_state' (val) {
-      if (val[0] === '销户') {
-        this.$showMessage('是否要对该客户进行销户操作？', ['confirm', 'cancel']).then((res) => {
-          if (res !== 'confirm') {
-            this.baseinfo.base.f_user_state = ['正常']
-          }
-        })
-      }
+    'baseinfo.base.f_house_type' () {
+      console.log(JSON.stringify(this.$v));
+      this.resetValidation()
+    },
+    'formconfig': {
+      handler () {
+        this.updateValidateRules()
+      },
+      deep: true
     }
   },
   computed: {
@@ -494,7 +504,6 @@ export default {
   },
   events: {
     'confirmaddress' (res) {
-      //  console.log('选定地址', res)
       this.showselectaddress = false
       this.addressinfo.f_address = res.f_address
       this.addressinfo.id = res.id

package/src/filiale/macheng/UserBaseInfoNew.vue

@@ -41,8 +41,8 @@
           <input class="input-underline" style="width:80%" :value="row.f_idnumber" readonly>
         </div>
         <div class="col-sm-4">
-          <label class="font_normal_body_new">用户状态</label>
-          <input class="input-underline" style="width:60%" :value="row.f_user_state" readonly>
+          <label class="font_normal_body_new">使用状态</label>
+          <input class="input-underline" style="width:60%" :value="row.f_usestate" readonly>
         </div>
         <div class="col-sm-4">
           <label class="font_normal_body_new">账户余额</label>

package/src/filiale/tongchuan/BankPayment/BankPayment.vue

@@ -29,7 +29,6 @@
                 <datepicker id="startDate" placeholder="开始日期"
                             v-model="model.startDate"  style="width: 55%"
                             :value.sync="model.startDate"
-                            condition="(f_trade_date >= '{} 00:00:00' or f_operate_date >= '{} 00:00:00')"
                             :disabled-days-of-Week="[]"
                             :format="'yyyy-MM-dd'"
                             :show-reset-button="reset">
@@ -40,7 +39,6 @@
                 <datepicker id="endDate" placeholder="结束日期"
                             v-model="model.endDate"  style="width: 55%"
                             :value.sync="model.endDate"
-                            condition="(f_trade_date < '{} 23:59:59' or f_operate_date < '{} 23:59:59' )"
                             :disabled-days-of-Week="[]"
                             :format="'yyyy-MM-dd'"
                             :show-reset-button="reset">