From 79102ab4846f211031a1d236bdd040a591c569d9 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 30 Jul 2024 15:50:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9B=B6=E6=8B=85=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artery/truckLoadingDetails.vue | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue index 9b963a0b..f67c554a 100644 --- a/src/views/distribution/artery/truckLoadingDetails.vue +++ b/src/views/distribution/artery/truckLoadingDetails.vue @@ -1196,13 +1196,17 @@ const printOrder = async ({ row }) => { orderPackageCodes: row.scanCode, }; + details.html = ''; const res = await getShowAdvancePackgeCode(qr); - if (res.data.code !== 200) return; + const { code, data } = res.data; + + if (code !== 200 || getObjType(data.moldList) !== 'array') return; + + for (let i = 0; i < data.moldList.length; i++) { + details.html += data.moldList[i]; + } details.popUpShow.QRCodeVisible = true; - console.log(res.data); - details.html = ''; - details.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml); } catch (error) { console.log('error :>> ', error); } finally { @@ -1219,13 +1223,15 @@ const printOrderByZero = async ({ row }) => { orderCodes: row.orderCode, }; + details.html = ''; const res = await postShowOrderCodeByCode(ids); + const { code, data } = res.data; + if (code !== 200 || getObjType(data.moldList) !== 'array') return; - if (res.data.code !== 200) return; + for (let i = 0; i < data.moldList.length; i++) { + details.html += data.moldList[i]; + } details.popUpShow.QRCodeVisible = true; - console.log(res.data); - details.html = ''; - details.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml); } catch (error) { console.log('error :>> ', error); } finally { @@ -1263,20 +1269,24 @@ const handleBatchBarcode = async () => { orderPackageCodes: _arr.map(val => val.scanCode).join(','), }).then(res => { const { code, data } = res.data; - if (code !== 200) return; + if (code !== 200 || getObjType(data.moldList) !== 'array') return; - details.html += getHtmls(data.dataList, data.templateHtml); + for (let i = 0; i < data.moldList.length; i++) { + details.html += data.moldList[i]; + } }) ); _zeroArr.length > 0 && _promiseArr.push( - postShowOrderCode({ + postShowOrderCodeByCode({ orderCodes: _zeroArr.map(val => val.orderCode).join(','), }).then(res => { const { code, data } = res.data; - if (code !== 200) return; + if (code !== 200 || getObjType(data.moldList) !== 'array') return; - details.html += getHtmls(data.dataList, data.templateHtml); + for (let i = 0; i < data.moldList.length; i++) { + details.html += data.moldList[i]; + } }) );