diff --git a/src/views/reportforms/DeliveryCustomers.vue b/src/views/reportforms/DeliveryCustomers.vue index 5695125f..b8bab8f5 100644 --- a/src/views/reportforms/DeliveryCustomers.vue +++ b/src/views/reportforms/DeliveryCustomers.vue @@ -334,7 +334,7 @@ const selectionChange = list => { // 网页顶部搜索按钮 const searchChange = () => { // 日期处理 - if (TopQuery.value.time.length) { + if (TopQuery.value.time?.length) { queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期 queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期 } else { @@ -342,7 +342,7 @@ const searchChange = () => { delete queryCarn.value.endTaskTime; } // 仓库处理 - if (TopQuery.value.warehouseNameRange.length) { + if (TopQuery.value.warehouseNameRange?.length) { queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(','); } else { delete queryCarn.value.warehouseNameRange; diff --git a/src/views/reportforms/DeliveryDetails.vue b/src/views/reportforms/DeliveryDetails.vue index 257bc56e..90e47bf9 100644 --- a/src/views/reportforms/DeliveryDetails.vue +++ b/src/views/reportforms/DeliveryDetails.vue @@ -361,7 +361,7 @@ const searchReset = () => { // 网页顶部搜索按钮 const searchChange = () => { // 日期处理 - if (TopQuery.value.time.length) { + if (TopQuery.value.time?.length) { queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期 queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期 } else { @@ -369,7 +369,7 @@ const searchChange = () => { delete queryCarn.value.endTaskTime; } // 仓库处理 - if (TopQuery.value.warehouseNameRange.length) { + if (TopQuery.value.warehouseNameRange?.length) { queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(','); } else { delete queryCarn.value.warehouseNameRange; diff --git a/src/views/reportforms/DeliveryTrainNumber.vue b/src/views/reportforms/DeliveryTrainNumber.vue index eebb9e56..f37996b0 100644 --- a/src/views/reportforms/DeliveryTrainNumber.vue +++ b/src/views/reportforms/DeliveryTrainNumber.vue @@ -335,7 +335,7 @@ const selectionChange = list => { // 网页顶部搜索按钮 const searchChange = () => { // 日期处理 - if (TopQuery.value.time.length) { + if (TopQuery.value.time?.length) { queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期 queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期 } else { @@ -429,26 +429,25 @@ function updateDictionary(targetArray, dictionaryType) { // 页面初始化方法 const onLoad = () => { warehouseList.value = []; - columnList.find(res => res.label == '配送类型').checkarr = []; columnList.find(res => res.label == '配送类型').checkarr = DeliveryTypeList.value; columnList.find(res => res.label == '配送种类').checkarr = []; columnList.find(res => res.label == '配送种类').checkarr = DeliverygenericList.value; columnList.find(res => res.label == '仓库').checkarr = []; columnList.find(res => res.label == '仓库').checkarr = warehouseList.value; - console.log(columnList, 'columnList'); // 获取仓库 - $_getMyWarehouseList().then(res => { console.log(res, '仓库列表'); - if (res.data.data.length) + if (res.data.data.length){ res.data.data.forEach(item => { warehouseList.value.push({ value: item.name, label: item.name, }); }); + } + }); }; onLoad(); diff --git a/src/views/reportforms/Inventory.vue b/src/views/reportforms/Inventory.vue index 88f98b2a..f2b2da1b 100644 --- a/src/views/reportforms/Inventory.vue +++ b/src/views/reportforms/Inventory.vue @@ -329,7 +329,7 @@ const selectionChange = list => { const searchChange = () => { console.log(TopQuery.value, 'TopQuery.value'); // 仓库处理 - if (TopQuery.value.warehouseNameRange.length) { + if (TopQuery.value.warehouseNameRange?.length) { queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(','); } else { delete queryCarn.value.warehouseNameRange; diff --git a/src/views/reportforms/InventoryOutbound.vue b/src/views/reportforms/InventoryOutbound.vue index cd31f01d..74d2a84a 100644 --- a/src/views/reportforms/InventoryOutbound.vue +++ b/src/views/reportforms/InventoryOutbound.vue @@ -352,7 +352,7 @@ const searchReset = () => { const searchChange = () => { console.log(TopQuery.value, 'TopQuery.value'); // 日期处理 - if (TopQuery.value.time.length) { + if (TopQuery.value.time?.length) { queryCarn.value.startCreateTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期 queryCarn.value.endCreateTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期 } else { @@ -360,7 +360,7 @@ const searchChange = () => { delete queryCarn.value.endTaskTime; } // 仓库处理 - if (TopQuery.value.warehouseNameRange.length) { + if (TopQuery.value.warehouseNameRange?.length) { queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(','); } else { delete queryCarn.value.warehouseNameRange; diff --git a/src/views/reportforms/InventoryReceipt.vue b/src/views/reportforms/InventoryReceipt.vue index 0a5fd505..2317a01b 100644 --- a/src/views/reportforms/InventoryReceipt.vue +++ b/src/views/reportforms/InventoryReceipt.vue @@ -354,7 +354,7 @@ const searchReset = () => { const searchChange = () => { console.log(TopQuery.value, 'TopQuery.value'); // 日期处理 - if (TopQuery.value.time.length) { + if (TopQuery.value.time?.length) { queryCarn.value.startWarehousingTime = dayjs(TopQuery.value.time[0]).format( 'YYYY-MM-DD HH:mm:ss' ); //开始日期 @@ -367,7 +367,7 @@ const searchChange = () => { } // 仓库处理 console.log(TopQuery.value, 'TopQuery.value'); - if (TopQuery.value.warehouseNameRange.length) { + if (TopQuery.value.warehouseNameRange?.length) { queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(','); } else { delete queryCarn.value.warehouseNameRange; diff --git a/src/views/reportforms/Selfpickupreport.vue b/src/views/reportforms/Selfpickupreport.vue index 60972be8..c4af6ce6 100644 --- a/src/views/reportforms/Selfpickupreport.vue +++ b/src/views/reportforms/Selfpickupreport.vue @@ -316,7 +316,7 @@ const searchReset = () => { const searchChange = () => { console.log(TopQuery.value, 'TopQuery.value'); // 日期处理 - if (TopQuery.value.time.length) { + if (TopQuery.value.time?.length) { queryCarn.value.startScanTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期 queryCarn.value.endScanTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期 } else { @@ -324,7 +324,7 @@ const searchChange = () => { delete queryCarn.value.endScanTime; } // 仓库处理 - if (TopQuery.value.warehouseNameRange.length) { + if (TopQuery.value.warehouseNameRange?.length) { queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(','); } else { delete queryCarn.value.warehouseNameRange; diff --git a/src/views/reportforms/Selfpickuptask.vue b/src/views/reportforms/Selfpickuptask.vue index 93d1d48a..306b5dca 100644 --- a/src/views/reportforms/Selfpickuptask.vue +++ b/src/views/reportforms/Selfpickuptask.vue @@ -351,7 +351,7 @@ const searchReset = () => { // 网页顶部搜索按钮 const searchChange = () => { // 日期处理 - if (TopQuery.value.time.length) { + if (TopQuery.value.time?.length) { queryCarn.value.startCreatedTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期 queryCarn.value.endCreatedTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期 } else { @@ -359,7 +359,7 @@ const searchChange = () => { delete queryCarn.value.endCreatedTime; } // 仓库处理 - if (TopQuery.value.warehouseRange.length) { + if (TopQuery.value.warehouseRange?.length) { queryCarn.value.warehouseRange = TopQuery.value.warehouseRange.join(','); } else { delete queryCarn.value.warehouseRange; diff --git a/src/views/reportforms/Stockordertable.vue b/src/views/reportforms/Stockordertable.vue index e1aa592f..45261dca 100644 --- a/src/views/reportforms/Stockordertable.vue +++ b/src/views/reportforms/Stockordertable.vue @@ -336,15 +336,15 @@ const searchReset = () => { const searchChange = () => { // 日期处理 // 处理开始和结束日期 - queryCarn.value.startWarehouseEntryTime = TopQuery.value.time.length + queryCarn.value.startWarehouseEntryTime = TopQuery.value.time?.length ? dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss') : undefined; - queryCarn.value.endWarehouseEntryTime = TopQuery.value.time.length + queryCarn.value.endWarehouseEntryTime = TopQuery.value.time?.length ? dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss') : undefined; // 处理仓库范围 - queryCarn.value.warehouseRange = TopQuery.value.warehouseRange.length + queryCarn.value.warehouseRange = TopQuery.value.warehouseRange?.length ? TopQuery.value.warehouseRange.join(',') : undefined;