diff --git a/src/option/reportforms/AuditTimelinessRatioReport.js b/src/option/reportforms/AuditTimelinessRatioReport.js index b924ea5b..1aa754c1 100644 --- a/src/option/reportforms/AuditTimelinessRatioReport.js +++ b/src/option/reportforms/AuditTimelinessRatioReport.js @@ -142,6 +142,17 @@ export const columnList = [ head: false, isshowSummary: false, //开启统计 }, + { + prop: 'hoursTime', + label: '标准时效(小时)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, ]; export const columnListDetails = [ @@ -1205,7 +1216,7 @@ export const columnListDetails = [ { prop: 'isOverTimeName', label: '是否超时', - type: 1, + type: 3, values: '', width: '150', checkarr: [ diff --git a/src/option/reportforms/CreateOrderTimelinessRatioReport.js b/src/option/reportforms/CreateOrderTimelinessRatioReport.js index 50238efe..8f6561d3 100644 --- a/src/option/reportforms/CreateOrderTimelinessRatioReport.js +++ b/src/option/reportforms/CreateOrderTimelinessRatioReport.js @@ -227,6 +227,17 @@ export const columnList = [ head: false, isshowSummary: true, //开启统计 }, + { + prop: 'hoursTime', + label: '标准时效(小时)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, ]; export const columnListDetails = [ diff --git a/src/option/reportforms/OrderAllTime.js b/src/option/reportforms/OrderAllTime.js index b2e82ded..79f59521 100644 --- a/src/option/reportforms/OrderAllTime.js +++ b/src/option/reportforms/OrderAllTime.js @@ -96,7 +96,6 @@ export const columnList = [ fixed: false, sortable: true, head: false, - isshowSummary: true, //开启统计 }, { prop: 'departureWarehouseName', diff --git a/src/option/reportforms/PackageStartTimePageReport.js b/src/option/reportforms/PackageStartTimePageReport.js index 987a3328..1fc80db8 100644 --- a/src/option/reportforms/PackageStartTimePageReport.js +++ b/src/option/reportforms/PackageStartTimePageReport.js @@ -448,7 +448,7 @@ export const columnListDetails = [ }, { prop: 'startHours', - label: '实际发运时效', + label: '实际发运时效(小时)', type: 1, values: '', width: '150', @@ -459,7 +459,7 @@ export const columnListDetails = [ }, { prop: 'hoursTime', - label: '标准发运时效', + label: '标准发运时效(小时)', type: 1, values: '', width: '150', diff --git a/src/option/reportforms/UpdateWaybillQualityPageReport.js b/src/option/reportforms/UpdateWaybillQualityPageReport.js index 503842a5..3b0d9ff4 100644 --- a/src/option/reportforms/UpdateWaybillQualityPageReport.js +++ b/src/option/reportforms/UpdateWaybillQualityPageReport.js @@ -291,11 +291,11 @@ export const columnListDetails = [ width: '130', checkarr: [ { - label: '有数据', + label: '定制品', value: '1', }, { - label: '无数据', + label: '零担', value: '2', }, ], @@ -352,16 +352,6 @@ export const columnListDetails = [ fixed: false, sortable: true, }, - { - prop: 'agent', - label: '申请人', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, { prop: 'updateReson', label: '修改原因', diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue index 18883b99..6b281a54 100644 --- a/src/views/distribution/artery/VehicleArrivalManagement.vue +++ b/src/views/distribution/artery/VehicleArrivalManagement.vue @@ -306,7 +306,9 @@ diff --git a/src/views/distribution/artery/VehicleNodeImgs.vue b/src/views/distribution/artery/VehicleNodeImgs.vue index a99b321a..19a10a78 100644 --- a/src/views/distribution/artery/VehicleNodeImgs.vue +++ b/src/views/distribution/artery/VehicleNodeImgs.vue @@ -495,7 +495,7 @@ const initImgList = async () => { _obj.nodeId = carsLoadLineEntity.nodeId; _obj.nowWarehouseId = nowWarehouseId; - if (details.myWarehouseId === _obj.nodeId) details.activeIndex = i; + // if (details.myWarehouseId === _obj.nodeId) details.activeIndex = i; if (nowWarehouseId === _obj.nodeId) details.nowWarehoseIndex = i; } else { @@ -675,7 +675,14 @@ const handleEditSubmit = async () => { } }; -watch(() => $route.fullPath, initImgList, { immediate: true }); +watch( + () => $route.fullPath, + () => { + details.activeIndex = 0; + initImgList(); + }, + { immediate: true } +);