npm - sale-client - Versions diffs - 3.5.277 → 3.5.279 - Mend

sale-client 3.5.277 → 3.5.279

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/package.json CHANGED Viewed

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

package/src/components/revenue/comprehen/Maintenance/changeMeter/changemeterOperate.vue CHANGED Viewed

@@ -62,7 +62,7 @@
         <div class="row">
           <div class="col-sm-4">
             <label class="font_normal_body">换表人&emsp;</label>
-            <input type="text" v-model="model.f_change_operator" disabled=disabled style="width: 60%" class="input_search">
+            <input type="text" v-model="model.f_change_operator" style="width: 60%" class="input_search">
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="参数:操作人员查询">操作人员</label>

package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue CHANGED Viewed

@@ -173,9 +173,7 @@
                   <input @keyup.enter="search" style="width:60%" type="checkbox" v-model='checked1' :checked="$parent.$parent.$parent.checked1"
                          @click="$parent.$parent.$parent.checkedALL()">
                 </th>
-                <th style="text-align:center">
-                  <nobr>组织机构</nobr>
-                </th>
                 <th style="text-align:center">
                   <nobr>客户号</nobr>
                 </th>
@@ -221,7 +219,9 @@
                 <!--<th style="text-align:center">
                   <nobr>指令状态</nobr>
                 </th>-->
+                <th style="text-align:center">
+                  <nobr>组织机构</nobr>
+                </th>
               </tr>
             </template>
             <template partial='body' partial='list' v-ref:grid >
@@ -229,9 +229,6 @@
                 <td style="text-align:center">
                   <input @keyup.enter="search" style="width:60%" type="checkbox" checked="checked" name="opertioninput"
                          @click="$parent.$parent.$parent.checked(row)"></td>
-                <td style="text-align:center">
-                  <nobr>{{row.f_orgname}}</nobr>
-                </td>
                 <td style="text-align:center">
                   <nobr>{{row.f_userinfo_code}}</nobr>
                 </td>
@@ -275,6 +272,9 @@
                 <!--<td style="text-align:center">
                   <nobr>{{row.f_instruct_state}}</nobr>
                 </td>-->
+                <td style="text-align:center">
+                  <nobr>{{row.f_orgname}}</nobr>
+                </td>
               </tr>
             </template>
             <template partial='foot'></template>
@@ -310,7 +310,7 @@
         </v-select>
       </div>
       <div class="form-group " style="padding-left: 8px">
-        <label class="font_normal_body">申请原因：</label>
+        <label class="font_normal_body">{{val1}}原因：</label>
         <textarea class="search_area" v-model="f_beizhu" rows="10" cols="75" placeholder="备注信息"></textarea>
       </div>
     </article>
@@ -522,9 +522,11 @@ import axios from 'axios'
         let arr = []
         this.$GetSaleParam.getGasbrand().forEach((item) => {
           let temp = {}
-          temp.label = item.label
-          temp.value = item.value
-          arr.push(temp)
+          if(item.value.f_meter_type==='物联网表'){
+            temp.label = item.label
+            temp.value = item.value.f_meter_brand
+            arr.push(temp )
+          }
         })
         this.meterbrand = [{label: '全部', value: ''}, ...arr]

package/src/filiale/qianneng/OtherChargeNew.vue CHANGED Viewed

@@ -43,7 +43,7 @@
                   placeholder='型号'
                   :value.sync="row.f_typenumber"
                   :options='row.typenumberList'
-                  @change="setTypeprice"
+                  @change="setTypeprice(row.f_typenumber, row)"
                   close-on-select clear-button>
                 </v-select>
               </div>
