diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue index 3cd8e021..170b7a6f 100644 --- a/src/views/waybill/orderPackageList.vue +++ b/src/views/waybill/orderPackageList.vue @@ -63,14 +63,15 @@ @@ -503,14 +504,14 @@ const onLoad = async (params = {}) => { // 创建时间 if ( - getObjType(details.query.createTimeArr) === 'array' && - details.query.createTimeArr.length > 0 + getObjType(details.query.incomingTimeArr) === 'array' && + details.query.incomingTimeArr.length > 0 ) { - submitData.createTimeStartStr = details.query.createTimeArr[0]; - submitData.createTimeEndStr = details.query.createTimeArr[1]; + submitData.incomingTimeStartStr = details.query.incomingTimeArr[0]; + submitData.incomingTimeEndStr = details.query.incomingTimeArr[1]; } - delete submitData.createTimeArr; + delete submitData.incomingTimeArr; const res = await postFindOrderDetails(submitData); const { code, data } = res.data; if (code !== 200) return; diff --git a/src/views/waybill/orderPackageListDetails.vue b/src/views/waybill/orderPackageListDetails.vue index 70a747e4..8d90006e 100644 --- a/src/views/waybill/orderPackageListDetails.vue +++ b/src/views/waybill/orderPackageListDetails.vue @@ -861,11 +861,16 @@ const handleBatchBarcode = async () => { const res = await getShowAdvancePackgeCode(qr); - if (res.data.code !== 200) return; - details.popUpShow.QRCodeVisible = true; - console.log(res.data); details.html = ''; - details.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml); + const { code, data } = res.data; + if (code !== 200 || !data || getObjType(data.moldList) !== 'array') return; + if (data.moldList.length === 0) return; + + for (const iterator of data.moldList) { + details.html += iterator; + } + + details.popUpShow.QRCodeVisible = true; } catch (error) { console.log('error :>> ', error); } finally {