sale-client 3.6.334 → 3.6.335
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
|
@@ -966,6 +966,12 @@ let loadParamGem = async function (self) {
|
|
|
966
966
|
this.rows = this.model.rows
|
|
967
967
|
}
|
|
968
968
|
},
|
|
969
|
+
batchMeterShow () {
|
|
970
|
+
if (this.batchMeterShow == false) {
|
|
971
|
+
// 将选的文件清空
|
|
972
|
+
this.$refs.file.$el.querySelector('input').value = ''
|
|
973
|
+
}
|
|
974
|
+
},
|
|
969
975
|
'f_filialeid' (val) {
|
|
970
976
|
loadParamGem(this)
|
|
971
977
|
}
|
|
@@ -1604,6 +1604,7 @@ let marginGen = async function (model, row) {
|
|
|
1604
1604
|
if (JSON.parse(cardState.data).state === 1) {
|
|
1605
1605
|
// 将卡上次数写入数据库
|
|
1606
1606
|
if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_hascard === '是' && row.f_share_times === '是') {
|
|
1607
|
+
row.cardInfo.Times = row.cardInfo.Times ? row.cardInfo.Times : row.f_times
|
|
1607
1608
|
model.f_times = row.f_times + 1
|
|
1608
1609
|
} else {
|
|
1609
1610
|
model.f_times = row.cardInfo.Times + 1
|
|
@@ -1800,6 +1801,7 @@ let sellgasGen = async function (model, row) {
|
|
|
1800
1801
|
if (JSON.parse(cardState.data).state === 1) {
|
|
1801
1802
|
// 将卡上次数写入数据库
|
|
1802
1803
|
if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_hascard === '是' && row.f_share_times === '是') {
|
|
1804
|
+
row.cardInfo.Times = row.cardInfo.Times ? row.cardInfo.Times : row.f_times
|
|
1803
1805
|
model.f_times = row.f_times + 1
|
|
1804
1806
|
} else {
|
|
1805
1807
|
model.f_times = row.cardInfo.Times + 1
|