@@ -346,13 +346,13 @@
       }
     },
     methods: {
-      setTypeprice (val) {
+      setTypeprice (val, row) {
         console.log('f_typenumber', this.f_typenumber)
         if (this.f_typenumber !== ' ') {
           let unitprice = this.$appdata.getSingleValue(val)
           console.log('unitprice', unitprice)
           if (unitprice !== undefined) {
-            this.row.f_unitprice = this.$appdata.getSingleValue(val)
+            row.f_unitprice = unitprice
           }
         }
       },
@@ -441,6 +441,8 @@
       },
       setTypenumber (val, row) {
         row.typenumberList = this.$appdata.getParam(val)
+        let unitprice = this.$appdata.getSingleValue(val)
+        if (unitprice !== undefined) row.f_unitprice = unitprice
       },
       async confirm (parameter) {
         let res = await this.$showMessage(`确定对客户${this.row.f_user_name}进行其他收费吗？`, ['confirm', 'cancel'])

package/src/filiale/shanxian/components/FilesManage/FileUserFiles.vue CHANGED Viewed

@@ -12,9 +12,9 @@
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group"
                           v-if="$parent.$parent.clientWidth>1600">
-                    <label class="font_normal_body">客户编号</label>
+                    <label class="font_normal_body">用户编号</label>
                     <input class="input_search" condition="f_userinfo_code = '{}'"
-                           placeholder='客户编号'
+                           placeholder='用户编号'
                            style="width:60%" type="text" v-model="model.f_userinfo_code">
                   </div>
                   <res-select-group v-if="$parent.$parent.clientWidth<1600&&!$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres"  :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
@@ -23,18 +23,18 @@
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group"
                           v-if="$parent.$parent.clientWidth<1600&&!$parent.$parent.createFile">
-                    <label class="font_normal_body">客户编号</label>
+                    <label class="font_normal_body">用户编号</label>
                     <input class="input_search" condition="f_userinfo_code = '{}'"
-                           placeholder='客户编号'
+                           placeholder='用户编号'
                            style="width:60%" type="text" v-model="model.f_userinfo_code">
                   </div>
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group" v-if="!$parent.$parent.createFile">
-                    <label class="font_normal_body">客户名称</label>
+                    <label class="font_normal_body">用户名称</label>
                     <input class="input_search" condition="f_user_name like '%{}%'"
-                           placeholder='客户姓名'
+                           placeholder='用户姓名'
                            style="width:60%" type="text" v-model="model.f_user_name">
                   </div>
                   <div
@@ -91,9 +91,9 @@
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group"
                           v-if="$parent.$parent.clientWidth<1600&&$parent.$parent.createFile">
-                    <label class="font_normal_body">客户编号</label>
+                    <label class="font_normal_body">用户编号</label>
                     <input class="input_search" condition="f_userinfo_code = '{}'"
-                           placeholder='客户编号'
+                           placeholder='用户编号'
                            style="width:60%" type="text" v-model="model.f_userinfo_code">
                   </div>
                   <res-select-group  v-if="$parent.$parent.clientWidth<1600&&$parent.$parent.createFile" :style="$parent.$parent.createFile?'col-sm-4':'col-sm-2'" :initres="$parent.$parent.initres"  :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
@@ -102,16 +102,16 @@
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group" v-if="$parent.$parent.createFile">
-                    <label class="font_normal_body">客户名称</label>
+                    <label class="font_normal_body">用户名称</label>
                     <input class="input_search" condition="f_user_name like '%{}%'"
-                           placeholder='客户姓名'
+                           placeholder='用户姓名'
                            style="width:60%" type="text" v-model="model.f_user_name">
                   </div>
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group">
-                    <label class="font_normal_body">旧客户号</label>
-                    <input class="input_search" condition="f_olduserinfo_code = '{}'" placeholder='客户编号'
+                    <label class="font_normal_body">旧用户号</label>
+                    <input class="input_search" condition="f_olduserinfo_code = '{}'" placeholder='用户编号'
                            style="width:60%"
                            type="text"
                            v-model="model.f_olduserinfo_code">
@@ -159,8 +159,8 @@
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group">
-                    <label class="font_normal_body">客户电话</label>
-                    <input class="input_search" condition="f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
+                    <label class="font_normal_body">用户电话</label>
+                    <input class="input_search" condition="f_user_phone = '{}'" placeholder='用户电话' style="width:60%"
                            type="text"
                            v-model="model.f_user_phone">
                   </div>
@@ -174,17 +174,17 @@
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group">
-                    <label class="font_normal_body">客户地址</label>
-                    <input class="input_search" condition="f_address like '%{}%'" placeholder='客户地址' style="width:60%"
+                    <label class="font_normal_body">用户地址</label>
+                    <input class="input_search" condition="f_address like '%{}%'" placeholder='用户地址' style="width:60%"
                            type="text" v-model="model.f_address">
                   </div>
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group">
-                    <label class="font_normal_body">客户状态</label>
+                    <label class="font_normal_body">用户状态</label>
                     <v-select :options='$parent.$parent.userstates' :value.sync="model.f_user_state"
                               close-on-select condition="f_user_state='{}'"
-                              placeholder='客户状态' v-model="model.f_user_state"></v-select>
+                              placeholder='用户状态' v-model="model.f_user_state"></v-select>
                   </div>
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
@@ -293,10 +293,13 @@
                     <nobr>序号</nobr>
                   </th>
                   <th>
-                    <nobr>客户编号</nobr>
+                    <nobr>用户编号</nobr>
                   </th>
                   <th>
-                    <nobr>客户名称</nobr>
+                    <nobr>用户名称</nobr>
+                  </th>
+                  <th  v-if="!$parent.$parent.$parent.isOper">
+                    <nobr>用户地址</nobr>
                   </th>
                   <th>
                     <nobr>表号</nobr>
@@ -305,11 +308,9 @@
                     <nobr>卡号</nobr>
                   </th>
                   <th>
-                    <nobr>客户电话</nobr>
-                  </th>
-                  <th  v-if="!$parent.$parent.$parent.isOper">
-                    <nobr>客户地址</nobr>
+                    <nobr>用户电话</nobr>
                   </th>
                   <th>
                     <nobr>用户类型</nobr>
                   </th>
@@ -349,12 +350,12 @@
                 <td style="text-align: center;">
                   <span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_user_name}}</b></a></span>
                 </td>
-                <td style="text-align: center;">{{row.f_meternumber}}</td>
-                <td style="text-align: center;">{{row.f_card_id}}</td>
-                <td style="text-align: center;">{{row.f_user_phone}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.isOper">{{row.f_address_detail ? row.f_address + row.f_address_detail :
                   row.f_address}}
                 </td>
