From ad1f917aae0c6effa320aeb27d8ed7234114f664 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sat, 11 May 2024 14:42:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E6=89=AB=E6=8F=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/jobList/jobList.vue | 68 +
src/mycomponents/scan/winScanPackJob.vue | 128 ++
.../job/productPutawayDetail.vue | 1045 +++++++-------
.../productPutaway/job/productPutawayJob.vue | 691 +++++----
.../job/fgProductReceiptDetail.vue | 951 +++++++------
.../job/productReceiptDetail.vue | 972 ++++++-------
.../productReceipt/job/productReceiptJob.vue | 729 +++++-----
.../purchaseReceipt/job/receiptDetail.vue | 1260 +++++++++--------
src/pages/purchaseReceipt/job/receiptJob.vue | 708 ++++-----
src/pages/putaway/job/putawayDetail.vue | 5 +-
src/pages/putaway/job/putawayJob.vue | 71 +
11 files changed, 3566 insertions(+), 3062 deletions(-)
create mode 100644 src/mycomponents/jobList/jobList.vue
create mode 100644 src/mycomponents/scan/winScanPackJob.vue
diff --git a/src/mycomponents/jobList/jobList.vue b/src/mycomponents/jobList/jobList.vue
new file mode 100644
index 00000000..194edf9c
--- /dev/null
+++ b/src/mycomponents/jobList/jobList.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+ Go
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/mycomponents/scan/winScanPackJob.vue b/src/mycomponents/scan/winScanPackJob.vue
new file mode 100644
index 00000000..5bd04fbd
--- /dev/null
+++ b/src/mycomponents/scan/winScanPackJob.vue
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 6fb00480..0ae80cc1 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -1,520 +1,527 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index 93010b71..c2c69de1 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -1,313 +1,380 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index 189d5326..3498e005 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -1,472 +1,481 @@
-
-
-
-
-
-
-
-
-
- 车间
-
- {{jobContent.workShopCode}}
-
-
-
- 生产线
-
- {{item.subList[0].productionLineCode}}
-
-
-
- 班组
-
- {{jobContent.team}}
-
-
-
- 班次
-
- {{jobContent.shift}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index bb21bdb2..13bf47a5 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -1,483 +1,491 @@
-
-
-
-
-
-
-
-
-
-
- 车间
-
- {{jobContent.workShopCode}}
-
-
-
- 生产线
-
- {{item.subList[0].productionLineCode}}
-
-
-
- 班组
-
- {{jobContent.team}}
-
-
-
- 班次
-
- {{jobContent.shift}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 5e05d1ff..f42c5995 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -1,337 +1,404 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index e6da59a5..375ee95d 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -1,627 +1,635 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 73ca3f5a..f10d7112 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -1,321 +1,389 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index edfca2e1..312c60f2 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -107,11 +107,13 @@
toLocationAreaTypeList: [],
jobStatus: "",
jobToLocationCode: "",
- isCheckLocation: false
+ isCheckLocation: false,
+ scanedPackingNumber : ''
};
},
onLoad(option) {
this.id = option.id;
+ this.scanedPackingNumber = option.scaned || '';
if (this.id != undefined) {
//新建的任务自动接收
if (option.status == "1") {
@@ -188,6 +190,7 @@
that.detailSource.forEach(r => {
r.subList.forEach(s => {
+ if(this.scanedPackingNumber&&this.scanedPackingNumber==s.packingNumber) s.scaned = true
s.inventoryStatus = s.inspectResult;//更新检验结果状态
})
})
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 1c52bbdc..b60e1633 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -22,11 +22,18 @@
+
+
+
+
+
+