sale-client 3.6.496 → 3.6.498

package/package.json

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

package/src/components/FilesManage/Edit.vue

@@ -2,7 +2,7 @@
   <div>
     <button @click="handleClick">渲染</button>
     <button @click="savePaper">保存</button>
-    <iframe v-if="showSketchPage" :src="sketchPageSrc" id="aaaa2" style="width: 100%; height: 500px;"></iframe>
+    <iframe v-if="showSketchPage" :src="sketchPageSrc" id="aaaa2" style="width: 100%; height: 1050px;"></iframe>
   </div>
 </template>
 

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -144,7 +144,7 @@
         </button>
       </footer>
     </modal>
-    <modal :show.sync="showModal" backdrop="false" :width="1000" v-if="paperButton">
+    <modal :show.sync="showModal" backdrop="false" :width="2300" v-if="paperButton">
       <div slot="modal-header" class="modal-header">
         <h4 class="modal-title">
           图纸编辑

package/src/components/FilesManageNew/MeterinfoTest.vue

@@ -21,8 +21,7 @@
                v-if="getConfigShowItem('f_defendcard',false)">
             <label class="font_normal_body">防盗卡号1</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_defendcard"
-                   v-validate:f_defendcard=getConfigValidate("f_defendcard",false)
-                   :value.sync="row.f_defendcard"
+                   v-validate:f_defendcard="getConfigValidate('f_defendcard',false)"
                    placeholder='防盗卡号1' >
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_defendcard_two.required ? 'has-error' : '']"
@@ -30,8 +29,7 @@
                v-if="getConfigShowItem('f_defendcard_two',false)">
             <label class="font_normal_body">防盗卡号2</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_defendcard_two"
-                   v-validate:f_defendcard_two=getConfigValidate("f_defendcard_two",false)
-                   :value.sync="row.f_defendcard_two"
+                   v-validate:f_defendcard_two="getConfigValidate('f_defendcard_two',false)"
                    placeholder='防盗卡号2' >
           </div>
           <div class="col-sm-4 form-group" v-if="getConfigShowItem('f_meter_base')"
@@ -147,7 +145,7 @@
                v-show="(formconfig && formconfig.f_aroundmeter && formconfig.f_aroundmeter.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_aroundmeter')">
             <input type="text" v-show="false" v-model="row.f_aroundmeter"
-                   v-validate:f_aroundmeter=getConfigValidate("f_aroundmeter",false)>
+                   v-validate:f_aroundmeter="getConfigValidate('f_aroundmeter',false)">
             <label for="gasmodel" class="font_normal_body w2" style="width: auto;letter-spacing: 2em;margin-right: -2em;margin-left: -2em;">&ensp;{{getConfigLabelName('f_aroundmeter','表向')}}</label>
             <v-select :value.sync="row.f_aroundmeter" :options='aroundmeters'
                       :placeholder="getConfigPlaceholder('f_aroundmeter','表向')"
@@ -160,19 +158,18 @@
             <label for="f_gas_person" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em"
                    class="font_normal_body">&ensp;{{getConfigLabelName('f_gas_person','通气人')}}</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_gas_person"
-                   v-validate:f_gas_person=getConfigValidate("f_gas_person",false)
-                   placeholder='通气人'></input>
+                   v-validate:f_gas_person="getConfigValidate('f_gas_person',false)"
+                   placeholder='通气人'>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_gas_date.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_gas_date && formconfig.f_gas_date.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_gas_date')">
             <input type="text" v-model="$refs.f_gas_date.value" v-show="false"
-                   v-validate:f_gas_date=getConfigValidate("f_gas_date",false)>
+                   v-validate:f_gas_date="getConfigValidate('f_gas_date',false)">
             <label for="f_gas_date" class="font_normal_body">&ensp;{{getConfigLabelName('f_gas_date','通气日期')}}</label>
             <datepicker style="width:60%" placeholder="通气日期"
                         v-model="row.f_gas_date"
                         v-ref:f_gas_date
