From 9578ae952527cdafc64d642f5183aa60ef92b7f2 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 10 九月 2025 11:26:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue | 138 +++++++++++++++++++++++++---------------------
1 files changed, 75 insertions(+), 63 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue b/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue
index 5df8a14..2cc278c 100644
--- a/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue
@@ -41,7 +41,7 @@
</avue-crud>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" v-if="itemTableData2.length>0" @click="downPZ">涓嬭浇鍑瘉</el-button>
+ <el-button type="primary" v-if="itemTableData2.length>0" @click="downPZ">涓嬭浇闄勪欢</el-button>
</div>
</template>
@@ -111,6 +111,8 @@
delBtn: false,
viewBtn: false,
selection: false,
+ searchSpan: 5,
+ searchLabelWidth: 100,
column: {
dispatchNo: {
fixed: 'left',
@@ -129,16 +131,16 @@
label: '鏈嶅姟浜у搧鍚嶇О', width: 120, showOverflowTooltip: true
},
customerName: {
- label: '瀹㈡埛鍚嶇О', search: true, width: 200, showOverflowTooltip: true
+ label: '瀹㈡埛鍚嶇О', search: true, minWidth: 220, showOverflowTooltip: true
},
carrierName: {
- label: '鎵胯繍鍟�', search: true, width: 200, showOverflowTooltip: true
+ label: '鎵胯繍鍟�', search: true, minWidth: 220, showOverflowTooltip: true
},
departureLocationName: {
- label: '鍑哄彂鍦板悕绉�', width: 210, showOverflowTooltip: true
+ label: '鍑哄彂鍦板悕绉�', minWidth: 220, showOverflowTooltip: true
},
arrivalLocationName: {
- label: '鐩殑鍦板悕绉�', width: 200, showOverflowTooltip: true
+ label: '鐩殑鍦板悕绉�', minWidth: 220, showOverflowTooltip: true
},
licensePlateNumber: {
label: '杞︾墝', search: true, width: 120,
@@ -146,63 +148,63 @@
vehiclePlateId: {
label: '杞︽澘鍙�', width: 120,
},
- mainDriverName: {
- label: '涓婚┚椹跺憳', width: 120,
- },
- assistantDriverName: {
- label: '鍓┚椹跺憳', width: 120,
- },
- pointNum: {
- label: '鎻愰�佽揣鐐规暟', width: 120,
- },
- quantity: {
- label: '浠舵暟', width: 120,
- },
- actualDepartureTime: {
- label: '瀹為檯鍑哄彂鏃堕棿', width: 180,
- },
- actualDepartureTimeRange: {
- label: '瀹為檯鍑哄彂鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
- format: 'YYYY-MM-DD', hide: true, searchSpan: 6, searchLabelWidth: 110,
- valueFormat: 'YYYY-MM-DD',
- },
- requiredArrivalTime: {
- label: '瑕佹眰鍒拌揪鏃堕棿', width: 180,
- },
- requiredArrivalTimeRange: {
- label: '瑕佹眰鍒拌揪鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
- format: 'YYYY-MM-DD', hide: true, searchSpan: 6, searchLabelWidth: 110,
- valueFormat: 'YYYY-MM-DD',
- },
- actualArrivalTime: {
- label: '瀹為檯鍒拌揪鏃堕棿', width: 180,
- },
- actualArrivalTimeRange: {
- label: '瑕佹眰鍒拌揪鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
- format: 'YYYY-MM-DD', hide: true, searchSpan: 6, searchLabelWidth: 110,
- valueFormat: 'YYYY-MM-DD',
- },
- beReturn: {
- label: '鏄惁鍥炵▼', dataType: 'string', width: 100,
- type: 'select', dicUrl: '/system/dict/data/type/dispatch_order_status',
- },
- dispatchQuantity: {
- label: '瀹炲彂浠舵暟', width: 100,
- },
- dispatchWeight: {
- label: '瀹炲彂閲嶉噺', width: 100,
- },
- dispatchVolume: {
- label: '瀹炲彂浣撶Н(绔嬫柟锛�', width: 160,
- },
- status: {
- label: '鐘舵��', search: true, dataType: 'string', width: 100,
- type: 'select', dicUrl: '/system/dict/data/type/dispatch_order_status',
- },
- remark: {
- label: '澶囨敞', width: 120,
- type: 'textarea', minRows: 3, maxRows: 5,
- },
+ // mainDriverName: {
+ // label: '涓婚┚椹跺憳', width: 120,
+ // },
+ // assistantDriverName: {
+ // label: '鍓┚椹跺憳', width: 120,
+ // },
+ // pointNum: {
+ // label: '鎻愰�佽揣鐐规暟', width: 120,
+ // },
+ // quantity: {
+ // label: '浠舵暟', width: 120,
+ // },
+ // actualDepartureTime: {
+ // label: '瀹為檯鍑哄彂鏃堕棿', width: 180,
+ // },
+ // actualDepartureTimeRange: {
+ // label: '瀹為檯鍑哄彂鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
+ // format: 'YYYY-MM-DD', hide: true, searchSpan: 5, searchLabelWidth: 120,
+ // valueFormat: 'YYYY-MM-DD',
+ // },
+ // requiredArrivalTime: {
+ // label: '瑕佹眰鍒拌揪鏃堕棿', width: 180,
+ // },
+ // requiredArrivalTimeRange: {
+ // label: '瑕佹眰鍒拌揪鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
+ // format: 'YYYY-MM-DD', hide: true, searchSpan: 5, searchLabelWidth: 120,
+ // valueFormat: 'YYYY-MM-DD',
+ // },
+ // actualArrivalTime: {
+ // label: '瀹為檯鍒拌揪鏃堕棿', width: 180,
+ // },
+ // actualArrivalTimeRange: {
+ // label: '瑕佹眰鍒拌揪鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
+ // format: 'YYYY-MM-DD', hide: true, searchSpan: 5, searchLabelWidth: 120,
+ // valueFormat: 'YYYY-MM-DD',
+ // },
+ // beReturn: {
+ // label: '鏄惁鍥炵▼', dataType: 'string', width: 100,
+ // type: 'select', dicUrl: '/system/dict/data/type/dispatch_order_status',
+ // },
+ // dispatchQuantity: {
+ // label: '瀹炲彂浠舵暟', width: 100,
+ // },
+ // dispatchWeight: {
+ // label: '瀹炲彂閲嶉噺', width: 100,
+ // },
+ // dispatchVolume: {
+ // label: '瀹炲彂浣撶Н(绔嬫柟锛�', width: 160,
+ // },
+ // status: {
+ // label: '鐘舵��', search: true, dataType: 'string', width: 100,
+ // type: 'select', dicUrl: '/system/dict/data/type/dispatch_order_status',
+ // },
+ // remark: {
+ // label: '澶囨敞', width: 120,
+ // type: 'textarea', minRows: 3, maxRows: 5,
+ // },
// createBy: {
// label: '鍒涘缓浜�',
// },
@@ -288,6 +290,7 @@
type: 'select',
dicUrl: '/system/dict/data/type/sys_whether_type',
},
+
}
})
@@ -391,7 +394,7 @@
console.log(res)
const blob = new Blob([res])
console.log(blob)
- saveAs(blob, decodeURI(pageAttachment.value.no+"鍑瘉.pdf"))
+ saveAs(blob, decodeURI(pageAttachment.value.no+"闄勪欢.pdf"))
})
@@ -410,4 +413,13 @@
z-index: 9999 !important;
}
}
+
+:deep(.avue-crud__table) {
+ overflow-y: auto;
+}
+
+:deep(.el-scrollbar__bar.is-horizontal) {
+ pointer-events: auto;
+}
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0