From 5fb0a0824c3c65f8733072efdacccb4afb5646ee Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 23 Sep 2024 09:36:54 +0800 Subject: [PATCH] =?UTF-8?q?HL-6004PDA=E7=AB=AF=E6=89=A7=E8=A1=8C=E5=AE=8C?= =?UTF-8?q?=E7=BF=BB=E5=8C=85=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E7=BF=BB=E5=8C=85=E6=A0=87=E7=AD=BE=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=BA=93=E4=BD=8D=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=BA=93=E4=BD=8D=E5=8F=96=E6=AD=A4=E7=BF=BB?= =?UTF-8?q?=E5=8C=85=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hybrid/html/point.html | 12 ++++---- src/pages/package/job/overPackageJob.vue | 2 +- .../package/job/overPackageJobDetail.vue | 4 +++ .../package/record/overPackageRecord.vue | 13 ++++---- src/pages/point/index.vue | 30 ++++++++++++++++++- 5 files changed, 47 insertions(+), 14 deletions(-) diff --git a/src/hybrid/html/point.html b/src/hybrid/html/point.html index 3f381dbf..05f8196f 100644 --- a/src/hybrid/html/point.html +++ b/src/hybrid/html/point.html @@ -50,15 +50,15 @@ border-right: 1px solid #b1b1b1; width: 60px; padding: 0px 5px; - height: 58px; - line-height: 58px; + height: 49px; + line-height: 49px; } .value { border-bottom: 1px solid #b1b1b1; border-right: 1px solid #b1b1b1; padding: 0px 5px; - height: 58px; + height: 49px; flex: 1; width: 0px; display: flex; @@ -73,15 +73,15 @@ .image { width: calc(100% - 1px); - height: 176px; + height: 149px; border-bottom: 1px solid #b1b1b1; border-top: 1px solid #b1b1b1; border-right: 1px solid #b1b1b1; } .image img { - width: 172px; - height: 172px; + width: 147px; + height: 147px; border: 1px solid #b1b1b1; /* width: calc(100% - 4px); height: calc(100% - 4px); */ diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue index 8bf8fee0..7a4cd225 100644 --- a/src/pages/package/job/overPackageJob.vue +++ b/src/pages/package/job/overPackageJob.vue @@ -393,7 +393,7 @@ } uni.navigateTo({ url: './overPackageJobDetail?id=' + result.masterId + '&status=' + result.status+'&title='+this.title+'&scanMessage=' + - scanMessage + scanMessage + '&fromLocationCode=' + result.fromLocationCode }); this.scanMessage="" } diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index 9248fdb7..a8cb6edd 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -146,6 +146,7 @@ title: option.title + '详情' }) this.id = option.id; + this.fromLocationCode = option.fromLocationCode; this.scanMessage = option.scanMessage || ''; if (this.id != undefined) { //新建的任务自动接收 @@ -617,6 +618,9 @@ showCommitSuccessMessage(hint, pointData) { this.$refs.comMessage.showSuccessMessage(hint, res => { if (pointData.length > 0) { + pointData.forEach(item=>{ + item.fromLocationCode = this.fromLocationCode + }) uni.redirectTo({ url: `/pages/point/index?points=${JSON.stringify(pointData)}` }); diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 88612def..0d00c030 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -137,11 +137,6 @@ winComScanBalance, // print }, - onLoad(option){ - uni.setNavigationBarTitle({ - title: option.title - }) - }, data() { return { id: '', @@ -168,7 +163,10 @@ // templateDeafult:{}//默认的模板 }; }, - onLoad() { + onLoad(option) { + uni.setNavigationBarTitle({ + title: option.title + }) this.getBusinessType(); // this.$nextTick(()=>{ @@ -539,6 +537,9 @@ this.toPackUnitShow ="请选择" this.toPackQty = "" if (pointData.length > 0) { + pointData.forEach(item=>{ + item.fromLocationCode = this.fromLocationCode + }) uni.navigateTo({ url: `/pages/point/index?points=${JSON.stringify(pointData)}` }); diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue index 5acc47bd..a4536b25 100644 --- a/src/pages/point/index.vue +++ b/src/pages/point/index.vue @@ -35,6 +35,10 @@ 数量 {{item.qty}} + + 来源库位 + {{item.fromLocationCode}} + @@ -58,6 +62,10 @@ 打印时间 {{item.printTimes}} + + + + @@ -159,8 +167,16 @@
数量
${item.qty}
+
` + if (item.fromLocationCode && item.fromLocationCode.length > 0) { + str += ` +
+
来源库位
+
${item.fromLocationCode}
- + ` + } + str += `
@@ -187,9 +203,20 @@
打印时间
${item.printTimes}
+ ` + if (item.fromLocationCode && item.fromLocationCode.length > 0) { + str += ` +
+
+
+
` + } + }) + + console.log('str',str) this.newHtmlContent = this.newHtmlContent.replace( "mainBody", str); //替换物品代码 }); @@ -255,6 +282,7 @@ // "qty": 90, // "printTimes": "2024-09-06+09:29:37", // "productionLineCode": null, +// "fromLocationCode": "C01-190-10", // "barcodeString": "HPQ;V1.0;B20240719;AASNS20240731-0002;Q90.000000;I250.832-02;L;PPN20240906-0000000001;S49000599;O49000599;L12;E;UPC;", // "barcodeBase64": "" // }