+                <td style="text-align: center;">{{row.f_meternumber}}</td>
+                <td style="text-align: center;">{{row.f_card_id}}</td>
+                <td style="text-align: center;">{{row.f_user_phone}}</td>
                 <td style="text-align: center;">{{row.f_user_type}}</td>
                 <td style="text-align: center;">{{row.f_gasproperties}}</td>
                 <td style="text-align: center;">{{row.f_meter_classify}}</td>
@@ -432,9 +433,9 @@
     <modal :show.sync="resshow" width="500px" title="建档成功" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 70px">
         <div>
-          <label class="font_normal_body" style="line-height: 20px">客户编号</label>
+          <label class="font_normal_body" style="line-height: 20px">用户编号</label>
           <input class="input_search" condition="f_userinfo_code = '{}'"
-                 placeholder='客户编号' disabled
+                 placeholder='用户编号' disabled
                  type="text" v-model="resdata">
         </div>
       </article>

package/src/filiale/shanxian/components/FilesManage/MeterinfoTest.vue CHANGED Viewed

@@ -225,7 +225,7 @@
           <div class="col-sm-4 form-group" >
             <label for="f_position" class="font_normal_body"  title="参数:安装位置">&ensp;安装位置</label>
             <v-select :value.sync="row.f_position" v-model="row.f_position"
-                      :options='positions' placeholder='安装位置'
+                      :options='positions' placeholder='安装位置' :value-single="true"
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group" v-show="true">
@@ -243,7 +243,7 @@
             ></datepicker>
           </div>
           <div class="col-sm-4 form-group" v-show="opteratormetrbook" >
-            <label for="f_position" class="font_normal_body"  >&ensp;抄&ensp;表&ensp;册</label>
+            <label for="f_meter_book_num" class="font_normal_body"  >&ensp;抄&ensp;表&ensp;册</label>
             <v-select :value.sync="row.f_meter_book_num" v-model="row.f_meter_book_num"
                       :options='meterbookoptions' placeholder='抄表册'
                       close-on-select></v-select>
@@ -338,7 +338,7 @@
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group" >
-            <label for="f_position" class="font_normal_body" title="参数:使用状态">&ensp;使用状态</label>
+            <label for="f_usestate" class="font_normal_body" title="参数:使用状态">&ensp;使用状态</label>
             <v-select :value.sync="row.f_usestate" v-model="row.f_usestate"
                       :options='usestate' placeholder='使用状态'
                       close-on-select></v-select>
@@ -550,7 +550,6 @@
     } else {
       self.row.f_whether_hairpin = self.row.gasbrand[0].f_meter_type === '机表' ? '无卡' : '未发'
     }
-    console.log('111', self.row)
   }
   export default {
     title: '表具信息',
@@ -607,16 +606,14 @@
     },
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
     async ready () {
+      console.log('单县----------------------------------------',this.row)
       // 安装日期默认是建档日期
       if (this.row.f_install_date == null || this.row.f_install_date == '') {
-        console.log('安装日期赋值了')
         this.row.f_install_date = Util.toStandardTimeString()
         this.f_install_date = Util.toStandardTimeString()
-        console.log('安装日期赋值了',this.row.f_install_date)
-        console.log('安装日期赋值了001',this.row.f_install_date)
       } else {
         this.f_install_date = this.row.f_install_date
-        console.log('安装日期row值')
       }
       // 出厂日期
       if (this.row.f_factory_date == null || this.row.f_factory_date == '') {
@@ -625,11 +622,24 @@
       } else {
         this.f_factory_date = this.row.f_factory_date
       }
-      this.getbfrq()
       this.updatayear(this.f_factory_date)
-      console.log('看看meter里面的数据', this.meter, this.row)
-      this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
+      console.log('看看meter里面的数据', this.meter)
+      this.row = Object.assign(this.row, this.meter, {})
+      if (this.meter.f_user_type == '民用'){
+        this.row.f_position = '厨房'
+        console.log('厨房是不是true--------->',this.row.f_position)
+      }
+      if (!this.row.f_use_limit){
+        this.row.f_use_limit = 10
+        console.log('使用年限---------->',this.row.f_use_limit)
+      }
+      console.log('合并后得数据----------->', this.row)
       this.orginCardId = this.row.f_card_id
       if(this.row.f_meter_classify){
         if(this.row.f_meter_classify==='物联网表'){
           this.isiot=true
@@ -653,7 +663,6 @@
         }
           let filter = this.$login.f.orgid
           let ret = this.$GetSaleParam.getAdjustable(filter)
-        console.log("f_adjustable_type",this.row.f_adjustable_type)
           let newadjustables = ret.filter(adjustable=>{
             return adjustable.value.f_adjustable_type === this.row.f_adjustable_type
           })
@@ -664,7 +673,6 @@
             temp.value = item.value
             arr.push(temp)
           })
