From 47b04430376f2498e8ddd9eb77ebea1be4ec8f21 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期五, 15 八月 2025 17:09:36 +0800
Subject: [PATCH] 修改

---
 ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue |  108 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 79 insertions(+), 29 deletions(-)

diff --git a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
index 973645f..af35f3f 100644
--- a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
@@ -173,9 +173,12 @@
     projectName: {
       fixed: 'left',
       label: '椤圭洰鍚嶇О', search: true,
+      minWidth: 150,
+
     },
     dispatchNo: {
       label: '璋冨害鍗曞彿',
+      minWidth: 150,
       search: true,
       rules: [
         {
@@ -187,15 +190,19 @@
     customerName: {
       label: '瀹㈡埛鍚嶇О',
       search: true,
+      minWidth: 220,
+
       type: 'select',           // 璁剧疆涓轰笅鎷夋绫诲瀷
       dicData: [], // 浣跨敤 selectCustomName 浣滀负鏁版嵁婧�
       disabled: false  // 鏍规嵁闇�瑕佽缃槸鍚︾鐢�
     },
     licensePlateNumber: {
-      label: '杞︾墝', search: true, hide: true,
+      label: '杞︾墝', search: true,
+      minWidth: 120,
+
     },
     vehicleType: {
-      label: '杞﹀瀷', search: true, hide: true,
+      label: '杞﹀瀷', search: true,
     },
     createdTime: {
       label: '涓嬪崟鏃堕棿',
@@ -203,7 +210,7 @@
       search: true,
       type: 'date',
       format: 'YYYY-MM-DD',
-      searchSpan: 5, minWidth: 100,
+      searchSpan: 5, minWidth: 120,
       valueFormat: 'YYYY-MM-DD',
     },
     operationMode: {
@@ -239,16 +246,21 @@
 
     carrierName: {
       label: '鎵胯繍鍟�',
+      minWidth: 210,
     },
     departureLocation: {
       label: '鍑哄彂鍦�',
+      minWidth: 200,
     },
     arrivalLocation: {
       label: '鐩殑鍦�',
+      minWidth: 200,
+
     },
     isCreate: {
-      label: '鏄惁宸插叆璐�', dataType: 'string', search: true,
+      label: '鏄惁宸插叆璐�', dataType: 'string',
       type: 'select',
+      minWidth: 120,
       dicUrl: '/system/dict/data/type/sys_whether_type',
     },
     // vehicleId: {
@@ -256,27 +268,64 @@
     // },
 
 
-    // mainDriver: {
-    //   label: '涓婚┚椹跺憳',hide: true,
-    // },
-    // assistantDriver: {
-    //   label: '鍓┚椹跺憳',hide: true,
-    // },
-    // pointNum: {
-    //   label: '鎻愰�佽揣鐐规暟',hide: true,
-    // },
-    // businessContact: {
-    //   label: '涓氬姟鑱旂郴浜�',hide: true,
-    // },
-    // estimatedTotalIncome: {
-    //   label: '棰勪及鎬绘敹鍏�',
-    // },
-    // estimatedTotalCost: {
-    //   label: '棰勪及鎬绘垚鏈�',
-    // },
-    // estimatedProfit: {
-    //   label: '棰勪及鍒╂鼎',
-    // },
+    mainDriver: {
+      label: '涓婚┚椹跺憳',
+      minWidth: 120,
+
+    },
+    assistantDriver: {
+      label: '鍓┚椹跺憳',
+      minWidth: 120,
+
+    },
+    pointNum: {
+      label: '鎻愰�佽揣鐐规暟',
+      minWidth: 100,
+
+    },
+    businessContact: {
+      label: '涓氬姟鑱旂郴浜�',
+       minWidth: 120,
+    },
+    estimatedTotalIncome: {
+      label: '棰勪及鎬绘敹鍏�',
+       minWidth: 120,
+
+    },
+    estimatedTotalCost: {
+      label: '棰勪及鎬绘垚鏈�',
+       minWidth: 120,
+
+    },
+    estimatedProfit: {
+      label: '棰勪及鍒╂鼎',
+       minWidth: 120,
+
+    },
+
+    confirmedTotalIncome: {
+      label: '纭鎬绘敹鍏�',
+       minWidth: 120,
+
+    },
+    confirmedTotalCost: {
+      label: '纭鎬绘垚鏈�',
+       minWidth: 120,
+
+    },
+    isIncomeMatched: {
+      label: '鏄惁鍖归厤鏀跺叆',
+
+      type: 'select',
+      minWidth: 120,
+      dicUrl: '/system/dict/data/type/sys_matching_status',
+    },
+    isCostMatched: {
+      label: '鏄惁鍖归厤鎴愭湰',
+      type: 'select',
+      minWidth: 120,
+      dicUrl: '/system/dict/data/type/sys_matching_status',
+    },
     // electronicLock: {
     //   label: '鐢靛瓙閿�',
     // },
@@ -460,16 +509,17 @@
 const dispatchNo = ref('');
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   if (tab.props.name == 'first') {
-    getListVable(dispatchNo.value, 0);
-  } else if (tab.props.name == 'second') {
     getListVable(dispatchNo.value, 1);
+  } else if (tab.props.name == 'second') {
+    getListVable(dispatchNo.value, 0);
   }
 }
 
 const handleFy = (row: any) => {
   dispatchNo.value = row.dispatchNo;
+  dialog.title = '璐圭敤鏄庣粏';
   if (activeName.value == 'first') {
-    listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 0 }).then((res) => {
+    listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 1 }).then((res) => {
       if (res.code === 200) {
         dialog.detail = true;
         tableDataList.value = res.rows || [];
@@ -477,7 +527,7 @@
     })
   } else if (activeName.value == 'second') {
     // 杩欓噷鍙互娣诲姞鏌ヨ鏀跺叆鐩稿叧鐨勯�昏緫
-    listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 1 }).then((res) => {
+    listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 0 }).then((res) => {
       if (res.code === 200) {
         dialog.detail = true;
         tableDataList.value = res.rows || [];

--
Gitblit v1.8.0