-                        :value.sync="row.f_gas_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
             ></datepicker>
           </div>
@@ -182,16 +179,16 @@
                v-if="getConfigShowItem('f_gas_date')">
             <label for="f_position" class="font_normal_body"  title="参数:安装位置">&ensp;{{getConfigLabelName('f_position','安装位置')}}</label>
             <input type="text" v-model="row.f_position" v-show="false"
-                   v-validate:f_position=getConfigValidate("f_position",false)>
+                   v-validate:f_position="getConfigValidate('f_position',false)">
             <v-select :value.sync="row.f_position" v-model="row.f_position"
                       :options='positions' placeholder='安装位置'
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group"  v-show="false">
             <label for="f_remanent_gas" class="font_normal_body">剩余气量</label>
-            <input type="number" class="input_search" style="width:60%" style="width:60%" v-model="row.f_remanent_gas"
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_remanent_gas"
                    placeholder='剩余气量'
-                   :disabled="f_userinfo_id"></input>
+                   :disabled="f_userinfo_id">
             <!--<button type="button" name="button" class="btn btn-link" @click="modefiy('f_remanent_gas')" v-if="f_userinfo_id">修改</button>-->
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_install_person.required ? 'has-error' : '']"
@@ -199,7 +196,7 @@
                v-if="getConfigShowItem('f_install_person')">
             <label for="f_install_person" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_install_person','安装人')}}</label>
             <input type="text" v-model="row.f_install_person" v-show="false"
-                   v-validate:f_install_person=getConfigValidate("f_install_person",false)>
+                   v-validate:f_install_person="getConfigValidate('f_install_person',false)">
             <v-select :value.sync="row.f_install_person" v-model="row.f_install_person"
                       :options='installperson' placeholder='安装人'
                       close-on-select></v-select>
@@ -209,10 +206,9 @@
                v-if="getConfigShowItem('f_subscribe_date')">
             <label for="f_subscribe_date" class="font_normal_body">&ensp;{{getConfigLabelName('f_subscribe_date','预约时间')}}</label>
             <input type="text" v-model="row.f_subscribe_date" v-show="false"
-                   v-validate:f_subscribe_date=getConfigValidate("f_subscribe_date",false)>
+                   v-validate:f_subscribe_date="getConfigValidate('f_subscribe_date',false)">
             <datepicker style="width:60%" placeholder="预约通气时间"
                         v-model="row.f_subscribe_date"
-                        :value.sync="row.f_subscribe_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
             ></datepicker>
           </div>
@@ -220,7 +216,7 @@
                v-if="getConfigShowItem('f_meter_book_num')">
             <label for="f_position" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_meter_book_num','抄表册')}}</label>
             <input type="text" v-model="row.f_meter_book_num" v-show="false"
-                   v-validate:f_meter_book_num=getConfigValidate("f_meter_book_num",false)>
+                   v-validate:f_meter_book_num="getConfigValidate('f_meter_book_num',false)">
             <v-select :value.sync="row.f_meter_book_num" v-model="row.f_meter_book_num"
                       :options='meterbookoptions' placeholder='抄表册'
                       close-on-select></v-select>
@@ -229,14 +225,12 @@
                v-show="(formconfig && formconfig.f_install_date && formconfig.f_install_date.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_install_date')">
             <input type="text" v-model="row.f_install_date" v-show="false"
-                   v-validate:f_install_date=getConfigValidate("f_install_date",false)>
+                   v-validate:f_install_date="getConfigValidate('f_install_date',false)">
             <label for="f_install_date" class="font_normal_body">&ensp;{{getConfigLabelName('f_install_date','安装日期')}}</label>
             <datepicker style="width:60%" id="startDate" placeholder="安装日期" width='100%'
                         v-model="row.f_install_date"
