From c21b64da1c5a7124a6a6aeb513526eec336b604c Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Fri, 7 Jan 2022 17:58:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E9=80=80=E6=89=AB?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/lang/cn.ts | 4 +
src/i18n/lang/en.ts | 4 +
src/pages.json | 8 ++
.../product/outbound/stoOutbound/Back.vue | 118 ++++++++++++++++++
.../outbound/stoOutbound/DN-delivergoods.vue | 18 ++-
.../product/outbound/stoOutbound/model.ts | 2 +-
src/utils/page.ts | 1 +
7 files changed, 152 insertions(+), 3 deletions(-)
create mode 100644 src/pages/product/outbound/stoOutbound/Back.vue
diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index db4a262..895baae 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -53,6 +53,7 @@ export default {
rawMenu_ReturnGoods: '退货',
rawMenu_SignOut: '退出',
Purchase: '采购单',
+ BackSweep: '退扫',
//po收货
po_ReceivingGoods: 'PO收货',
@@ -91,6 +92,8 @@ export default {
//dn收货
dn_ReceivingGoods: 'DN收货',
dn_OddNumbers: 'DN单号',
+ QuantityReturned: '已退数量',
+ SweptQuantity: '已扫数量',
dn_PleaseScan: '请扫描DN单号',
barcode_PleaseScan: '请扫描条码',
dn_CarNumber: '车牌号',
@@ -323,6 +326,7 @@ export default {
product_Location: '库位',
LocationScanned: '库位已扫',
product_barCode: '条码',
+ sweepBarCode: '成品条码',
barcode: '请输入条码',
product_TransferCar: '周转车',
product_MaterialCode: '物料条码',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index f402f62..163bcf2 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -275,6 +275,8 @@ export default {
//移库
Warehouse_QueryCriteria: 'Query criteria',
Warehouse_TransferOrderNo: 'Transfer order No',
+ BackSweep: 'Back sweep',
+ SweptQuantity: 'Swept quantity',
LocationInventory: 'Location inventory',
Warehouse_TransferDetails: 'Transfer detail',
Warehouse_OrderNo: 'Order No',
@@ -333,6 +335,8 @@ export default {
//成品下线
product_Location: 'Loc',
product_barCode: 'Barcode',
+ sweepBarCode: 'Barcode',
+ QuantityReturned: 'Quantity returned',
product_TransferCar: 'Transfer vehicle',
product_MaterialCode: 'MAT code',
product_FGCode: 'FG code',
diff --git a/src/pages.json b/src/pages.json
index dff19dd..033bd6b 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -41,6 +41,14 @@
"navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
}
},
+ {
+ "path": "pages/product/outbound/stoOutbound/Back",
+ "style": {
+ "navigationBarTitleText": "退扫",
+ "navigationStyle": "custom", // 隐藏系统导航栏
+ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
+ }
+ },
{
"path": "pages/product/outbound/index",
"style": {
diff --git a/src/pages/product/outbound/stoOutbound/Back.vue b/src/pages/product/outbound/stoOutbound/Back.vue
new file mode 100644
index 0000000..a9a1600
--- /dev/null
+++ b/src/pages/product/outbound/stoOutbound/Back.vue
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('message.po_Return') }}
+
+
+ {{ $t('message.BackSweep') }}
+
+
+
+
+
+
+
+
diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
index 0dc84d8..8b34dc6 100644
--- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
+++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
@@ -55,14 +55,17 @@
-
+
{{ $t('message.detailed') }}
+
+ {{ $t('message.BackSweep') }}
+
-
+
{{ $t('message.po_Deliver') }}
@@ -172,6 +175,17 @@ export default class stoOutboundDom extends BasePage {
await this.model.queryDetailed(this.form.orderNo);
this.toPage(this.page.product.outbound.stoOutboundDetail);
}
+ BackSweep() {
+ if (!this.form.orderNo) {
+ uni.showToast({
+ icon: 'none',
+ title: this.$t('message.Commission_tips1') as any,
+ });
+ return;
+ }
+ sessionStorage.setItem('SweepCode', JSON.stringify(this.form.orderNo));
+ this.toPage(this.page.product.outbound.Back);
+ }
async query() {
if (!this.form.orderNo) {
uni.showToast({
diff --git a/src/pages/product/outbound/stoOutbound/model.ts b/src/pages/product/outbound/stoOutbound/model.ts
index 281bb76..5a76cc9 100644
--- a/src/pages/product/outbound/stoOutbound/model.ts
+++ b/src/pages/product/outbound/stoOutbound/model.ts
@@ -186,7 +186,7 @@ export class ReturningModule extends VuexModule {
});
console.log('res数据', data, code);
const materielList = data;
- console.log(">>>>>>>",materielList);
+ console.log('>>>>>>>', materielList);
return { code, materielList };
}
}
diff --git a/src/utils/page.ts b/src/utils/page.ts
index d9a8aeb..6484410 100644
--- a/src/utils/page.ts
+++ b/src/utils/page.ts
@@ -30,6 +30,7 @@ export const page = {
foreign: '/pages/product/outbound/foreign/index',
stoOutbound: '/pages/product/outbound/stoOutbound/index',
delivergoods: '/pages/product/outbound/stoOutbound/DN-delivergoods',
+ Back: '/pages/product/outbound/stoOutbound/Back',
stoOutboundDetail: '/pages/product/outbound/stoOutbound/detail',
},
warehouse: {