From 15848826875084f3c30db0f523ff753c34238179 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 29 七月 2025 13:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue | 110 +++++++++++++++++++++++++++++++------------------------
1 files changed, 62 insertions(+), 48 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue b/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue
index a39b9bc..3752ace 100644
--- a/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue
@@ -21,21 +21,7 @@
@on-load="onLoad"
>
<template #menu-left>
- <el-button
- type="success"
- icon="Edit"
- :disabled="pageF.single"
- v-hasPermi="['cwgl:dispatchOrder:edit']"
- @click="handleUpdate">淇敼
- </el-button>
- <el-button
- type="danger"
- icon="Delete"
- :disabled="pageF.multiple"
- @click="handleDelete"
- v-hasPermi="['cwgl:dispatchOrder:remove']"
- >鍒犻櫎
- </el-button>
+
<el-button
type="warning"
plain
@@ -92,9 +78,14 @@
const option = ref({
pageKey: 'DispatchOrder',
rowKey: 'id',
+ addBtn:false,
+ editBtn:false,
+ delBtn:false,
+ viewBtn:false,
+ selection:false,
column: {
dispatchNo: {
- label: '璋冨害鍗曞彿',search:true,
+ label: '璋冨害鍗曞彿',search:true,width: 120,
rules: [
{
required: true,
@@ -103,78 +94,95 @@
],
},
transportMode: {
- label: '杩愯緭鏂瑰紡',
+ label: '杩愯緭鏂瑰紡',width: 120,
},
productName: {
- label: '鏈嶅姟浜у搧鍚嶇О',
+ label: '鏈嶅姟浜у搧鍚嶇О',width: 120,
},
carrierName: {
- label: '鎵胯繍鍟�',search:true,
+ label: '鎵胯繍鍟�',search:true,width: 120,
},
departureLocationName: {
- label: '鍑哄彂鍦板悕绉�',
+ label: '鍑哄彂鍦板悕绉�',width: 120,
},
arrivalLocationName: {
- label: '鐩殑鍦板悕绉�',
+ label: '鐩殑鍦板悕绉�',width: 120,
},
licensePlateNumber: {
- label: '杞︾墝',search:true,
+ label: '杞︾墝',search:true,width: 120,
},
vehiclePlateId: {
- label: '杞︽澘鍙�',
+ label: '杞︽澘鍙�',width: 120,
},
mainDriverName: {
- label: '涓婚┚椹跺憳',
+ label: '涓婚┚椹跺憳',width: 120,
},
assistantDriverName: {
- label: '鍓┚椹跺憳',
+ label: '鍓┚椹跺憳',width: 120,
},
pointNum: {
- label: '鎻愰�佽揣鐐规暟',
+ label: '鎻愰�佽揣鐐规暟',width: 120,
},
quantity: {
- label: '浠舵暟',
+ label: '浠舵暟',width: 120,
},
actualDepartureTime: {
- label: '瀹為檯鍑哄彂鏃堕棿',
+ 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: '瑕佹眰鍒拌揪鏃堕棿',
+ 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: '瀹為檯鍒拌揪鏃堕棿',
+ 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: '鏄惁鍥炵▼(N,Y)',
+ label: '鏄惁鍥炵▼',dataType:'string',width: 100,
+ type: 'select', dicUrl: '/system/dict/data/type/dispatch_order_status',
},
dispatchQuantity: {
- label: '瀹炲彂浠舵暟',
+ label: '瀹炲彂浠舵暟',width: 100,
},
dispatchWeight: {
- label: '瀹炲彂閲嶉噺',
+ label: '瀹炲彂閲嶉噺',width: 100,
},
dispatchVolume: {
- label: '瀹炲彂浣撶Н(绔嬫柟锛�',
+ label: '瀹炲彂浣撶Н(绔嬫柟锛�',width: 100,
},
status: {
- label: '鐘舵��',
+ label: '鐘舵��',search: true,dataType:'string',width: 100,
+ type: 'select', dicUrl: '/system/dict/data/type/dispatch_order_status',
},
remark: {
- label: '澶囨敞',
+ label: '澶囨敞',width: 120,
type: 'textarea', minRows: 3, maxRows: 5,
},
- createBy: {
- label: '鍒涘缓浜�',
- },
- createTime: {
- label: '鍒涘缓鏃堕棿',
- },
- updateBy: {
- label: '淇敼浜�',
- },
- updateTime: {
- label: '淇敼鏃堕棿',
- },
+ // createBy: {
+ // label: '鍒涘缓浜�',
+ // },
+ // createTime: {
+ // label: '鍒涘缓鏃堕棿',
+ // },
+ // updateBy: {
+ // label: '淇敼浜�',
+ // },
+ // updateTime: {
+ // label: '淇敼鏃堕棿',
+ // },
isDeleted: {
label: '鏄惁鍒犻櫎(0-鍚�,1-鏄�)',
},
@@ -213,6 +221,12 @@
handleUpdateFunc: () => {
crudRef.value.rowEdit(selectionList.value[0]);
},
+ getBeginListFunc(params:any = {}){
+ params = proxy.addDateRangeNew(params, params?.actualDepartureTimeRange, 'actualDepartureTime') || {};
+ params = proxy.addDateRangeNew(params, params?.requiredArrivalTimeRange, 'requiredArrivalTime') || {};
+ params = proxy.addDateRangeNew(params, params?.actualArrivalTimeRange, 'actualArrivalTime') || {};
+ return params;
+ },
handleSelectionChangeFunc: (selection: any) => {
selectionList.value = selection;
}
--
Gitblit v1.8.0