From 6ce748cc886d5240283b1456e208db1871b3837f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 28 九月 2025 09:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.1.2'
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index fd799fc..5a7e3b8 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -288,7 +288,7 @@
actualSettlementAmount: null as number,
receiveAccount: '',
bank: '',
- bankBranch: '',
+ // bankBranch: '',
},
});
@@ -300,7 +300,7 @@
actualSettlementAmount: row?.actualSettlementAmount ?? null,
receiveAccount: row?.receiveAccount ?? '',
bank: row?.bank ?? '',
- bankBranch: row?.bankBranch ?? '',
+ // bankBranch: row?.bankBranch ?? '',
});
}
}
@@ -313,7 +313,7 @@
actualSettlementAmount: editForm.actualSettlementAmount,
receiveAccount: editForm.receiveAccount,
bank: editForm.bank,
- bankBranch: editForm.bankBranch,
+ // bankBranch: editForm.bankBranch,
};
let res = await taskServices.editTaskSettlementOrderRoster(params);
if (res) {
@@ -349,12 +349,12 @@
workbookHeaderMap: {
name: '濮撳悕',
identity: '韬唤璇佸彿',
- taskName: '浠诲姟鍚嶇О',
+ contactPhoneNumber: '鎵嬫満鍙�',
+ bank: '鎵�灞為摱琛�',
+ bankBranch: '鎵�灞炴敮琛�',
+ receiveAccount: '鏀舵璐︽埛',
settlementAmount: '缁撶畻閲戦',
actualSettlementAmount: '瀹炲彂閲戦',
- receiveAccount: '鏀舵璐︽埛',
- bank: '鎵�灞為摱琛�',
- bankBranch: '寮�鎴锋敮琛屽悕绉�',
errorMessage: '閿欒淇℃伅',
},
});
@@ -374,6 +374,7 @@
code: form.code,
settlementUserCount: form.settlementTaskUsers.length,
actualSettlementAmount: form.actualSettlementAmount,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
});
}
@@ -389,6 +390,7 @@
code: '',
settlementUserCount: 0,
actualSettlementAmount: 0,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
},
});
@@ -400,6 +402,7 @@
try {
let params: API.SureTaskSettlementCommand = {
taskInfoId: id,
+ settlementAccess: settleEditForm.settlementAccess,
};
let res = await taskServices.sureTaskSettlement(params);
if (res) {
--
Gitblit v1.9.1