From 3df57d04d239dc40c20cd2b43e1cb09ee005e943 Mon Sep 17 00:00:00 2001
From: 15815213711 <a13118667520@163.com>
Date: 星期二, 29 七月 2025 14:16:29 +0800
Subject: [PATCH] 修改ID,修改加密方式

---
 ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue |  228 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 174 insertions(+), 54 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..c14494e 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
@@ -44,8 +30,51 @@
             v-hasPermi="['cwgl:dispatchOrder:export']"
         >瀵煎嚭
         </el-button>
+        <el-button
+            type="success"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['cwgl:dispatchOrder:export']"
+        >鐢熸垚鍙拌处鎶ヨ〃
+        </el-button>
+      </template>
+      <template #menu="{ size, row, index }">
+        <el-link class="link-btn"
+            type="primary" :underline="false"
+            plain  :size="size"
+            icon="View"
+            @click="handleFy(row)"
+            v-hasPermi="['cwgl:dispatchOrder:query']"
+        > 鏌ョ湅璐圭敤
+        </el-link>
+        <el-link class="link-btn"
+            type="primary" :underline="false"
+            plain
+            icon="View"
+            @click="handleFj(row)"
+            v-hasPermi="['cwgl:dispatchOrder:query']"
+        > 鏌ョ湅闄勪欢
+        </el-link>
       </template>
     </avue-crud>
+    <el-dialog title="鏌ョ湅璐圭敤" v-model="open1"  class="avue-dialog avue-dialog--top"  width="60%">
+      <avue-crud
+          :option="itemTableOption1"
+          :data="itemTableData1"
+          :table-loading="itemTableLoading1"
+      >
+
+      </avue-crud>
+    </el-dialog>
+    <el-dialog title="鏌ョ湅闄勪欢" v-model="open2"  class="avue-dialog avue-dialog--top"  width="60%">
+      <avue-crud
+          :option="itemTableOption2"
+          :data="itemTableData2"
+          :table-loading="itemTableLoading2"
+      >
+      </avue-crud>
+    </el-dialog>
   </basicContainer>
 </template>
 
@@ -64,7 +93,6 @@
 import {PagesInterface, PageQueryInterface} from "@/utils/globalInterface";
 import {usePagePlus} from "@/hooks/usePagePlus";
 import {hasPermission} from "@/utils/permissionUtils";
-import {useTableColumnWidth} from "@/hooks/useAvueTableWidths";
 
 const {proxy} = useCurrentInstance();
 const crudRef = ref();
@@ -87,14 +115,26 @@
     currentPage: 1,
   },
   selectionList: [],
+  itemTableData1: [],
+  itemTableData2: [],
+  open1:false,
+  open2:false,
+  itemTableLoading1:false,
+  itemTableLoading2:false,
 })
-const {queryParams, form, page, selectionList} = toRefs(data);
+const {queryParams, form, page, selectionList, itemTableData1, itemTableData2, open1, open2, itemTableLoading1, itemTableLoading2} = toRefs(data);
 const option = ref({
   pageKey: 'DispatchOrder',
   rowKey: 'id',
+  addBtn:false,
+  editBtn:false,
+  delBtn:false,
+  viewBtn:false,
+  selection:false,
   column: {
     dispatchNo: {
-      label: '璋冨害鍗曞彿',search:true,
+      fixed:'left',
+      label: '璋冨害鍗曞彿',search:true,minWidth: 180,
       rules: [
         {
           required: true,
@@ -103,81 +143,98 @@
       ],
     },
     transportMode: {
-      label: '杩愯緭鏂瑰紡',
+      label: '杩愯緭鏂瑰紡',width: 120,
     },
     productName: {
-      label: '鏈嶅姟浜у搧鍚嶇О',
+      label: '鏈嶅姟浜у搧鍚嶇О',width: 120,showOverflowTooltip: true
     },
     carrierName: {
-      label: '鎵胯繍鍟�',search:true,
+      label: '鎵胯繍鍟�',search:true,width: 200,showOverflowTooltip: true
     },
     departureLocationName: {
-      label: '鍑哄彂鍦板悕绉�',
+      label: '鍑哄彂鍦板悕绉�',width: 210,showOverflowTooltip: true
     },
     arrivalLocationName: {
-      label: '鐩殑鍦板悕绉�',
+      label: '鐩殑鍦板悕绉�',width: 200,showOverflowTooltip: true
     },
     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: 160,
     },
     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: '淇敼鏃堕棿',
-    },
-    isDeleted: {
-      label: '鏄惁鍒犻櫎(0-鍚�,1-鏄�)',
-    },
+    // createBy: {
+    //   label: '鍒涘缓浜�',
+    // },
+    // createTime: {
+    //   label: '鍒涘缓鏃堕棿',
+    // },
+    // updateBy: {
+    //   label: '淇敼浜�',
+    // },
+    // updateTime: {
+    //   label: '淇敼鏃堕棿',
+    // },
+    // isDeleted: {
+    //   label: '鏄惁鍒犻櫎(0-鍚�,1-鏄�)',
+    // },
   }
 })
 
@@ -213,11 +270,74 @@
   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;
   }
 })
-useTableColumnWidth(option.value, crudRef); // 浣跨敤 Hook 绠$悊鍒楀
+const itemTableOption1 = ref({
+  addBtn: false,
+  selection: false,
+  menu: false,
+  header: false,
+  column: {
+    packageTrackingNo: {
+      label: '璐圭敤绫诲瀷',minWidth: 180,fixed: 'left'
+    },
+    ys: {
+      label: '搴旀敹璐圭敤',minWidth: 180,
+    },
+    yf: {
+      label: '搴斾粯璐圭敤',minWidth: 180,
+    },
+    isFY: {
+      label: '鏄惁鍙粯娆�',minWidth: 180,
+    },
+  }
+})
+
+const itemTableOption2 = ref({
+  addBtn: false,
+  selection: false,
+  menu: false,
+  header: false,
+  column: {
+    packageTrackingNo: {
+      label: '璐圭敤绫诲瀷',minWidth: 180,fixed: 'left'
+    },
+    ys: {
+      label: '閲戦',minWidth: 180,
+    },
+    yf: {
+      label: '甯佸��',minWidth: 180,
+    },
+    isFY: {
+      label: '鍥剧墖',minWidth: 180,
+    },
+  }
+})
+
+
+
+const handleFy = (row:DispatchOrderI) => {
+  open1.value = true;
+}
+
+const handleFj = (row:DispatchOrderI) => {
+  open2.value = true;
+}
 
 
 </script>
+<style lang="scss" scoped>
+.avue-dialog .el-dialog__body {
+  padding: 20px 20px;
+  flex: 1;
+  overflow: scroll;
+}
+</style>
\ No newline at end of file

--
Gitblit v1.8.0