sale-client 3.5.277 → 3.5.278

package/package.json

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

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

@@ -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/filiale/qianneng/OtherChargeNew.vue

@@ -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/MeterinfoTest.vue

@@ -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/UserGeneralInfoTest.vue

@@ -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/wenxi/DisableManage.vue

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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 }
+})