sale-client 3.6.577 → 3.6.579

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.577",
3
+ "version": "3.6.579",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -35,10 +35,11 @@
35
35
  close-on-select></v-select>
36
36
  </div>
37
37
  <div style="" class="col-sm-8 form-group"
38
+ :class="[$v.f_idnumber2.identityCardValid ? 'has-error' : '']"
38
39
  v-if="baseinfo.base.f_credentials === '身份证'">
39
40
  <label for="f_idnumber" class="font_normal_body">*证件号码</label>
40
41
  <input type="text" maxlength="18" v-model="baseinfo.base.f_idnumber"
41
- v-validate:f_idnumber2='{identityCardValid: true}' class="input_search" style="width:80%"
42
+ v-validate:f_idnumber2='{required: true}' class="input_search" style="width:80%"
42
43
  placeholder="证件号码">
43
44
  </div>
44
45
  <div style="" class="col-sm-8 form-group" v-if="baseinfo.base.f_credentials !== '身份证'">
@@ -429,7 +429,7 @@
429
429
  // 根据type数据 选择调用的Logic
430
430
  if (type === '过户') {
431
431
  name = 'rs/report/transfer_bill'
432
- } else if (type === '换新表' || type === '气表清零') {
432
+ } else if (type === '换新表' || type === '换表' || type === '气表清零') {
433
433
  name = 'rs/report/change_meter'
434
434
  } else if (type === '机表收费' || type === '机表收费撤销') {
435
435
  if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
@@ -321,7 +321,7 @@
321
321
  self.hasLimit = getLimit.data.hasLimit
322
322
  if (self.hasLimit) {
323
323
  if (getLimit.data.f_limit_value < 0) {
324
- self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
324
+ self.$showAlert(`${getLimit.data.msg}\n限购原因:${getLimit.data.limitMessage}`, 'warning', 3000)
325
325
  self.$dispatch('refresh')
326
326
  } else {
327
327
  self.maxgas = getLimit.data.f_limit_value
@@ -448,7 +448,7 @@
448
448
  self.maxmoney = 0
449
449
  self.limitmoney = true
450
450
  console.log(self.maxmoney, self.limitmoney)
451
- self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
451
+ self.$showAlert(`${getLimit.data.msg}\n限购原因:${getLimit.data.limitMessage}`, 'warning', 3000)
452
452
 
453
453
  // self.$dispatch('refresh')
454
454
  } else {
@@ -436,7 +436,7 @@
436
436
  self.maxmoney = 0
437
437
  self.limitmoney = true
438
438
  console.log(self.maxmoney, self.limitmoney)
439
- self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
439
+ self.$showAlert(`${getLimit.data.msg}\n限购原因:${getLimit.data.limitMessage}`, 'warning', 3000)
440
440
 
441
441
  // self.$dispatch('refresh')
442
442
  } else {
@@ -466,7 +466,7 @@ let asyncShowCardSellGas = async function (self) {
466
466
  if (self.hasLimit) {
467
467
  if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
468
468
  if (getLimit.data.f_limit_value < 0 && getLimit.data.f_limit_amount < 0) {
469
- self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
469
+ self.$showAlert(`${getLimit.data.msg}\n限购原因:${getLimit.data.limitMessage}`, 'warning', 3000)
470
470
  self.$dispatch('refresh')
471
471
  } else {
472
472
  if (getLimit.data.f_limit_value) {