-                        :value.sync="row.f_install_date"
-                        class="datepicker"
-                        v-ref:f_install_date
                         :format="'yyyy-MM-dd HH:mm:ss'"
+                        v-ref:f_install_date
                         :show-reset-button="true">
             </datepicker>
           </div>
@@ -245,7 +239,7 @@
                v-if="getConfigShowItem('f_adjustable')">
             <label for="f_adjustable" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_adjustable','调压箱')}}</label>
             <input type="text" v-model="row.f_adjustable" v-show="false"
-                   v-validate:f_adjustable=getConfigValidate("f_adjustable",false)>
+                   v-validate:f_adjustable="getConfigValidate('f_adjustable',false)">
             <v-select :value.sync="row.f_adjustable" :options='adjustables' placeholder='调压箱' close-on-select
                       v-model='row.f_adjustable' :search='true'></v-select>
           </div>
@@ -254,11 +248,9 @@
                v-if="getConfigShowItem('f_hand_date')">
             <label for="f_hand_date" class="font_normal_body">&ensp;{{getConfigLabelName('f_hand_date','上次抄表')}}</label>
             <input type="text" v-model="row.f_hand_date" v-show="false"
-                   v-validate:f_hand_date=getConfigValidate("f_hand_date",false)>
+                   v-validate:f_hand_date="getConfigValidate('f_hand_date',false)">
             <datepicker style="width:60%" id="f_hand_date" placeholder="上次抄表日期"
                         v-model="row.f_hand_date"
-                        :value.sync="row.f_hand_date"
-                        class="datepicker"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true">
             </datepicker>
@@ -268,8 +260,7 @@
                v-if="getConfigShowItem('f_price_ratio')">
             <label for="f_ratio" class="font_normal_body" style="width: auto;letter-spacing: 2em;margin-right: -2em;margin-left: -2em">&ensp;{{getConfigLabelName('f_price_ratio','比率')}}</label>
             <input type="number" class="input_search" style="width:60%"  v-model="row.f_price_ratio"
-                   :value.sync="row.f_price_ratio"
-                   v-validate:f_price_ratio=getConfigValidate("f_price_ratio",false)
+                   v-validate:f_price_ratio="getConfigValidate('f_price_ratio',false)"
                    placeholder='比率'>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_scrap_date.required ? 'has-error' : '']"
@@ -277,11 +268,9 @@
                v-if="getConfigShowItem('f_scrap_date')">
             <label for="f_scrap_date" class="font_normal_body">&ensp;{{getConfigLabelName('f_scrap_date','报废日期')}}</label>
             <input type="text" v-model="row.f_scrap_date" v-show="false"
-                   v-validate:f_scrap_date=getConfigValidate("f_scrap_date",false)>
+                   v-validate:f_scrap_date="getConfigValidate('f_scrap_date',false)">
             <datepicker style="width:60%" id="ScrapDate" placeholder="报废日期" width='100%'
                         v-model="row.f_scrap_date"
-                        :value.sync="row.f_scrap_date"
-                        class="datepicker"
                         :format="'yyyy-MM-dd'"
                         :show-reset-button="true">
             </datepicker>
@@ -296,7 +285,7 @@
                v-if="getConfigShowItem('f_garbage_fee')">
             <label for="gasmodel" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_garbage_fee','垃圾费')}}</label>
             <input type="text" v-model="row.f_garbage_fee" v-show="false"
-                   v-validate:f_garbage_fee=getConfigValidate("f_garbage_fee",false)>
+                   v-validate:f_garbage_fee="getConfigValidate('f_garbage_fee',false)">
             <v-select :value.sync="row.f_garbage_fee" :options='garbagefee' placeholder='垃圾费' close-on-select
                       :value-single="true"
                       v-model='row.f_garbage_fee'></v-select>
@@ -306,7 +295,7 @@
                v-if="getConfigShowItem('f_inputtor')">
             <label class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_inputtor','抄表员')}}</label>
             <input type="text" v-model="row.f_inputtor" v-show="false"
