diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 4b97aef..56a1905 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -62,6 +62,7 @@ export default {
succeeded: '退扫成功',
//jpicker提示
unselected: '未选中',
+ scanning: '扫描',
//po收货
po_ReceivingGoods: 'PO收货',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 7dff6b7..d1f2e3e 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -70,6 +70,7 @@ export default {
rawMenu_InTheLibrary: 'RAW WH',
rawMenu_ReturnGoods: 'Return',
rawMenu_SignOut: 'Sign out',
+ scanning: 'Scan',
//po收货
po_ReceivingGoods: 'PO receive',
po_ReturnGoods: 'DN return',
diff --git a/src/pages/product/warehouse/wholeCollect/index.vue b/src/pages/product/warehouse/wholeCollect/index.vue
index 2f73619..9b80a21 100644
--- a/src/pages/product/warehouse/wholeCollect/index.vue
+++ b/src/pages/product/warehouse/wholeCollect/index.vue
@@ -53,7 +53,7 @@
{{ $t('message.detailed') }}
- {{ $t('message.InventoryFinish') }}
+ {{ $t('message.scanning') }}
{{ $t('message.closure') }}
@@ -141,7 +141,7 @@ export default class ProductCheckReceipt extends BasePage {
this.customToast(this.$t('message.barcode') as string);
return;
}
- if (this.Some.actualQty > this.Some.qty) {
+ if (this.Some.actualQty >= this.Some.qty) {
this.customToast(this.$t('message.barcode') as string);
return;
}
@@ -154,8 +154,13 @@ export default class ProductCheckReceipt extends BasePage {
};
await this.model.getProductCode(params);
if (this.model.code == '1') {
- this.customToast(this.$t('message.product_Tip8') as string);
- this.Some.actualQty += 1;
+ //this.customToast(this.$t('message.product_Tip8') as string);
+ uni.showToast({
+ icon: 'success',
+ title: this.$t('message.product_Tip8') as string,
+ });
+ //this.Some.actualQty += 1;
+ this.onSubmit();
}
}
//确定
@@ -226,11 +231,11 @@ export default class ProductCheckReceipt extends BasePage {
icon: 'success',
title: this.$t('message.success') as string,
});
- this.Some = {};
- this.Some.fileNo = ' ';
- this.wl = {};
- this.form.order3 = '';
- this.form.barcode = '';
+ // this.Some = {};
+ // this.Some.fileNo = ' ';
+ // this.wl = {};
+ // this.form.order3 = '';
+ // this.form.barcode = '';
}
}
//查询明细
diff --git a/src/pages/product/warehouse/wholeScrap/index.vue b/src/pages/product/warehouse/wholeScrap/index.vue
index 3ad359e..8d85297 100644
--- a/src/pages/product/warehouse/wholeScrap/index.vue
+++ b/src/pages/product/warehouse/wholeScrap/index.vue
@@ -62,7 +62,7 @@
{{ $t('message.detailed') }}
- {{ $t('message.InventoryFinish') }}
+ {{ $t('message.scanning') }}
{{ $t('message.closure') }}
@@ -124,7 +124,7 @@ export default class productCheckReceipt extends BasePage {
this.customToast(this.$t('message.barcode') as string);
return;
}
- if (this.Some.actualQty > this.Some.qty) {
+ if (this.Some.actualQty >= this.Some.qty) {
this.customToast(this.$t('message.barcode') as string);
return;
}
@@ -253,11 +253,11 @@ export default class productCheckReceipt extends BasePage {
icon: 'success',
title: this.$t('message.success') as string,
});
- this.Some = {};
- this.Some.fileNo = ' ';
- this.wl = {};
- this.form.order3 = '';
- this.form.barcode = '';
+ // this.Some = {};
+ // this.Some.fileNo = ' ';
+ // this.wl = {};
+ // this.form.order3 = '';
+ // this.form.barcode = '';
}
}
//查询明细