-        console.log("过滤后的数组", arr)
           return arr
       },
       initAdjustables () {
@@ -679,10 +687,8 @@
         const day = today.getDate()
         const date = new Date((year-0) +(this.bfrq-0), month, day)
         this.finalDate = date.toLocaleDateString()
-        console.log('898989898', this.finalDate)
         this.row.f_scrap_date = this.finalDate
         this.f_scrap_date = this.finalDate
-        console.log('898989898', this.row.f_scrap_date)
       },
       checkCardId() {
         this.$resetpost('rs/logic/checkCardId', {
@@ -766,7 +772,6 @@
       },
       brandChange (val) {
         this.isdecimal = val.length > 0 ? val[0].f_isdecimal : '否'
-        console.log('sadasfasf', val)
         if (val.length > 0 && val[0].f_meter_type === '物联网表') {
           this.isiot = true
         } else {
@@ -907,7 +912,6 @@
     },
     watch: {
       'row'(){
-        debugger
         console.log("row",this.row)
       },
       'meter' () {
@@ -918,17 +922,13 @@
         this.f_factory_date = this.row.f_factory_date
       },
       'f_factory_date' (val) {
-        console.log('222222222222', val)
         this.row.f_factory_date = val
         this.updatayear(val)
       },
       'row.f_scrap_date' (val) {
-        console.log('45454545')
         this.row.f_scrap_date = val
-        console.log('45454545', this.row.f_scrap_date, val)
       },
       'finalDate' () {
-        console.log('45454545666')
         this.row.f_scrap_date = this.finalDate
       },
       'row.pricetype' (val) {

package/src/filiale/shanxian/components/FilesManage/UserEssentialInfoTest.vue CHANGED Viewed

@@ -4,24 +4,24 @@
       <form class="form-horizontal select-overspread ">
         <div class="row">
           <div class="col-sm-4 form-group ">
-            <label for="f_user_name" class="font_normal_body">*客户姓名</label>
+            <label for="f_user_name" class="font_normal_body">*用户姓名</label>
             <input type="text" v-model="baseinfo.base.f_user_name" v-validate:f_user_name='{required: true }'
-                   class="input_search" style="width:60%" placeholder="客户名称" v-next-el="phone">
+                   class="input_search" style="width:60%" placeholder="用户名称" 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' : '']">
-            <label for="f_user_phone" class="font_normal_body">*客户电话</label>
+            <label for="f_user_phone" class="font_normal_body">*用户电话</label>
             <input type="text" maxlength="11" v-model="baseinfo.base.f_user_phone"
                     class="input_search" style="width:60%"
                    v-validate:f_user_phone="{minlength: 11, maxlength: 11  }"
-                   placeholder="客户电话" v-el:phone v-next-el="area">
+                   placeholder="用户电话" v-el:phone v-next-el="area">
             <button type="button" class="glyphicon glyphicon-plus" @click.stop="phoneManage()"></button>
           </div>
           <div class="col-sm-4 form-group">
-            <label for="f_user_state" class="font_normal_body">&ensp;客户状态</label>
+            <label for="f_user_state" class="font_normal_body">&ensp;用户状态</label>
             <v-select :value.sync="baseinfo.base.f_user_state"
                       :disabled="true"
                       :value-single="true"
-                      :options='userstates' placeholder='客户状态'
+                      :options='userstates' placeholder='用户状态'
                       close-on-select></v-select>
           </div>
         </div>
@@ -177,7 +177,7 @@
                  :class="[$v.f_bank_accopen.required ? 'has-error' : '']">
               <label for="f_username" class="font_normal_body">银行户名</label>
               <input type="text" v-model="baseinfo.bank.f_bank_accopen"
-                     class="input_search" style="width:60%" id="f_username" placeholder="客户名称"
+                     class="input_search" style="width:60%" id="f_username" placeholder="用户名称"
                      v-validate:f_bank_accopen='{required: true}'
                      v-next-el="bankaccount">
             </div>

package/src/filiale/shanxian/components/FilesManage/UserGeneralInfoTest.vue CHANGED Viewed

@@ -109,7 +109,6 @@ let getFileGen = async function (self, data) {
     rejectMsg: '用户详细信息加载失败，请重新选择，如果多次失败，请检查系统是否正常！',
     newly: true
   })
-  console.log(result.data)
   self.data = result.data
   self.data.meterinfo.forEach((item) => {
     item.devicesinfo.forEach((item2) => {
@@ -216,7 +215,6 @@ export default {
   },
   async ready () {
     this.blodid = '临时id' + Date.now()
-    console.log('ready，，，', this.row)
     await this.getOvedueset()
     if (this.row) { // 修改用户
       await this.areaGen(this.row)
@@ -385,7 +383,6 @@ export default {
       xhr.open('POST', 'rs/file/uploadFile')
       if (this.headers) {
-        console.log('this.blodid----->',this.blodid)
         this.headers.blodid = this.blodid
         for (var header in this.headers) {
           xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
@@ -404,7 +401,7 @@ export default {
       this.$dispatch('clean', '取消档案修正', 'user-general-info', this.row)
     },
     checkout (val) {
-      debugger
           // 对收到的综合信息进行校验（主要目的是为了防止下拉框没有默认值）
           // 对综合用户基本信息进行校验
@@ -433,7 +430,6 @@ export default {
           // 对表具信息进行校验
       this.data.meterinfo.forEach((row) => {
-        console.log(row)
         if (row.f_adjustable) {
           this.adjustables.forEach((item) => {
             if (item.label === row.f_adjustable) {
@@ -489,8 +485,6 @@ export default {
           let names = this.getPricenames(row.f_user_type,
                     row.f_gasproperties,
                     row.pricetype)
-          console.log('=====2.===校验气价名称', names, row.f_user_type, row.f_gasproperties, row.pricetype)
           if (names.length > 0) {
             names.forEach((item) => {
               if (item.label === row.pricename) {
@@ -677,7 +671,6 @@ export default {
         }
         Object.assign(this.data.meterinfo[0], this.data.meterinfo[0], temp)
         this.data.baseinfo.base.f_house_type = row.f_house_type ? [row.f_house_type] : ''
-        console.log('====1.=====', temp, row)
         this.checkout('area')
       }
     }

package/src/filiale/shanxian/components/FilesManageNew/FileUserFiles.vue CHANGED Viewed

@@ -23,17 +23,17 @@
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group"
                     v-if="$parent.$parent.clientWidth>1600">
-                    <label class="font_normal_body">客户编号</label>
+                    <label class="font_normal_body">用户编号</label>
                     <input class="input_search" condition="f_userinfo_code = '{}'"
-                           placeholder='客户编号'
+                           placeholder='用户编号'
                            style="width:60%" type="text" v-model="model.f_userinfo_code">
                   </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group" v-if="!$parent.$parent.createFile">
-                    <label class="font_normal_body">客户名称</label>
+                    <label class="font_normal_body">用户名称</label>
                     <input class="input_search" condition="f_user_name like '%{}%'"
-                           placeholder='客户姓名'
+                           placeholder='用户姓名'
                            style="width:60%" type="text" v-model="model.f_user_name">
                   </div>
                   <div
@@ -94,24 +94,24 @@
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group"
                     v-if="$parent.$parent.clientWidth<1600&&$parent.$parent.createFile">
-                    <label class="font_normal_body">客户编号</label>
+                    <label class="font_normal_body">用户编号</label>
                     <input class="input_search" condition="f_userinfo_code = '{}'"
-                           placeholder='客户编号'
+                           placeholder='用户编号'
                            style="width:60%" type="text" v-model="model.f_userinfo_code">
                   </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group" v-if="$parent.$parent.createFile">
-                    <label class="font_normal_body">客户名称</label>
+                    <label class="font_normal_body">用户名称</label>
                     <input class="input_search" condition="f_user_name like '%{}%'"
-                           placeholder='客户姓名'
+                           placeholder='用户姓名'
                            style="width:60%" type="text" v-model="model.f_user_name">
                   </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group">
-                    <label class="font_normal_body">旧客户号</label>
-                    <input class="input_search" condition="f_olduserinfo_code = '{}'" placeholder='客户编号'
+                    <label class="font_normal_body">旧用户号</label>
+                    <input class="input_search" condition="f_olduserinfo_code = '{}'" placeholder='用户编号'
                            style="width:60%"
                            type="text"
                            v-model="model.f_olduserinfo_code">
@@ -127,26 +127,26 @@
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group">
-                    <label class="font_normal_body">客户电话</label>
-                    <input class="input_search" condition="f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
+                    <label class="font_normal_body">用户电话</label>
+                    <input class="input_search" condition="f_user_phone = '{}'" placeholder='用户电话' style="width:60%"
                            type="text"
                            v-model="model.f_user_phone">
                   </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group">
-                    <label class="font_normal_body">客户地址</label>
-                    <input class="input_search" condition="f_address like '%{}%'" placeholder='客户地址' style="width:60%"
+                    <label class="font_normal_body">用户地址</label>
+                    <input class="input_search" condition="f_address like '%{}%'" placeholder='用户地址' style="width:60%"
                            type="text" v-model="model.f_address">
                   </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group">
-                    <label class="font_normal_body">客户状态</label>
+                    <label class="font_normal_body">用户状态</label>
                     <v-select :options='$parent.$parent.userstates' :value.sync="model.f_user_state"
                               close-on-select condition="f_user_state='{}'"
                               :value-single="true"
-                              placeholder='客户状态' v-model="model.f_user_state"></v-select>
+                              placeholder='用户状态' v-model="model.f_user_state"></v-select>
                   </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
@@ -216,16 +216,16 @@
                     <nobr>序号</nobr>
                   </th>
                   <th>
-                    <nobr>客户编号</nobr>
+                    <nobr>用户编号</nobr>
                   </th>
                   <th>
-                    <nobr>客户名称</nobr>
-                  </th>
-                  <th>
-                    <nobr>客户电话</nobr>
+                    <nobr>用户名称</nobr>
                   </th>
                   <th  v-if="!$parent.$parent.$parent.isOper">
-                    <nobr>客户地址</nobr>
+                    <nobr>用户地址</nobr>
+                  </th>
+                  <th>
+                    <nobr>用户电话</nobr>
                   </th>
                   <th>
                     <nobr>状态</nobr>
@@ -248,10 +248,10 @@
                 <td style="text-align: center;">{{$index + 1}}</td>
                 <td style="text-align: center;">{{row.f_userinfo_code}}</td>
                 <td style="text-align: center;">{{row.f_user_name}}</td>
-                <td style="text-align: center;">{{row.f_user_phone}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.isOper">{{row.f_address_detail ? row.f_address + row.f_address_detail :
                   row.f_address}}
                 </td>
+                <td style="text-align: center;">{{row.f_user_phone}}</td>
                 <td style="text-align: center;">{{row.f_user_state}}</td>
                 <td style="text-align: center;">{{row.f_createfile_date}}</td>
                 <td style="text-align: center;">{{row.f_printdate}}</td>

package/src/filiale/shanxian/components/FilesManageNew/UserEssentialInfoTest.vue ADDED Viewed

@@ -0,0 +1,327 @@
+<template>
+  <div>
+    <validator name='v' @valid="$emit('valid')" @invalid="$emit('invalid')">
+      <form class="form-horizontal select-overspread ">
+        <div class="row">
+          <div class="col-sm-4 form-group " :class="[$v.f_user_name.required ? 'has-error' : '']">
+            <label for="f_user_name" class="font_normal_body">*用户姓名</label>
+            <input type="text" v-model="baseinfo.base.f_user_name" v-validate:f_user_name='{required: true }'
+                   class="input_search" style="width:60%" placeholder="用户名称" 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' : '']">
+            <label for="f_user_phone" class="font_normal_body">*用户电话</label>
+            <input type="text" maxlength="11" v-model="baseinfo.base.f_user_phone"
+                   v-validate:f_user_phone="{minlength: 11, maxlength: 11  }" class="input_search" style="width:60%"
+                   placeholder="用户电话" v-el:phone v-next-el="area">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_user_state" class="font_normal_body">&ensp;用户状态</label>
+            <v-select :value.sync="baseinfo.base.f_user_state"
+                      :disabled="false"
+                      :value-single="true"
+                      :options='userstates' placeholder='用户状态'
+                      close-on-select></v-select>
+          </div>
+        </div>
+        <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-model="baseinfo.base.f_credentials"
+                      :value-single="true"
+                      :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] === '身份证'">
+            <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%"
+                   placeholder="证件号码">
+          </div>
+          <div style="" class="col-sm-8 form-group"
+               v-if="baseinfo.base.f_credentials !== '身份证'&&baseinfo.base.f_credentials[0] !== '身份证'">
+            <label class="font_normal_body">&ensp;证件号码</label>
+            <input type="text" v-model="baseinfo.base.f_idnumber" class="input_search" style="width:80%"
+                   placeholder="证件号码">
+          </div>
+        </div>
+        <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="用户地址" >
+            <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="selectaddress()">修改地址</button>
+            </span>
+          </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_used_name" class="font_normal_body">&ensp;曾&ensp;用&ensp;名</label>
+            <input type="text" v-model="baseinfo.base.f_used_name" class="input_search" style="width:60%"
+                   placeholder="曾用名">
+          </div>
+          <div style="" class="col-sm-4 form-group">
+            <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%"
+                   placeholder="备用电话">
+          </div>
+          <div class="col-sm-4 form-group" :class="[$v.f_people_num.dctest ? 'has-error' : '']">
+            <label for="f_people_num" class="font_normal_body">&ensp;人&ensp;口&ensp;数</label>
+            <input type="number" v-model="baseinfo.base.f_people_num" v-validate:f_people_num='{dctest: [0, ">=" ]}'
+                   :disabled="!jurisdiction.includes('修改人口数')" class="input_search" style="width:60%"
+                   placeholder="家庭人口数">
+          </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_balance" class="font_normal_body">&ensp;用户余额</label>
+            <input type="text" v-model="baseinfo.base.f_balance" class="input_search" style="width:60%"
+                   placeholder="用户余额" :disabled="!jurisdiction.includes('档案信息查询修改')">
+          </div>
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_is_mgq" class="font_normal_body ">煤&ensp;改&ensp;气&ensp;</label>
+            <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_is_mgq"  v-model="baseinfo.base.f_is_mgq"
+                      :options='mgq' placeholder='是否煤改气'   style="width: 65%"       close-on-select></v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_contract" class="font_normal_body">&ensp;燃气本号</label>
+            <input type="text"  v-model="baseinfo.base.f_book_no" class="input_search" style="width:60%" placeholder="用户证号">
+          </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_rent_name" class="font_normal_body">&ensp;租户姓名</label>
+            <input type="text" v-model="baseinfo.base.f_rent_name" class="input_search" style="width:60%"
+                   placeholder="租户姓名">
+          </div>
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_zuhu_phone" class="font_normal_body">&ensp;租户电话</label>
+            <input type="text" v-model="baseinfo.base.f_zuhu_phone" class="input_search" style="width:60%"
+                   placeholder="租户电话">
+          </div>
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_cost_type" class="font_normal_body ">&ensp;付款类型</label>
+            <v-select id="f_cost_type" :value.sync="baseinfo.base.f_cost_type"  v-model="baseinfo.base.f_cost_type"
+                      :options='costtype' placeholder='付款类型'   style="width: 65%"       close-on-select></v-select>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-8 form-group">
+            <label for="f_contract" class="font_normal_body">&ensp;合同编号</label>
+            <input type="text" v-model="baseinfo.base.f_contract_id" class="input_search" style="width:80%"
+                   placeholder="合同编号">
+          </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" :class="[$v.f_print_dh.required ? 'has-error' : '']">
+            <label for="f_print_dh" class="font_normal_body ">*打印类别</label>
+            <input type="text" v-show="false" v-model="baseinfo.base.f_print_dh" v-validate:f_print_dh='{required: true }'>
+            <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>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-8 form-group">
+            <label for="f_paper_account" class="font_normal_body ">&ensp;备&emsp;&emsp;注</label>
+            <input class="input_search" style="width:80%" v-model="baseinfo.base.f_comments"/>
+          </div>
+          <div class="col-sm-4 form-group" :class="[$v.f_house_type.required ? 'has-error' : '']">
+            <label for="f_user_state" class="font_normal_body">&ensp;房屋类型</label>
+            <input type="text" v-show="false" v-model="baseinfo.base.f_house_type" v-validate:f_house_type='{required: true }'>
+            <v-select :value.sync="baseinfo.base.f_house_type" :search="false" :value-single="true"
+                      :options='housetype' placeholder='房屋类型' close-on-select>
+            </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>
+        </div>
+        <div v-if="baseinfo.base.f_cost_type[0] === '银行代扣'">
+          <div class="row">
+            <div class="col-sm-4 form-group"
+                 :class="[$v.f_bank_accopen.required ? 'has-error' : '']">
+              <label for="f_username" class="font_normal_body">银行户名</label>
+              <input type="text" v-model="baseinfo.bank.f_bank_accopen"
+                     class="input_search" style="width:60%" id="f_username" placeholder="用户名称"
+                     v-validate:f_bank_accopen='{required: true}'
+                     v-next-el="bankaccount">
+            </div>
+            <div class="col-sm-4 form-group" id=userfiles-useEssInf-银行名称>
+              <label for="f_username" class="font_normal_body ">银行名称</label>
+              <v-select :value.sync="baseinfo.bank.f_bank_name"
+                        :options='banknames' placeholder='银行名称'
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label for="f_bank_idnumber" class="font_normal_body">缴费编号</label>
+              <input type="text" v-model="baseinfo.bank.f_bank_pay_number"
+                     class="input_search" style="width:60%"
+                     aria-describedby="helpBlock" placeholder="缴费编号" v-el:bankpaynumber>
+            </div>
+            <div class="col-sm-12 form-group">
+              <label for="f_bank_idnumber" class="font_normal_body">身份证号</label>
+              <input type="text" v-model="baseinfo.bank.f_bank_idnumber"
+                     class="input_search" style="width:54%"
+                     aria-describedby="helpBlock" placeholder="身份证号" v-el:bankidnumber>
+            </div>
+            <div class="col-sm-12 form-group"
+                 :class="[$v.f_bank_account.required ? 'has-error' : '']">
+              <label for="f_userid" class="font_normal_body">银行账号</label>
+              <input type="text" v-model="baseinfo.bank.f_bank_account" class="input_search" style="width:54%"
+                     v-validate:f_bank_account='{required: true}' placeholder="银行账号" v-el:bankaccount
+                     v-next-el="bankidnumber">
+            </div>
+          </div>
+        </div>
+      </form>
+    </validator>
+    <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"
+                                 :f_filialeid="f_filialeid"
+                                 v-ref:fileaddress ></file-address-manage-new>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+    import {HttpResetClass} from 'vue-client'
+    // import HighMeter from '../../plugins/HighMeterPlugin'
+    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
+      } catch (e) {
+        console.log(e)
+      }
+    }
+    export default {
+      title: '基本信息',
+      props: ['baseinfo', 'addressinfo', 'isedit', 'f_filialeid'],
+      data () {
+        return {
+          showselectaddress: false,
+          site: '',
+          areas: [],
+          streets: [],
+          residentials: [],
+          config: {},
+          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: '暂不选择'}],
+          jurisdiction: this.$login.r,
+          edituserstate: false,
+            // highMeterPlugin: {},
+          readCardFlag: true,
+          isSelect: false
+        }
+      },
+      ready () {
+        console.log('f_filialeid222，，，', this.f_filialeid)
+        getEditUserState(this)
+        this.$resetValidation()
+            // this.highMeterPlugin = new HighMeter(this,this.readIDCardCallback)
+      },
+      beforeDestroy () {
+        console.log('销毁')
+          // this.highMeterPlugin.Stop()
+      },
+      methods: {
+        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('啥也不做')
+        },
+        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[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_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 = ['正常']
+              }
+            })
+          }
+        }
+      },
+      computed: {},
+      events: {
+        'confirmaddress' (res) {
+            //  console.log('选定地址', res)
+          this.showselectaddress = false
+          this.addressinfo.f_address = res.f_address
+          this.addressinfo.id = res.id
+          if (res.f_house_type != null) {
+            this.baseinfo.base.f_house_type = res.f_house_type
+          }
+          this.$dispatch('defaultOtheret', res)
+        }
+      }
+    }
+</script>

package/src/filiale/shanxian/sale.js CHANGED Viewed

@@ -45,4 +45,6 @@ export default function () {
   Vue.component('reset-meter', (resolve) => { require(['./ResetMeter'], resolve) })
 // 表计管理
   Vue.component('web-meter-info', (resolve) => { require(['./WebMeterInfo'], resolve) })
+  // 用户基本信息test
+  Vue.component('file-user-essential-info-new', (resolve) => { require(['./components/FilesManageNew/UserEssentialInfoTest'], resolve) })
 }

package/src/filiale/wenxi/DisableManage.vue CHANGED Viewed

@@ -69,7 +69,7 @@
             f_othereason: this.model.f_othereason
           }
           this.$resetpost('rs/logic/updateDisable', {data: data}, {
-            resolveMsg: null,
+            resolveMsg: '更新停用原因成功',
             rejectMsg: '更新停用原因失败！！'
           })
           return

package/src/filiale/yuansheng/CardMeterCenter.vue CHANGED Viewed

@@ -459,6 +459,7 @@
           self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
           self.$dispatch('refresh')
         } else {
+          self.$showAlert(`用户限购量为${getLimit.data.f_limit_value}`, 'warning', 3000)
           if (getLimit.data.f_limit_value) {
             self.maxgas = (getLimit.data.f_limit_value - 0)
             self.limitgas = true

package/src/filiale/yuansheng/IOTMeterCenter.vue CHANGED Viewed

@@ -18,8 +18,7 @@
                  :class="[$v.f_pregas.dctest? 'has-error' : 'has-success']">
               <label for="f_pregas" class=" font_normal_body">预购气量</label>
               <input class="input_search" style="width:60%" type="number" id="pregasFocue"
-                     @blur="pregas()" v-model="model.f_pregas"
-                     v-validate:f_pregas='{dctest: [maxgas, "<=" ]}' placeholder="预购气量"
+                     @blur="pregas()" v-model="model.f_pregas" placeholder="预购气量"
                      v-next-el='sk' >
             </div>
         <!--    <div class="col-sm-4 form-group" v-if="row.f_collection_type == '按金额'">
@@ -408,6 +407,7 @@
           self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
           self.$dispatch('refresh')
         } else {
+          self.$showAlert(`用户限购量为${getLimit.data.f_limit_value}`, 'warning', 3000)
           if (getLimit.data.f_limit_value) {
             self.maxgas = (getLimit.data.f_limit_value - 0)
             self.limitgas = true

package/src/filiale/yuansheng/NoCardMeterCenter.vue CHANGED Viewed

@@ -17,8 +17,7 @@
                  :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
               <label for="f_pregas" class=" font_normal_body">预购气量</label>
               <input class="input_search" style="width:60%" type="number"
-                     @blur="pregas()" v-model="model.f_pregas" id="fpregas"
-                     v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
+                     @blur="pregas()" v-model="model.f_pregas" id="fpregas" placeholder="预购气量"
                      v-next-el='sk' >
             </div>
   <!--          <div class="col-sm-4" v-if="row.f_collection_type == '按金额'">
@@ -292,6 +291,7 @@
           self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
           self.$dispatch('refresh')
         } else {
+          self.$showAlert(`用户限购量为${getLimit.data.f_limit_value}`, 'warning', 3000)
           if (getLimit.data.f_limit_value) {
             self.maxgas = (getLimit.data.f_limit_value - 0)
             self.limitgas = true

package/src/main.js CHANGED Viewed

@@ -1,27 +1,27 @@
-import Vue from 'vue'
-import all from 'vue-client/src/all'
-import App from './App'
-import system from 'system-clients/src/system'
-import sale from './sale'
-import wenxi from './filiale/wuhai/sale'
-// import FilialeSale from './filiale/yuansheng/sale'
-import address from 'address-client/src/address'
-import ldap from 'ldap-clients/src/ldap'
-import VueClipboard from 'vue-clipboard2'
-Vue.use(VueClipboard)
-Vue.config.silent = true
-all()
-system(false)
-sale()
-wenxi()
-// FilialeSale()
-address()
-ldap()
-require('system-clients/src/styles/less/bootstrap.less')
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import all from 'vue-client/src/all'
+import App from './App'
+import system from 'system-clients/src/system'
+import sale from './sale'
+import wenxi from './filiale/yuansheng/sale'
+// import FilialeSale from './filiale/yuansheng/sale'
+import address from 'address-client/src/address'
+import ldap from 'ldap-clients/src/ldap'
+import VueClipboard from 'vue-clipboard2'
+Vue.use(VueClipboard)
+Vue.config.silent = true
+all()
+system(false)
+sale()
+wenxi()
+// FilialeSale()
+address()
+ldap()
+require('system-clients/src/styles/less/bootstrap.less')
+new Vue({
+  el: 'body',
+  components: { App }
+})