From 9ff903e0e9db52e161896c44cbe03dbbbc5fdd09 Mon Sep 17 00:00:00 2001
From: 15815213711 <a13118667520@163.com>
Date: 星期二, 29 七月 2025 14:16:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue | 130 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 118 insertions(+), 12 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue b/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue
index 3752ace..c14494e 100644
--- a/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/dispatchOrder/index.vue
@@ -30,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>
@@ -50,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();
@@ -73,8 +115,14 @@
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',
@@ -85,7 +133,8 @@
selection:false,
column: {
dispatchNo: {
- label: '璋冨害鍗曞彿',search:true,width: 120,
+ fixed:'left',
+ label: '璋冨害鍗曞彿',search:true,minWidth: 180,
rules: [
{
required: true,
@@ -97,16 +146,16 @@
label: '杩愯緭鏂瑰紡',width: 120,
},
productName: {
- label: '鏈嶅姟浜у搧鍚嶇О',width: 120,
+ label: '鏈嶅姟浜у搧鍚嶇О',width: 120,showOverflowTooltip: true
},
carrierName: {
- label: '鎵胯繍鍟�',search:true,width: 120,
+ label: '鎵胯繍鍟�',search:true,width: 200,showOverflowTooltip: true
},
departureLocationName: {
- label: '鍑哄彂鍦板悕绉�',width: 120,
+ label: '鍑哄彂鍦板悕绉�',width: 210,showOverflowTooltip: true
},
arrivalLocationName: {
- label: '鐩殑鍦板悕绉�',width: 120,
+ label: '鐩殑鍦板悕绉�',width: 200,showOverflowTooltip: true
},
licensePlateNumber: {
label: '杞︾墝',search:true,width: 120,
@@ -161,7 +210,7 @@
label: '瀹炲彂閲嶉噺',width: 100,
},
dispatchVolume: {
- label: '瀹炲彂浣撶Н(绔嬫柟锛�',width: 100,
+ label: '瀹炲彂浣撶Н(绔嬫柟锛�',width: 160,
},
status: {
label: '鐘舵��',search: true,dataType:'string',width: 100,
@@ -183,9 +232,9 @@
// updateTime: {
// label: '淇敼鏃堕棿',
// },
- isDeleted: {
- label: '鏄惁鍒犻櫎(0-鍚�,1-鏄�)',
- },
+ // isDeleted: {
+ // label: '鏄惁鍒犻櫎(0-鍚�,1-鏄�)',
+ // },
}
})
@@ -231,7 +280,64 @@
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