-                   v-validate:f_inputtor=getConfigValidate("f_inputtor",false)>
+                   v-validate:f_inputtor="getConfigValidate('f_inputtor',false)">
             <v-select :value.sync="row.f_inputtor" v-model='row.f_inputtor'
                       style="width:60%"
                       :options='inputtores' placeholder='抄表员'
@@ -318,7 +307,7 @@
                v-if="getConfigShowItem('f_usetype')">
             <label for="f_usetype" class="font_normal_body" title="参数:使用类型">&ensp;{{getConfigLabelName('f_usetype','使用类型')}}</label>
             <input type="text" v-model="row.f_usetype" v-show="false"
-                   v-validate:f_usetype=getConfigValidate("f_usetype",false)>
+                   v-validate:f_usetype="getConfigValidate('f_usetype',false)">
             <v-select :value.sync="row.f_usetype" v-model="row.f_usetype"
                       :options='usetype' placeholder='使用类型'
                       close-on-select></v-select>
@@ -328,7 +317,7 @@
                v-if="getConfigShowItem('f_usestate')">
             <label for="f_position" class="font_normal_body" title="参数:使用状态">&ensp;{{getConfigLabelName('f_usestate','使用状态')}}</label>
             <input type="text" v-model="row.f_usestate" v-show="false"
-                   v-validate:f_usestate=getConfigValidate("f_usestate",false)>
+                   v-validate:f_usestate="getConfigValidate('f_usestate',false)">
             <v-select :value.sync="row.f_usestate" v-model="row.f_usestate"
                       :options='usestate' placeholder='使用状态'
                       close-on-select></v-select>
@@ -339,8 +328,8 @@
             <label for="f_userfiles_address"
                    class="font_normal_body">&ensp;{{getConfigLabelName('f_userfiles_address','安装地址')}}</label>
             <input type="text" class="input_search" style="width:80%" v-model="row.f_userfiles_address"
-                   v-validate:f_userfiles_address=getConfigValidate("f_userfiles_address",false)
-                   placeholder='安装地址'></input>
+                   v-validate:f_userfiles_address="getConfigValidate('f_userfiles_address',false)"
+                   placeholder='安装地址'>
           </div>
           <div  class="col-sm-4 form-group" :class="[$m.f_alarm_code.required ? 'has-error' : '']"
                 v-show="(formconfig && formconfig.f_alarm_code && formconfig.f_alarm_code.required) || !onlyshowmust"
@@ -348,15 +337,15 @@
             <label for="f_alarm_code"
                    class="font_normal_body">&ensp;{{getConfigLabelName('f_alarm_code','报警器编码')}}</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_alarm_code"
-                   v-validate:f_alarm_code=getConfigValidate("f_alarm_code",false)
-                   placeholder='报警器编码'></input>
+                   v-validate:f_alarm_code="getConfigValidate('f_alarm_code',false)"
+                   placeholder='报警器编码'>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_force_measure.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_force_measure && formconfig.f_force_measure.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_force_measure',false)">
             <label class="font_normal_body">{{getConfigLabelName('f_force_measure','三项强制措施')}}</label>
             <input type="text" v-model="$refs.measure.selectedItems" v-show="false"
-                   v-validate:f_force_measure=getConfigValidate("f_force_measure",false)>
+                   v-validate:f_force_measure="getConfigValidate('f_force_measure',false)">
             <v-select :value.sync="row.f_force_measure" v-model="row.f_force_measure"
                       :options='forceMeasure' placeholder='三项强制措施' :multiple="true"
                       v-ref:measure>
