From 3d3fa72ebf55f841c8ede01c59347af5e44b773b Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
index af35f3f..782a52a 100644
--- a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
@@ -257,12 +257,7 @@
minWidth: 200,
},
- isCreate: {
- label: '鏄惁宸插叆璐�', dataType: 'string',
- type: 'select',
- minWidth: 120,
- dicUrl: '/system/dict/data/type/sys_whether_type',
- },
+
// vehicleId: {
// label: '杩愯緭宸ュ叿ID',hide: true,
// },
@@ -285,47 +280,73 @@
},
businessContact: {
label: '涓氬姟鑱旂郴浜�',
- minWidth: 120,
+ minWidth: 120,
},
estimatedTotalIncome: {
label: '棰勪及鎬绘敹鍏�',
- minWidth: 120,
+ minWidth: 120,
},
estimatedTotalCost: {
label: '棰勪及鎬绘垚鏈�',
- minWidth: 120,
+ minWidth: 120,
},
estimatedProfit: {
label: '棰勪及鍒╂鼎',
- minWidth: 120,
+ minWidth: 120,
},
confirmedTotalIncome: {
label: '纭鎬绘敹鍏�',
- minWidth: 120,
+ minWidth: 120,
},
confirmedTotalCost: {
label: '纭鎬绘垚鏈�',
- minWidth: 120,
+ minWidth: 120,
+
+ },
+ relatedBillName: {
+ label: '鍏宠仈鑱旇处鍗曞悕绉�',
+ fixed: 'right',
+ minWidth: 120,
},
isIncomeMatched: {
label: '鏄惁鍖归厤鏀跺叆',
-
type: 'select',
+ dataType: 'string',
minWidth: 120,
dicUrl: '/system/dict/data/type/sys_matching_status',
},
isCostMatched: {
label: '鏄惁鍖归厤鎴愭湰',
type: 'select',
+ dataType: 'string',
minWidth: 120,
dicUrl: '/system/dict/data/type/sys_matching_status',
},
+
+ isCreate: {
+ label: '鏄惁宸插叆璐�', dataType: 'string',
+ type: 'select',
+ fixed: 'right',
+ minWidth: 120,
+ dicUrl: '/system/dict/data/type/sys_whether_type',
+ },
+ relatedBillStatus: {
+ minWidth: 120,
+ label: '鍏宠仈璐﹀崟鐘舵��',
+ dataType: 'string',
+ type: 'select',
+ dicUrl: '/system/dict/data/type/sys_related_status',
+ // formatter: (row, value) => {
+ // // 鑷畾涔夋牸寮忓寲閫昏緫锛堝鏋滈渶瑕侊級
+ // return value;
+ // }
+ },
// electronicLock: {
// label: '鐢靛瓙閿�',
// },
--
Gitblit v1.8.0