sale-client 4.1.230 → 4.2.1-ronghao

package/src/components/FilesManageNew/UserEssentialInfoTest.vue

@@ -28,14 +28,13 @@
           </div>
         </div>
         <div class="row">
-          <div style="" class="col-sm-4 form-group">
+          <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='证件类型'
+                      :placeholder="getConfigPlaceholder('f_credentials','证件类型')"
                       style="width: 65%"
                       close-on-select></v-select>
           </div>
@@ -46,14 +45,14 @@
             <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_idnumber='{identityCardValid: true}' class="input_search" style="width:80%"
-                   placeholder="证件号码">
+                   :placeholder="getConfigPlaceholder('f_idnumber','证件号码')">
           </div>
           <div style="" class="col-sm-8 form-group"
                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="证件号码">
+                   :placeholder="getConfigPlaceholder('f_idnumber','证件号码')">
           </div>
         </div>
         <div class="row">
@@ -63,7 +62,7 @@
                    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="modifyaddress()">修改地址</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>
             </span>
           </div>
@@ -75,7 +74,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"
@@ -83,7 +82,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"
@@ -110,7 +109,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>
@@ -119,7 +118,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>
@@ -129,7 +128,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>
@@ -139,7 +138,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')"
@@ -147,7 +146,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"
@@ -165,15 +164,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 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' : '']">
+               v-show="(formconfig && formconfig.f_print_dh && formconfig.f_print_dh.required) || !onlyshowmust"
+               :class="[$v.f_print_dh.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>
@@ -188,7 +187,7 @@
             <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"
@@ -196,19 +195,18 @@
                :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')"/>
+                   v-validate:f_house_type="getConfigValidate('f_house_type',false)">
             <v-select :value.sync="baseinfo.base.f_house_type"
-            v-model="baseinfo.base.f_house_type"
-            :search="false"
-            :value-single="true"
+                      :search="false"
+                      :value-single="true"
                       :options='housetype' close-on-select
                       :placeholder="getConfigPlaceholder('f_house_type','房屋类型')">
             </v-select>
           </div>
         </div>
         <div class="row">
-        <a style="text-decoration: none;font-weight: 300;float: left;color: #333;margin-top: 15px;font-weight: 500"
-           v-if="baseinfo.base.f_cost_type[0] === '银行代扣'">银行信息</a>
+          <a style="text-decoration: none;font-weight: 300;float: left;color: #333;margin-top: 15px;font-weight: 500"
+             v-if="baseinfo.base.f_cost_type[0] === '银行代扣'">银行信息</a>
         </div>
         <div v-if="baseinfo.base.f_cost_type[0] === '银行代扣'">
           <div class="row">
@@ -264,216 +262,192 @@
 </template>
 
 <script>
-    import {HttpResetClass} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
 
-    let getEditUserState = async function (self) {
-      try {
-        let http = new HttpResetClass()
-        let result = await http.load('GET', `rs/vue/EditUserState.json`, {}, {resolveMsg: null, rejectMsg: null})
-        console.log('看看结果', result.data.EditUserState)
-        self.config.f_print_dh = result.data.f_print_dh
-        self.baseinfo.base.f_print_dh = (self.baseinfo.base.f_print_dh && self.baseinfo.base.f_print_dh != '' && self.baseinfo.base.f_print_dh != '否') ? self.baseinfo.base.f_print_dh : result.data.f_print_dh
-        self.edituserstate = result.data.EditUserState
-        self.config.f_idnumber = result.data.f_idnumber ? result.data.f_idnumber : self.config.f_idnumber
-        self.config.f_house_type = result.data.f_house_type ? result.data.f_house_type : self.config.f_house_type
-      } catch (e) {
-        console.log(e)
-      }
-    }
+let getEditUserState = async function (self) {
+  try {
+    let http = new HttpResetClass()
+    let result = await http.load('GET', `rs/vue/EditUserState.json`, {}, {resolveMsg: null, rejectMsg: null})
+    console.log(result.data.EditUserState)
+    self.edituserstate = result.data.EditUserState
+    Object.assign(self.config, result.data)
+  } catch (e) {
+    console.log(e)
+  }
+}
 
