Browse Source

修复部分bug

dev-xx
qb 7 months ago
parent
commit
3e5f9e6b8a
  1. 17
      src/views/waybill/orderPackageList.vue
  2. 13
      src/views/waybill/orderPackageListDetails.vue

17
src/views/waybill/orderPackageList.vue

@ -63,14 +63,15 @@
<el-form-item label="创建时间">
<el-date-picker
v-model="query.createTimeArr"
type="daterange"
v-model="query.incomingTimeArr"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
value-format="YYYY-MM-DD HH:mm:ss"
:default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]"
clearable
/>
</el-form-item>
@ -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;

13
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 {

Loading…
Cancel
Save