@@ -658,7 +647,7 @@ let meterBookGen = function * (self) {
         }
       },
       'row.f_user_type' (val) {
-        if (val.length === 1) {
+        if (val && val.length === 1) {
           if (val[0] === '非民用') {
             this.showindustry = true
           } else {

package/src/components/FilesManageNew/UserEssentialInfoTest.vue

@@ -14,7 +14,7 @@
                :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>
@@ -30,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="证件号码">
@@ -55,7 +59,7 @@
         <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 }'
+            <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>
@@ -71,7 +75,7 @@
                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>
             <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"
@@ -79,7 +83,7 @@
                :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"
@@ -106,7 +110,7 @@
                class="col-sm-4 form-group" v-if="getConfigShowItem('f_balance')">
             <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>
@@ -115,7 +119,7 @@
                :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>
             <input type="text" v-show="false" v-model="baseinfo.base.f_is_mgq"
-                   v-validate:f_is_mgq=getConfigValidate("f_is_mgq",false)>
+                   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>
@@ -125,7 +129,7 @@
                :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)
+                   v-validate:f_book_no="getConfigValidate('f_book_no',false)"
                    :placeholder="getConfigPlaceholder('f_book_no','用户证号')">
           </div>
         </div>
@@ -135,7 +139,7 @@
                :class="[$v.f_rent_name.required ? 'has-error' : '']">
             <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')"
@@ -143,7 +147,7 @@
                :class="[$v.f_zuhu_phone.required ? 'has-error' : '']">
             <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"
@@ -161,21 +165,15 @@
                :class="[$v.f_contract_id.required ? 'has-error' : '']">
             <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>
             <input type="text" v-show="false" v-model="baseinfo.base.f_print_dh"
-                   v-validate:f_print_dh=getConfigValidate("f_print_dh",false)>
+                   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>
@@ -190,15 +188,19 @@
             <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>
             <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>
@@ -247,12 +249,13 @@
         </div>
       </form>
     </validator>
-    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="80%" title="地址信息" v-ref:modal large backdrop="false">
+    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="80%" title="地址信息" v-ref:modal large
+           backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
         <file-address-manage-new :is-select="isSelect" :fileinfo="addressinfo"
-                             @address-valid="doNothing"   :showselectaddress.sync="showselectaddress"
+                                 @address-valid="doNothing" :showselectaddress.sync="showselectaddress"
                                  :f_filialeid="f_filialeid"
-                                 v-ref:fileaddress ></file-address-manage-new>
+                                 v-ref:fileaddress></file-address-manage-new>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>
@@ -262,7 +265,6 @@
 
 <script>
     import {HttpResetClass} from 'vue-client'
-    // import HighMeter from '../../plugins/HighMeterPlugin'
 
     let getEditUserState = async function (self) {
       try {
@@ -293,6 +295,7 @@
             f_idnumber: true,
             f_house_type: true
           },
+          validateRules: {},
           inputtores: this.$appdata.getParam('抄表员'),
           credentials: this.$appdata.getParam('证件类型'),
           costtypes: this.$appdata.getParam('缴费类型'),
@@ -312,35 +315,64 @@
         }
       },
       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: {
-        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 }
           } else if (defaultVal) {
             return {required: defaultVal}
           }
+
           return {}
         },
         getConfigShowItem (name, defaultVal = true) {
@@ -381,6 +413,12 @@
         doNothing () {
            // console.log('啥也不做')
         },
+        resetValidation () {
+          this.baseinfo = Object.assign({}, this.baseinfo)
+          this.$nextTick(() => {
+            this.$resetValidation();
+          })
+        },
         readIDCardCallback (compoent, msg) {
            // console.log('进入高拍仪',msg)
           if (msg.err !== 0) {
@@ -389,30 +427,27 @@
             // 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: {
@@ -430,10 +465,10 @@
       },
       events: {
         'confirmaddress' (res) {
-            //  console.log('选定地址', res)
           this.showselectaddress = false
           this.addressinfo.f_address = res.f_address
           this.addressinfo.id = res.id
+          console.log(res.f_house_type,"=========");
           if (res.f_house_type != null) {
             this.baseinfo.base.f_house_type = res.f_house_type
           }