-    export default {
-      title: '基本信息',
-      props: ['baseinfo', 'addressinfo', 'isedit', 'f_filialeid', 'formconfig', 'onlyshowmust'],
-      data () {
-        return {
-          showselectaddress: false,
-          site: '',
-          areas: [],
-          streets: [],
-          residentials: [],
-          config: {
-            f_idnumber: true,
-            f_house_type: true
-          },
-          validateRules: {},
-          inputtores: this.$appdata.getParam('抄表员'),
-          credentials: this.$appdata.getParam('证件类型'),
-          costtypes: this.$appdata.getParam('缴费类型'),
-          banknames: this.$appdata.getParam('银行名称'),
-          userstates: [{label: '预备', value: '预备'}],
-          housetype: this.$appdata.getParam('房屋类型'),
-          mgq: this.$appdata.getParam('是否煤改气'),
-          costtype: this.$appdata.getParam('付款类型'),
-          printstate: this.$appdata.getParam('建档打印类型') ? [{label: '暂不选择', value: '暂不选择'}, ...this.$appdata.getParam('建档打印类型')] : [{label: '暂不选择', value: '暂不选择'}],
-          peopleMax: this.$appdata.getSingleValue('最大人口数'),
-          jurisdiction: this.$login.r,
-          edituserstate: false,
-            // highMeterPlugin: {},
-          readCardFlag: true,
-
-          isSelect: false
-        }
-      },
-      ready () {
-        getEditUserState(this)
-        this.$resetValidation()
-        this.initValidateRules()
+export default {
+  title: '基本信息',
+  props: ['baseinfo', 'addressinfo', 'isedit', 'f_filialeid', 'formconfig', 'onlyshowmust'],
+  data () {
+    return {
+      showselectaddress: false,
+      site: '',
+      areas: [],
+      streets: [],
+      residentials: [],
+      config: {
+        f_idnumber: true,
+        f_house_type: true
       },
-      beforeDestroy () {
-      },
-      methods: {
-        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 (fieldConfig.minlength || fieldConfig.minlength === 0) {
-              rules.minlength = fieldConfig.minlength
-            }
+      validateRules: {},
+      inputtores: this.$appdata.getParam('抄表员'),
+      credentials: this.$appdata.getParam('证件类型'),
+      costtypes: this.$appdata.getParam('缴费类型'),
+      banknames: 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('付款类型'),
+      printstate: this.$appdata.getParam('建档打印类型') ? [{label: '暂不选择', value: '暂不选择'}, ...this.$appdata.getParam('建档打印类型')] : [{label: '暂不选择', value: '暂不选择'}],
+      peopleMax: this.$appdata.getSingleValue('最大人口数'),
+      jurisdiction: this.$login.r,
+      edituserstate: false,
+      // highMeterPlugin: {},
+      readCardFlag: true,
 
-            if (fieldConfig.maxlength) {
-              rules.maxlength = fieldConfig.maxlength
-            }
-
-            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}
-          }
+      isSelect: false
+    }
+  },
+  ready () {
+    getEditUserState(this)
+    this.$resetValidation()
+    // this.initValidateRules()
+  },
+  beforeDestroy () {
+  },
+  methods: {
+    // 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 (fieldConfig.minlength || fieldConfig.minlength === 0) {
+    //       rules.minlength = fieldConfig.minlength
+    //     }
+    //
+    //     if (fieldConfig.maxlength) {
+    //       rules.maxlength = fieldConfig.maxlength
+    //     }
+    //
+    //     this.validateRules[field] = Object.assign({}, this.validateRules[field], rules)
+    //   })
+    // },
 
-          return {}
-        },
-        getConfigShowItem (name, defaultVal = true) {
-          if (this.formconfig && this.formconfig[name] && this.formconfig[name].hasOwnProperty('showItem')) {
-            return this.formconfig[name].showItem
-          } else {
-            return defaultVal
-          }
-        },
-        getConfigLabelName (name, defaultVal) {
-          if (this.formconfig && this.formconfig[name] && this.formconfig[name].labelName) {
-            return this.formconfig[name].labelName
-          } else {
-            return defaultVal
-          }
-        },
-        getConfigPlaceholder (name, defaultVal) {
-          if (this.formconfig && this.formconfig[name] && this.formconfig[name].placeholder) {
-            return this.formconfig[name].placeholder
-          } else {
-            return defaultVal
-          }
-        },
-        selectaddress () {
-          this.showselectaddress = true
-          this.isSelect = true
-        },
-        modifyaddress () {
-          this.showselectaddress = true
-          this.isSelect = false
-        },
-        onValid (res) {
-          this.$dispatch('valid')
-        },
-        onInvalid (res) {
-          this.$dispatch('invalid')
-        },
-        doNothing () {
-           // console.log('啥也不做')
-        },
-        resetValidation () {
-          this.baseinfo = Object.assign({}, this.baseinfo)
-          this.$nextTick(() => {
-            this.$resetValidation();
-          })
-        },
-        readIDCardCallback (compoent, msg) {
-           // console.log('进入高拍仪',msg)
-          if (msg.err !== 0) {
-            return
-          }
-            // 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 = '身份证'
+    getConfigValidate (name, defaultVal) {
+      this.$resetValidation()
+      if (this.formconfig && this.formconfig[name]) {
+        let Validate = {}
+        if (this.formconfig[name].required) {
+          Object.assign(Validate, {required: true})
         }
-      },
-      watch: {
-        '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]' () {
-          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_house_type' () {
-          console.log(JSON.stringify(this.$v));
-          this.resetValidation()
-        },
-        'formconfig': {
-          handler() {
-            this.updateValidateRules()
-          },
-          deep: true
+        if (this.formconfig[name].minlength || this.formconfig[name].minlength === 0) {
+          Object.assign(Validate, {minlength: this.formconfig[name].minlength})
         }
-      },
-      computed: {
-        peoplenums () {
-          let peopleMax = this.$appdata.getSingleValue('最大人口数') ? this.$appdata.getSingleValue('最大人口数') : 0
-          let nums = []
-          for (let i = 1; i <= peopleMax; i++) {
-            let temp = {}
-            temp.label = i
-            temp.value = i
-            nums.push(temp)
-          }
-          return nums
-        }
-      },
-      events: {
-        'confirmaddress' (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
-          }
-          this.$dispatch('defaultOtheret', res)
+        if (this.formconfig[name].maxlength) {
+          Object.assign(Validate, {maxlength: this.formconfig[name].maxlength})
         }
+        return Validate
+      } else if (name === 'f_user_phone') {
+        return { minlength: 11, maxlength: 11 }
+      } else if (defaultVal) {
+        return {required: defaultVal}
+      }
+      return {}
+    },
+    getConfigShowItem (name, defaultVal = true) {
+      if (this.formconfig && this.formconfig[name] && this.formconfig[name].hasOwnProperty('showItem')) {
+        return this.formconfig[name].showItem
+      } else {
+        return defaultVal
       }
+    },
+    getConfigLabelName (name, defaultVal) {
+      if (this.formconfig && this.formconfig[name] && this.formconfig[name].labelName) {
+        return this.formconfig[name].labelName
+      } else {
+        return defaultVal
+      }
+    },
+    getConfigPlaceholder (name, defaultVal) {
+      if (this.formconfig && this.formconfig[name] && this.formconfig[name].placeholder) {
+        return this.formconfig[name].placeholder
+      } else {
+        return defaultVal
+      }
+    },
+    selectaddress () {
+      this.showselectaddress = true
+      this.isSelect = true
+    },
+    modifyaddress () {
+      this.showselectaddress = true
+      this.isSelect = false
+    },
+    onValid (res) {
+      this.$dispatch('valid')
+    },
+    onInvalid (res) {
+      // 打印所有校验状态
+      this.$dispatch('invalid')
+    },
+    doNothing () {
+      // console.log('啥也不做')
+    },
+    resetValidation () {
+      this.baseinfo = Object.assign({}, this.baseinfo)
+      this.$nextTick(() => {
+        this.$resetValidation()
+      })
+    },
+    readIDCardCallback (compoent, msg) {
+      // console.log('进入高拍仪',msg)
+      if (msg.err !== 0) {
+        return
+      }
+      // 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 = '身份证'
+    }
+  },
+  watch: {
+    'baseinfo.base.f_credentials' () {
+      this.$resetValidation()
+    },
+    'baseinfo.base.f_cost_type[0]' () {
+      this.$resetValidation()
+    },
+    'baseinfo.base.f_user_name'(val) {
+      console.log('f_user_name变化', val)
+    }
+  },
+  computed: {
+    peoplenums () {
+      let peopleMax = this.$appdata.getSingleValue('最大人口数') ? this.$appdata.getSingleValue('最大人口数') : 0
+      let nums = []
+      for (let i = 1; i <= peopleMax; i++) {
+        let temp = {}
+        temp.label = i
+        temp.value = i
+        nums.push(temp)
+      }
+      return nums
+    }
+  },
+  events: {
+    'confirmaddress' (res) {
+      this.showselectaddress = false
+      this.addressinfo.f_address = res.f_address
+      this.addressinfo.id = res.id
+      this.$dispatch('defaultOtheret', res)
     }
+  }
+}
 </script>

package/src/components/FilesManageNew/UserGeneralInfoTest.vue

@@ -248,8 +248,6 @@ export default {
       console.warn('获取展示配置失败，按照默认展示')
     }
     this.blodid = '临时id' + Date.now()
-    console.log('ready，，，', this.row)
-    console.log('f_filialeid111，，，', this.f_filialeid)
     try {
       await this.$getConfig(this, 'FilesDetail')
     } catch (error) {

package/src/components/charge/business/CardMeterCenter.vue

@@ -106,7 +106,7 @@
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_totalcost, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''"/>
+                     v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''"/>
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && config.calculatePreByCollection"
                  :class="[$v.f_collection.required ? 'has-error' : 'has-success']">

package/src/components/charge/business/FilesComplete.vue

@@ -193,8 +193,8 @@
         this.model.f_price_id = this.model.f_price_name[0].f_price_id
         this.model.f_gasproperties = this.model.f_price_name[0].f_gasproperties
         this.model.f_user_type = this.model.f_price_name[0].f_user_type
-        this.model.f_user_name = this.row.f_user_name
-        this.model.f_user_phone = this.row.f_user_phone
+        this.model.f_user_name = this.model.f_user_name
+        this.model.f_user_phone = this.model.f_user_phone
         this.model.f_meter_classify = this.model.f_gasbrand[0].f_meter_type
 
         this.model.f_operator = this.$login.f.name
@@ -209,7 +209,7 @@
       },
       clean () {
         this.$info('取消操作')
-        this.$dispatch('close', this.row)
+        this.$dispatch('refresh', this.row)
       },
 
       printok () {

package/src/components/charge/business/IOTMeterCenter.vue

@@ -855,7 +855,7 @@
           return this.row.f_balance
         }
         if (this.model.f_preamount) {
-          return ((this.model.f_collection - 0) - (this.model.f_preamount - 0) + (this.row.f_balance - 0) - this.alldue_fee).toFixed(2) - 0
+          return ((this.model.f_collection - 0) - (this.model.f_preamount - 0) + (this.row.f_balance - 0) - this.alldue_fee).toFixed(this.row.f_gas_decimal || 4) - 0
         } else {
           return 0
         }