From 1395356d3b3423f8cb90ded6b5fe8eb2eb52af23 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 10:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
index 782a52a..c8baab3 100644
--- a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
@@ -308,17 +308,26 @@
minWidth: 120,
},
- relatedBillName: {
- label: '鍏宠仈鑱旇处鍗曞悕绉�',
+ 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: {
@@ -328,14 +337,8 @@
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: '鍏宠仈璐﹀崟鐘舵��',
@@ -442,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;
}
})
@@ -540,7 +553,7 @@
dispatchNo.value = row.dispatchNo;
dialog.title = '璐圭敤鏄庣粏';
if (activeName.value == 'first') {
- listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 1 }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 1,isConfirmed:1 }).then((res) => {
if (res.code === 200) {
dialog.detail = true;
tableDataList.value = res.rows || [];
@@ -548,7 +561,7 @@
})
} else if (activeName.value == 'second') {
// 杩欓噷鍙互娣诲姞鏌ヨ鏀跺叆鐩稿叧鐨勯�昏緫
- listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 0 }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 0,isConfirmed:1 }).then((res) => {
if (res.code === 200) {
dialog.detail = true;
tableDataList.value = res.rows || [];
@@ -557,7 +570,7 @@
}
}
const getListVable = (dispatchNo, feeType) => {
- listEstimatedReceivable({ dispatchNo: dispatchNo, feeType: feeType }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: dispatchNo, feeType: feeType,isConfirmed:1 }).then((res) => {
if (res.code === 200) {
tableDataList.value = res.rows || [];
}
--
Gitblit v1.8.0