sale-client 3.6.494 → 3.6.496

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.494",
3
+ "version": "3.6.496",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -228,9 +228,9 @@
228
228
  this.row.id = row.id
229
229
  this.row.f_type = row.f_type
230
230
  this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
231
- if (!this.row.f_taxpayer_id) {
232
- this.row.f_taxpayer_id = this.row.f_idnumber
233
- }
231
+ // if (!this.row.f_taxpayer_id) {
232
+ // this.row.f_taxpayer_id = this.row.f_idnumber
233
+ // }
234
234
  if (!this.row.f_paper_name) {
235
235
  this.row.f_paper_name = this.row.f_user_name
236
236
  }
@@ -265,9 +265,9 @@
265
265
  }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
266
266
  this.row = row.data[0]
267
267
  this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
268
- if (!this.row.f_taxpayer_id) {
269
- this.row.f_taxpayer_id = this.row.f_idnumber
270
- }
268
+ // if (!this.row.f_taxpayer_id) {
269
+ // this.row.f_taxpayer_id = this.row.f_idnumber
270
+ // }
271
271
  if (!this.row.f_paper_name) {
272
272
  this.row.f_paper_name = this.row.f_user_name
273
273
  }
@@ -477,9 +477,12 @@
477
477
  self.hasLimit = getLimit.data.hasLimit
478
478
  if (self.hasLimit) {
479
479
  if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
480
- if (getLimit.data.f_limit_value < 0 && getLimit.data.f_limit_amount < 0) {
480
+ if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
481
+ self.maxmoney = 0
482
+ self.limitmoney = true
483
+ console.log(self.maxmoney, self.limitmoney)
481
484
  self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
482
- self.$dispatch('refresh')
485
+ // self.$dispatch('refresh')
483
486
  } else {
484
487
  if (getLimit.data.f_limit_value) {
485
488
  self.maxgas = (getLimit.data.f_limit_value - 0)
@@ -425,9 +425,12 @@
425
425
  self.hasLimit = getLimit.data.hasLimit
426
426
  if (self.hasLimit) {
427
427
  if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
428
- if (getLimit.data.f_limit_value < 0 && getLimit.data.f_limit_amount < 0) {
428
+ if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
429
+ self.maxmoney = 0
430
+ self.limitmoney = true
431
+ console.log(self.maxmoney, self.limitmoney)
429
432
  self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
430
- self.$dispatch('refresh')
433
+ // self.$dispatch('refresh')
431
434
  } else {
432
435
  if (getLimit.data.f_limit_value) {
433
436
  self.maxgas = (getLimit.data.f_limit_value - 0)
@@ -299,9 +299,12 @@ let asyncCardMeterCenter = async function (self) {
299
299
  self.hasLimit = getLimit.data.hasLimit
300
300
  if (self.hasLimit) {
301
301
  if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
302
- if (getLimit.data.f_limit_value < 0 && getLimit.data.f_limit_amount < 0) {
302
+ if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
303
+ self.maxmoney = 0
304
+ self.limitmoney = true
305
+ console.log(self.maxmoney, self.limitmoney)
303
306
  self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
304
- self.$dispatch('refresh')
307
+ // self.$dispatch('refresh')
305
308
  } else {
306
309
  if (getLimit.data.f_limit_value) {
307
310
  self.maxgas = (getLimit.data.f_limit_value - 0)