From 155d0cb16d9549c701d9ad59e519a7fc5bc899a2 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 10:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue | 74 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 20 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..713fcf3 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,46 +280,75 @@
},
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,
+ },
+ isCreate: {
+ label: '鏄惁宸插叆璐�', dataType: 'string',
+ type: 'select',
+ fixed: 'right',
+ minWidth: 120,
+ search: true,
+ dicUrl: '/system/dict/data/type/sys_whether_type',
+ },
+ billName: {
+ label: '鍏宠仈璐﹀崟鍚嶇О',
+ fixed: 'right',
+ minWidth: 120,
+ search: true,
},
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',
+ },
+
+
+ relatedBillStatus: {
+ minWidth: 120,
+ label: '鍏宠仈璐﹀崟鐘舵��',
+ dataType: 'string',
+ type: 'select',
+ dicUrl: '/system/dict/data/type/sys_related_status',
+ // formatter: (row, value) => {
+ // // 鑷畾涔夋牸寮忓寲閫昏緫锛堝鏋滈渶瑕侊級
+ // return value;
+ // }
},
// electronicLock: {
// label: '鐢靛瓙閿�',
@@ -421,15 +445,25 @@
crudRef.value.rowEdit(selectionList.value[0]);
},
handleSelectionChangeFunc: (selection: any) => {
- if (selection.every((item: any) => item.isCreate == '0')) {
- generateDisabled.value = false;
- } else {
- generateDisabled.value = true;
- if (selection.length > 0) {
- proxy.$message.warning('璇烽�夋嫨鏈叆璐︾殑璁板綍');
+ if (selection.length > 0) {
+ // 妫�鏌ユ槸鍚︽墍鏈夎褰曢兘鏄湭鍏ヨ处鐘舵��(isCreate == '0')
+ const allNotCreated = selection.every((item: any) => item.isCreate == '0');
+ // 妫�鏌ユ槸鍚︽墍鏈夎褰曠殑瀹㈡埛鍚嶇О閮界浉鍚�
+ const sameCustomer = selection.every((item: any) => item.customerName === selection[0].customerName);
+
+ if (allNotCreated && sameCustomer) {
+ generateDisabled.value = false;
+ } else {
+ generateDisabled.value = true;
+ if (!allNotCreated) {
+ proxy.$message.warning('璇烽�夋嫨鏈叆璐︾殑璁板綍');
+ } else if (!sameCustomer) {
+ proxy.$message.warning('璇烽�夋嫨鐩稿悓瀹㈡埛鍚嶇О鐨勮褰�');
+ }
}
+ } else {
+ generateDisabled.value = false;
}
- selectionList.value = selection;
selectionList.value = selection;
}
})
--
Gitblit v1.8.0