sale-client 3.6.107 → 3.6.109

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 (8) hide show
  1. package/build/dev-server.js +1 -1
  2. package/package.json +1 -1
  3. package/src/components/charge/business/IOTMeterCenter.vue +1 -1
  4. package/src/components/charge/business/OtherChargeNew.vue +5 -3
  5. package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue +2 -1
  6. package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ResetMeter.vue +2 -2
  7. package/src/filiale/haile/handplanReplicationRate.vue +1 -1
  8. package/src/filiale/shanxian/OtherChargeNew.vue +5 -3
package/build/dev-server.js CHANGED
@@ -1,5 +1,5 @@
1
1
  var path = require('path')
2
- const [serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
2
+ const [serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080/']
3
3
  var merge = require('webpack-merge')
4
4
  var baseConfig = require('./webpack.dev.conf')
5
5
  var devConfig = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.107",
3
+ "version": "3.6.109",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/charge/business/IOTMeterCenter.vue CHANGED
@@ -473,7 +473,7 @@
473
473
  billType: '燃气费', // 票据类型（燃气费，其他费用，调用的发票代码不同）
474
474
  printType: '普通收据', // 收据/电子票/专用发票/国税发票
475
475
  payment: '',
476
- hasArrearsChange: true, // 是否可以有欠费换表 收费时用来判断是否查询旧表欠费
476
+ hasArrearsChange: false, // 是否可以有欠费换表 收费时用来判断是否查询旧表欠费
477
477
  overdraftBalance: false // 是否支持系统余额透支
478
478
  },
479
479
  model: {
package/src/components/charge/business/OtherChargeNew.vue CHANGED
@@ -47,7 +47,7 @@
47
47
  <div class="row">
48
48
  <div class="col-sm-4" :class="{'has-success':row.f_unitprice,'has-error':!row.f_unitprice}">
49
49
  <label style="" for="f_unitprice" class=" font_normal_body">*单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价</label>
50
- <input class="input_search" style="width:60%" type="number" min="1" @blur.prevent="getcollection()"
50
+ <input class="input_search" style="width:60%" type="number" min="1" @input.prevent="getcollection()"
51
51
  v-model="row.f_unitprice"
52
52
  :value.sync="row.f_unitprice"
53
53
  v-validate:f_unitprice='{required: true}'
@@ -56,7 +56,7 @@
56
56
  </div>
57
57
  <div class="col-sm-4" :class="{'has-success':row.f_number,'has-error':!row.f_number}">
58
58
  <label style="" for="f_number" class="font_normal_body">*数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量</label>
59
- <input class="input_search" style="width:60%" type="number" min='1' @blur.prevent="getcollection()"
59
+ <input class="input_search" style="width:60%" type="number" min='1' @input.prevent="getcollection()"
60
60
  v-validate:f_number='{required: true, dctest: [0, ">" ] }'
61
61
  v-model="row.f_number"
62
62
  :value.sync="row.f_number"
@@ -538,9 +538,11 @@ export default {
538
538
  let flag = true
539
539
  this.model.otherdetail.forEach((item) => {
540
540
  if (!item.f_number || item.f_number == '0') flag = false
541
+ if (!item.f_unitprice || item.f_unitprice == '0') flag = false
541
542
  if (item.f_unitprice && item.f_number) {
542
543
  money += ((item.f_unitprice - 0) * (item.f_number - 0)) - 0
543
544
  } else {
545
+ flag = false
544
546
  this.model.f_collection = 0
545
547
  }
546
548
  })
@@ -555,8 +557,8 @@ export default {
555
557
  },
556
558
  delthisdetail (index) {
557
559
  if (this.model.otherdetail.length > 1) {
558
- this.getcollection()
559
560
  this.model.otherdetail.splice(index, 1)
561
+ this.getcollection()
560
562
  }
561
563
  },
562
564
  async userfees (userinfoid, feetype) {
package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue CHANGED
@@ -225,7 +225,8 @@
225
225
  v-model="model.f_stair_use" placeholder="旧表阶梯使用量">
226
226
  </div>
227
227
  <div class="col-sm-4 "
228
- v-if="model.metermessage.gasbrand[0].f_meter_type ==='物联网表' && model.metermessage.gasbrand[0].f_hascard ==='是'">
228
+ v-if="(model.metermessage.gasbrand[0].f_meter_type ==='物联网表' && model.metermessage.gasbrand[0].f_hascard ==='是')
229
+ || (model.f_type.includes('清零') && row.f_meter_type ==='物联网表' && row.f_hascard ==='是')">
229
230
  <label class=" font_normal_body">开户方式</label>
230
231
  <v-select id="f_open_type"
231
232
  v-model="f_payment"
package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ResetMeter.vue CHANGED
@@ -244,10 +244,10 @@
244
244
  v-model="model.f_stair_use" placeholder="旧表阶梯使用量">
245
245
  </div>
246
246
  <div class="col-sm-4 "
247
- v-if="model.metermessage.gasbrand[0].f_meter_type ==='物联网表' && model.metermessage.gasbrand[0].f_hascard ==='是'">
247
+ v-if="row.f_meter_type ==='物联网表' && row.f_hascard ==='是'">
248
248
  <label class=" font_normal_body">开户方式</label>
249
249
  <v-select id="f_open_type"
250
- v-model="f_payment"
250
+ v-model="model.f_open_type"
251
251
  placeholder='开户方式'
252
252
  :search="false"
253
253
  :value-single="true"
package/src/filiale/haile/handplanReplicationRate.vue CHANGED
@@ -202,7 +202,7 @@ export default {
202
202
  'f_hand_num': '实抄户数',
203
203
  'f_oughtamount': '用气量',
204
204
  'f_oughtfee': '用气金额',
205
- 'handplansate1': '抄表率'
205
+ 'f_hand_lv': '抄表率'
206
206
  }
207
207
  },
208
208
  inputtores: [{label: '全部', value: ''}], // 抄表员
package/src/filiale/shanxian/OtherChargeNew.vue CHANGED
@@ -47,7 +47,7 @@
47
47
  <div class="row">
48
48
  <div class="col-sm-4" :class="{'has-success':row.f_unitprice,'has-error':!row.f_unitprice}">
49
49
  <label style="" for="f_unitprice" class=" font_normal_body">*单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价</label>
50
- <input class="input_search" style="width:60%" type="number" min="1" @blur.prevent="getcollection()"
50
+ <input class="input_search" style="width:60%" type="number" min="1" @input.prevent="getcollection()"
51
51
  v-model="row.f_unitprice"
52
52
  v-validate:f_unitprice='{required: true}'
53
53
  :value.sync="row.f_unitprice"
@@ -56,7 +56,7 @@
56
56
  </div>
57
57
  <div class="col-sm-4" :class="{'has-success':row.f_number,'has-error':!row.f_number}">
58
58
  <label style="" for="f_number" class="font_normal_body">*数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量</label>
59
- <input class="input_search" style="width:60%" type="number" min='1' @blur.prevent="getcollection()"
59
+ <input class="input_search" style="width:60%" type="number" min='1' @input.prevent="getcollection()"
60
60
  v-validate:f_number='{required: true, dctest: [0, ">" ] }'
61
61
  v-model="row.f_number"
62
62
  :value.sync="row.f_number"
@@ -492,9 +492,11 @@ export default {
492
492
  let flag = true
493
493
  this.model.otherdetail.forEach((item) => {
494
494
  if (!item.f_number || item.f_number == '0') flag = false
495
+ if (!item.f_unitprice || item.f_unitprice == '0') flag = false
495
496
  if (item.f_unitprice && item.f_number) {
496
497
  money += ((item.f_unitprice - 0) * (item.f_number - 0)) - 0
497
498
  } else {
499
+ flag = false
498
500
  this.model.f_collection = 0
499
501
  }
500
502
  })
@@ -509,8 +511,8 @@ export default {
509
511
  },
510
512
  delthisdetail (index) {
511
513
  if (this.model.otherdetail.length > 1) {
512
- this.getcollection()
513
514
  this.model.otherdetail.splice(index, 1)
515
+ this.getcollection()
514
516
  }
515
517
  },
516
518
  async userfees (userinfoid, feetype) {