From 6e8c65b52b7f71820a90ad64fcf3ccf5a78ce55e Mon Sep 17 00:00:00 2001 From: Niext <85552560@qq.com> Date: Fri, 22 Dec 2023 22:01:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5=E8=A1=A5?= =?UTF-8?q?=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/record/recordComDetailCard.vue | 3 +- mycomponents/scan/winScanItem.vue | 1 + pages/issue/record/issueRecord.vue | 9 +- .../coms/comRepleinshRequestPopup.vue | 281 ++++++++++++++++++ pages/repleinsh/record/repleinshRecord.vue | 233 ++++++++++----- 5 files changed, 448 insertions(+), 79 deletions(-) create mode 100644 pages/repleinsh/coms/comRepleinshRequestPopup.vue diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue index 3cc5b714..1f7349be 100644 --- a/mycomponents/record/recordComDetailCard.vue +++ b/mycomponents/record/recordComDetailCard.vue @@ -16,7 +16,7 @@ + :isShowPack="true" :isShowLocation="isShowLocation"> @@ -85,6 +85,7 @@ watch: { dataContent: { handler(newName, oldName) { + debugger; if (this.dataContent.subList.length > 0) { if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) { this.$nextTick(res => { diff --git a/mycomponents/scan/winScanItem.vue b/mycomponents/scan/winScanItem.vue index 6b459119..b95f52f9 100644 --- a/mycomponents/scan/winScanItem.vue +++ b/mycomponents/scan/winScanItem.vue @@ -32,6 +32,7 @@ components: { winComScan }, + emits: ["getScanCode"], props: { title: { type: String, diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue index 522375cc..9988b583 100644 --- a/pages/issue/record/issueRecord.vue +++ b/pages/issue/record/issueRecord.vue @@ -132,13 +132,12 @@ let request = that.requestList.find(r => r.itemCode == item.itemCode); if (request == undefined) { that.requestList.push(item); - this.getRecommendInfo(item); } else { this.$refs.comMessage.showQuestionMessage('已经存在零件[' + item.itemCode + ']的需求信息,是否要修改?', res => { if (res) { - + request.qty = item.qty; that.detailSource.forEach(detail => { let index = detail.Items.findIndex(r => { r.itemCode == item.itemCode @@ -161,15 +160,15 @@ if (res.data == null) { that.showMessage('未获取到推荐信息'); } else { - + if (res.data.length > 0) { that.workShopCode = item.workshopCode; res.data.forEach(r => { r.toLocationCode = item.rawLocationCode; r.productionLineCode = item.productionLineCode; r.workStationCode = item.workStationCode; - r.itemCode = item.itemCode; - r.uom = item.uom; + // r.itemCode = item.itemCode; + // r.uom = item.uom; that.subList.push(r); }) that.detailSource = getDataSource(that.detailSource, that.subList) diff --git a/pages/repleinsh/coms/comRepleinshRequestPopup.vue b/pages/repleinsh/coms/comRepleinshRequestPopup.vue new file mode 100644 index 00000000..6202f8c7 --- /dev/null +++ b/pages/repleinsh/coms/comRepleinshRequestPopup.vue @@ -0,0 +1,281 @@ + + + + + diff --git a/pages/repleinsh/record/repleinshRecord.vue b/pages/repleinsh/record/repleinshRecord.vue index 6241e262..5c5360dd 100644 --- a/pages/repleinsh/record/repleinshRecord.vue +++ b/pages/repleinsh/record/repleinshRecord.vue @@ -6,20 +6,20 @@ - + - - + + 目标库位:{{toLocation.toLocationCode}} + + + - + - - @@ -32,17 +32,21 @@ - + + + + + -