diff --git a/src/pages.json b/src/pages.json
index ad1c54c..d3be8c2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1058,6 +1058,14 @@
"navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
}
},
+ {
+ "path": "pages/raw/handover/feeding/RUS-Local-details",
+ "style": {
+ "navigationBarTitleText": "俄罗斯明细",
+ "navigationStyle": "custom", // 隐藏系统导航栏
+ "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
+ }
+ },
{
"path": "pages/raw/handover/RUS-picking/index",
"style": {
diff --git a/src/pages/login/area/config.ts b/src/pages/login/area/config.ts
index c2090db..f05304f 100644
--- a/src/pages/login/area/config.ts
+++ b/src/pages/login/area/config.ts
@@ -16,12 +16,12 @@ export const headers = [
{
label: vm.$t('message.workArea_RegionName'),
key: 'regionDesc',
- width: 200,
+ width: 300,
},
{
label: vm.$t('message.workArea_WorkAreaName'),
key: 'workareaName',
- width: 200,
+ width: 350,
},
{
label: vm.$t('message.workArea_WarehouseClassify'),
diff --git a/src/pages/raw/commission/RUS-Out/config.ts b/src/pages/raw/commission/RUS-Out/config.ts
index 24a85df..d29f0cb 100644
--- a/src/pages/raw/commission/RUS-Out/config.ts
+++ b/src/pages/raw/commission/RUS-Out/config.ts
@@ -60,4 +60,9 @@ export const detailHeader = [
key: 'nowAmount',
width: 186,
},
+ {
+ label: vm.$t('message.Container'),
+ key: 'barCode',
+ width: 400,
+ },
];
diff --git a/src/pages/raw/commission/RUS-Out/index.vue b/src/pages/raw/commission/RUS-Out/index.vue
index 93f727b..bf4d7b4 100644
--- a/src/pages/raw/commission/RUS-Out/index.vue
+++ b/src/pages/raw/commission/RUS-Out/index.vue
@@ -43,6 +43,16 @@
+
+
+
+ {{ $t('message.Container') }}:
+
+
+
+ {{ $t('message.product_add') }}
+
+
@@ -54,16 +64,6 @@
-
-
-
- {{ $t('message.Container') }}:
-
-
-
- {{ $t('message.product_add') }}
-
-
+
+
+
+ {{ $t('message.Container') }}:
+
+
+
+ {{ $t('message.product_add') }}
+
+
@@ -62,16 +72,6 @@
-
-
-
- {{ $t('message.Container') }}:
-
-
-
- {{ $t('message.product_add') }}
-
-
+
+
+ {{ $t('message.Container') }}:
+
+
+
+ {{ $t('message.product_add') }}
+
+
@@ -66,16 +76,6 @@
-
-
-
- {{ $t('message.Container') }}:
-
-
-
- {{ $t('message.product_add') }}
-
-
+
+
+ {{ $t('message.Container') }}:
+
+
+
+ {{ $t('message.product_add') }}
+
+
@@ -79,16 +89,6 @@
-
-
-
- {{ $t('message.Container') }}:
-
-
-
- {{ $t('message.product_add') }}
-
-
-
+
@@ -126,6 +126,7 @@ export default class KanDanHandOver extends BasePage {
}
});
}
+ total = 0;
async searchBarcode() {
if (this.Barcode == '') {
this.customToast(this.$t('message.barcode') as string);
@@ -138,6 +139,11 @@ export default class KanDanHandOver extends BasePage {
};
await this.model.searchBarcode(params);
this.Container = this.model.ContainerCode;
+ if (this.Container.cpRef4 == null) {
+ this.total = this.Container.qty;
+ } else {
+ this.total = this.Container.qty - this.Container.cpRef4;
+ }
}
Add() {
if (this.Container == '' || !this.Container.barcode) {
@@ -157,11 +163,12 @@ export default class KanDanHandOver extends BasePage {
this.SubmitOrderlist[this.SubmitOrderlist.length - 1].keepBy = session.loginName;
this.SubmitOrderlist[this.SubmitOrderlist.length - 1].orderType = '0';
this.SubmitOrderlist[this.SubmitOrderlist.length - 1].barCode = this.Container.barcode;
- if (this.Container.cpRef4 == null) {
- this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = parseFloat(this.Container.qty);
- } else {
- this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4);
- }
+ this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = this.total;
+ // if (this.Container.cpRef4 == null) {
+ // this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = parseFloat(this.Container.qty);
+ // } else {
+ // this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4);
+ // }
this.model.materielList[this.orderlistIndex].actualQty += parseFloat(this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty);
this.Barcode = '';
this.Container = '';
@@ -203,6 +210,7 @@ export default class KanDanHandOver extends BasePage {
this.SubmitOrderlist = [];
this.Barcode = '';
this.Container = '';
+ this.total = 0;
this.query();
}
}
diff --git a/src/utils/page.ts b/src/utils/page.ts
index ccd27ed..16037a7 100644
--- a/src/utils/page.ts
+++ b/src/utils/page.ts
@@ -101,6 +101,7 @@ export const page = {
detail: '/pages/raw/handover/feeding/detail',
Location: '/pages/raw/handover/feeding/Location',
Local: '/pages/raw/handover/feeding/Local-details',
+ RUSLocal: '/pages/raw/handover/feeding/RUS-Local-details',
},
returning: {
index: '/pages/raw/handover/returning/index',