sale-client 3.6.298 → 3.6.300
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
|
@@ -360,6 +360,7 @@ let cardBtnGen = async function (self, val) {
|
|
|
360
360
|
orderitem: `${self.orderitem} Desc`
|
|
361
361
|
}
|
|
362
362
|
}, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
|
|
363
|
+
self.cardInfo.CardID = getUser.data[0].f_card_id
|
|
363
364
|
} else {
|
|
364
365
|
// 获取用户信息
|
|
365
366
|
getUser = await self.$resetpost('rs/sql/sale_getUser', {
|
|
@@ -428,6 +429,7 @@ let cardBtnGen = async function (self, val) {
|
|
|
428
429
|
orderitem: `${self.orderitem} Desc`
|
|
429
430
|
}
|
|
430
431
|
}, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
|
|
432
|
+
self.cardInfo.CardID = getUser.data[0].f_card_id
|
|
431
433
|
} else {
|
|
432
434
|
// 获取用户信息
|
|
433
435
|
getUser = await self.$resetpost('rs/sql/sale_getUser', {
|
|
@@ -448,7 +450,7 @@ let cardBtnGen = async function (self, val) {
|
|
|
448
450
|
// 验证卡上信息和获取的用户信息
|
|
449
451
|
if (self.cardInfo.CardID != getUser.data[0].f_card_id || self.cardInfo.Factory != getUser.data[0].f_alias) {
|
|
450
452
|
self.$showAlert(`此时的卡片信息和用户信息不匹配，请核实后在进行读卡。卡上信息: 卡号-${self.cardInfo.CardID},厂家-${self.cardInfo.Factory}。
|
|
451
|
-
|
|
453
|
+
用户信息: 卡号-${getUser.data[0].f_card_id},厂家-${getUser.data[0].f_alias}`, 'warning', 5000)
|
|
452
454
|
return
|
|
453
455
|
}
|
|
454
456
|
self.model.state = '正确'
|
|
@@ -535,6 +537,7 @@ let cardBtnGen = async function (self, val) {
|
|
|
535
537
|
orderitem: `${self.orderitem} Desc`
|
|
536
538
|
}
|
|
537
539
|
}, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
|
|
540
|
+
self.cardInfo.CardID = getUser.data[0].f_card_id
|
|
538
541
|
} else {
|
|
539
542
|
// 获取用户信息
|
|
540
543
|
getUser = await self.$resetpost('rs/sql/sale_getUser', {
|