diff --git a/src/option/warehouse/warehouseRetentionRecord.js b/src/option/warehouse/warehouseRetentionRecord.js index fd5b2a00..bcf32597 100644 --- a/src/option/warehouse/warehouseRetentionRecord.js +++ b/src/option/warehouse/warehouseRetentionRecord.js @@ -24,7 +24,7 @@ export const columnList = [ { prop: 'trainNumber', label: '车次号', - type: 1, + type:2, values: '', width: '180', checkarr: [], @@ -34,7 +34,7 @@ export const columnList = [ { prop: 'reservationCode', label: '预约编号', - type: 1, + type: 2, values: '', width: '180', checkarr: [], @@ -44,7 +44,7 @@ export const columnList = [ { prop: 'waybillNumber', label: '运单号', - type: 1, + type: 2, values: '', width: '180', checkarr: [], @@ -66,7 +66,7 @@ export const columnList = [ { prop: 'orderPackageCode', label: '包条码', - type: 1, + type:2, values: '', width: '180', checkarr: [], @@ -101,7 +101,7 @@ export const columnList = [ { prop: 'retentionScanTime', label: '滞留扫描时间', - type: 1, + type: 4, values: '', width: '180', checkarr: [], @@ -111,7 +111,7 @@ export const columnList = [ { prop: 'retentionScanUsername', label: '滞留操作人', - type: 1, + type: 2, values: '', width: '180', checkarr: [], @@ -132,7 +132,7 @@ export const columnList = [ { prop: 'warehouseName', label: '仓库名称', - type: 1, + type:2, values: '', width: '180', checkarr: [], diff --git a/src/views/reportforms/DeliveryCustomers.vue b/src/views/reportforms/DeliveryCustomers.vue index b8bab8f5..2eadedd5 100644 --- a/src/views/reportforms/DeliveryCustomers.vue +++ b/src/views/reportforms/DeliveryCustomers.vue @@ -11,15 +11,16 @@
+ v-model="TopQuery.time" + type="datetimerange" + unlink-panels + range-separator="至" + start-placeholder="开始时间" + end-placeholder="结束时间" + :shortcuts="shortcuts" + :default-time="defaultTime2" + @change="Toptiem" + /> @@ -196,6 +197,7 @@ const details = reactive({ search: false, /** 表格搜索条件 */ query: {}, + defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00' /** 时间快捷选择设置 */ shortcuts: [ { @@ -283,6 +285,7 @@ const { zeroAdditionalRecordingInfo, popUpShow, recorddata, + defaultTime2, } = toRefs(details); /** 展开列表控件 */ diff --git a/src/views/reportforms/DeliveryDetails.vue b/src/views/reportforms/DeliveryDetails.vue index 90e47bf9..885c0497 100644 --- a/src/views/reportforms/DeliveryDetails.vue +++ b/src/views/reportforms/DeliveryDetails.vue @@ -11,17 +11,28 @@
+ v-model="TopQuery.time" + type="datetimerange" + unlink-panels + range-separator="至" + start-placeholder="开始时间" + end-placeholder="结束时间" + :shortcuts="shortcuts" + :default-time="defaultTime2" + /> + + + - { delete queryCarn.value.startTaskTime; delete queryCarn.value.endTaskTime; } + + // 签收扫描时间 + if (TopQuery.value.Signfor?.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 { + delete queryCarn.value.startTaskTime; + delete queryCarn.value.endTaskTime; + } // 仓库处理 if (TopQuery.value.warehouseNameRange?.length) { queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(','); diff --git a/src/views/reportforms/DeliveryTrainNumber.vue b/src/views/reportforms/DeliveryTrainNumber.vue index f37996b0..b2b463ec 100644 --- a/src/views/reportforms/DeliveryTrainNumber.vue +++ b/src/views/reportforms/DeliveryTrainNumber.vue @@ -10,16 +10,17 @@
- + @@ -206,6 +207,7 @@ const details = reactive({ /** 表格搜索条件 */ query: {}, /** 时间快捷选择设置 */ + defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00' shortcuts: [ { text: '最近一周', @@ -292,6 +294,7 @@ const { zeroAdditionalRecordingInfo, popUpShow, recorddata, + defaultTime2, } = toRefs(details); /** 展开列表控件 */ diff --git a/src/views/reportforms/InventoryOutbound.vue b/src/views/reportforms/InventoryOutbound.vue index 74d2a84a..3733ed1d 100644 --- a/src/views/reportforms/InventoryOutbound.vue +++ b/src/views/reportforms/InventoryOutbound.vue @@ -11,15 +11,15 @@
+ v-model="TopQuery.time" + type="datetimerange" + unlink-panels + range-separator="至" + start-placeholder="开始时间" + end-placeholder="结束时间" + :shortcuts="shortcuts" + :default-time="defaultTime2" + /> + v-model="TopQuery.time" + type="datetimerange" + unlink-panels + range-separator="至" + start-placeholder="开始时间" + end-placeholder="结束时间" + :shortcuts="shortcuts" + :default-time="defaultTime2" + /> @@ -208,6 +208,7 @@ const details = reactive({ search: false, /** 表格搜索条件 */ query: {}, + defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00' /** 时间快捷选择设置 */ shortcuts: [ { @@ -295,6 +296,7 @@ const { zeroAdditionalRecordingInfo, popUpShow, recorddata, + defaultTime2, } = toRefs(details); /** 展开列表控件 */ diff --git a/src/views/reportforms/Selfpickupreport.vue b/src/views/reportforms/Selfpickupreport.vue index c4af6ce6..57317698 100644 --- a/src/views/reportforms/Selfpickupreport.vue +++ b/src/views/reportforms/Selfpickupreport.vue @@ -12,14 +12,15 @@
+ v-model="TopQuery.time" + type="datetimerange" + unlink-panels + range-separator="至" + start-placeholder="开始时间" + end-placeholder="结束时间" + :shortcuts="shortcuts" + :default-time="defaultTime2" + /> @@ -171,6 +172,7 @@ const details = reactive({ search: false, /** 表格搜索条件 */ query: {}, + defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00' /** 时间快捷选择设置 */ shortcuts: [ { @@ -258,6 +260,7 @@ const { zeroAdditionalRecordingInfo, popUpShow, recorddata, + defaultTime2, } = toRefs(details); /** 展开列表控件 */ diff --git a/src/views/reportforms/Selfpickuptask.vue b/src/views/reportforms/Selfpickuptask.vue index 306b5dca..8e808251 100644 --- a/src/views/reportforms/Selfpickuptask.vue +++ b/src/views/reportforms/Selfpickuptask.vue @@ -11,15 +11,15 @@
+ v-model="TopQuery.time" + type="datetimerange" + unlink-panels + range-separator="至" + start-placeholder="开始时间" + end-placeholder="结束时间" + :shortcuts="shortcuts" + :default-time="defaultTime2" + /> @@ -207,6 +207,7 @@ const details = reactive({ search: false, /** 表格搜索条件 */ query: {}, + defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00' /** 时间快捷选择设置 */ shortcuts: [ { @@ -294,6 +295,7 @@ const { zeroAdditionalRecordingInfo, popUpShow, recorddata, + defaultTime2, } = toRefs(details); /** 展开列表控件 */ diff --git a/src/views/reportforms/Stockordertable.vue b/src/views/reportforms/Stockordertable.vue index 45261dca..c27a16ce 100644 --- a/src/views/reportforms/Stockordertable.vue +++ b/src/views/reportforms/Stockordertable.vue @@ -11,15 +11,15 @@
+ v-model="TopQuery.time" + type="datetimerange" + unlink-panels + range-separator="至" + start-placeholder="开始时间" + end-placeholder="结束时间" + :shortcuts="shortcuts" + :default-time="defaultTime2" + /> @@ -192,6 +192,7 @@ const details = reactive({ search: false, /** 表格搜索条件 */ query: {}, + defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00' /** 时间快捷选择设置 */ shortcuts: [ { @@ -279,6 +280,7 @@ const { zeroAdditionalRecordingInfo, popUpShow, recorddata, + defaultTime2, } = toRefs(details); /** 展开列表控件 */ diff --git a/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue b/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue index 0147efc9..e8911d5f 100644 --- a/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue +++ b/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue @@ -249,6 +249,7 @@ const currentChange = val => { // 刷新按钮 const searchChangeS = () => { details.search = false; //关闭搜索 + onLoad(); }; // 顶部搜索 const searchHide = () => { @@ -276,26 +277,35 @@ const onLoad = () => { size: details.page.pageSize, ...details.query, }; + + details.loadingObj.list = true; $_warehouseRetentionRecordPage(data).then(res => { console.log(res, '返回值'); - details.data = res.data.data.records; - details.data.forEach(item => { - if (item.retentionWay == 1) { - item.retentionWayNameS = '扫描'; - } else if (item.retentionWay == 2) { - item.retentionWayNameS = '文员'; - } - if (item.scanType == 1) { - item.scanType = '包件'; - } else if (item.scanTypeS == 2) { - item.scanTypeName = '订单'; - } else if (item.scanType == 3) { - item.scanTypeNameS = '托盘'; + if (res.data.code == 200) { + details.data = res.data.data.records || []; + if (details.data?.length) { + details.data.forEach(item => { + if (item.retentionWay == 1) { + item.retentionWayNameS = '扫描'; + } else if (item.retentionWay == 2) { + item.retentionWayNameS = '文员'; + } + if (item.scanType == 1) { + item.scanType = '包件'; + } else if (item.scanTypeS == 2) { + item.scanTypeName = '订单'; + } else if (item.scanType == 3) { + item.scanTypeNameS = '托盘'; + } + }); } - }); - details.page.total = res.data.data.total; + details.page.total = res.data.data.total||0; + } + }).catch(()=>{ + + }).finally(()=>{ details.loadingObj.list = false; - }); + }) }; onLoad(); const view = row => {