From f1e08fae2315f0825d1c78526e4cbfb12a83c403 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 7 Aug 2024 19:26:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8B=86=E5=8C=85=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/point/index.vue | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue index 8454d2ec..4e09cf6a 100644 --- a/src/pages/point/index.vue +++ b/src/pages/point/index.vue @@ -207,7 +207,7 @@ let fileReader = new plus.io.FileReader(); fileReader.onloadend = (evt) => { console.log("文件路径" + evt.target.result) - this.data[index].barcodeBase64 = evt.target.result + // this.data[index].barcodeBase64 = evt.target.result this.generateBase64(index + 1) } fileReader.readAsDataURL(file); @@ -255,6 +255,31 @@ this.originData = JSON.parse(option.points); } this.data = this.originData + this.$nextTick(async () => { + // 获取二维码图片临时路径 + const el = this.$refs['qrcodeRef'] + let str = '' + el.forEach(async (item, index) => { + await item.canvasToTempFilePath({ + success: async (res) => { + // 将临时路径转换成base64 + await pathToBase64(res.tempFilePath).then(base64 => { + this.data[index].barcodeBase64 = base64 + if (index == el.length - 1) { + this.isLoadFinish = true + } + }).catch(err => { + console.log(err); + }) + }, + fail(err) { + console.log('err:::', err) + } + }) + + }) + + }) }, } From 164325490aff9c06ad4f391f0dc63890dd50aca7 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 7 Aug 2024 19:59:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/repleinsh/job/repleinshDetail.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index a0a0c25d..fabc2fed 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -278,7 +278,6 @@ }); var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - return; repleinshJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { From 51dfc46bd43f54c848969da3123c2dc35e0bb510 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 7 Aug 2024 21:05:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4=E6=A0=A1=E9=AA=8C=EF=BC=8C?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8F=90=E4=BA=A4=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/show-modal/show-modal.vue | 4 +++- src/mycomponents/common/comMessage.vue | 4 +++- src/pages/productReceipt/job/ccProductReceiptDetail.vue | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/show-modal/show-modal.vue b/src/components/show-modal/show-modal.vue index b9dd4784..38d55460 100644 --- a/src/components/show-modal/show-modal.vue +++ b/src/components/show-modal/show-modal.vue @@ -82,7 +82,9 @@ cancelClose() { clearInterval(this.timer) //清空timer - this.$refs.modal.popupClose(); + if(this.$refs.modal){ + this.$refs.modal.popupClose(); + } this.success({ // cancel: true, confirm: false, diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue index e9beb857..bc82cdc0 100644 --- a/src/mycomponents/common/comMessage.vue +++ b/src/mycomponents/common/comMessage.vue @@ -109,7 +109,9 @@ if (this.show) { this.show = false; clearInterval(this.timer) //清空timer - this.$refs.modal.popupClose(); + if(this.$refs.modal){ + this.$refs.modal.popupClose(); + } this.success({ // cancel: false, confirm: true, diff --git a/src/pages/productReceipt/job/ccProductReceiptDetail.vue b/src/pages/productReceipt/job/ccProductReceiptDetail.vue index 08738d74..e69f7fb3 100644 --- a/src/pages/productReceipt/job/ccProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/ccProductReceiptDetail.vue @@ -346,6 +346,8 @@ if (!this.checkLocation()) { return } + }else{ + this.toLocationCode = this.jobToLocationCode } From 282ffac8ffe3adbff4615b39486be1d1e4a154e6 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 7 Aug 2024 22:21:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/point/index.vue | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue index 4e09cf6a..8454d2ec 100644 --- a/src/pages/point/index.vue +++ b/src/pages/point/index.vue @@ -207,7 +207,7 @@ let fileReader = new plus.io.FileReader(); fileReader.onloadend = (evt) => { console.log("文件路径" + evt.target.result) - // this.data[index].barcodeBase64 = evt.target.result + this.data[index].barcodeBase64 = evt.target.result this.generateBase64(index + 1) } fileReader.readAsDataURL(file); @@ -255,31 +255,6 @@ this.originData = JSON.parse(option.points); } this.data = this.originData - this.$nextTick(async () => { - // 获取二维码图片临时路径 - const el = this.$refs['qrcodeRef'] - let str = '' - el.forEach(async (item, index) => { - await item.canvasToTempFilePath({ - success: async (res) => { - // 将临时路径转换成base64 - await pathToBase64(res.tempFilePath).then(base64 => { - this.data[index].barcodeBase64 = base64 - if (index == el.length - 1) { - this.isLoadFinish = true - } - }).catch(err => { - console.log(err); - }) - }, - fail(err) { - console.log('err:::', err) - } - }) - - }) - - }) }, } From c51559a5a7ea90495be9e3081c5819a58f3ce24b Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 7 Aug 2024 22:28:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E9=BB=98=E8=AE=A4=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/productReceipt/job/fgProductReceiptDetail.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 9e4331c5..7437bf12 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -448,6 +448,8 @@ if (!this.checkLocation()) { return } + }else{ + this.toLocationCode = this.jobToLocationCode } this.detailSource.forEach(item => { item.subList.forEach(subitem => {