From bc9c1ab46dc7fdd6936df480303e295a9cb110da Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 28 九月 2025 15:53:20 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 80760a2..5a7e3b8 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -134,6 +134,7 @@
import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
import { Message } from '@bole-core/core';
+import { SettlementReceiveStatusText } from '@/constants';
import {
downloadFile,
downloadFileByUrl,
@@ -274,6 +275,7 @@
settlementTime: { type: 'date' },
settlementAmount: { type: 'money' },
actualSettlementAmount: { type: 'money' },
+ settlementReceiveStatus: { type: 'enum', valueEnum: SettlementReceiveStatusText },
},
}
);
@@ -286,7 +288,7 @@
actualSettlementAmount: null as number,
receiveAccount: '',
bank: '',
- bankBranch: '',
+ // bankBranch: '',
},
});
@@ -298,7 +300,7 @@
actualSettlementAmount: row?.actualSettlementAmount ?? null,
receiveAccount: row?.receiveAccount ?? '',
bank: row?.bank ?? '',
- bankBranch: row?.bankBranch ?? '',
+ // bankBranch: row?.bankBranch ?? '',
});
}
}
@@ -311,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) {
@@ -347,12 +349,12 @@
workbookHeaderMap: {
name: '濮撳悕',
identity: '韬唤璇佸彿',
- taskName: '浠诲姟鍚嶇О',
+ contactPhoneNumber: '鎵嬫満鍙�',
+ bank: '鎵�灞為摱琛�',
+ bankBranch: '鎵�灞炴敮琛�',
+ receiveAccount: '鏀舵璐︽埛',
settlementAmount: '缁撶畻閲戦',
actualSettlementAmount: '瀹炲彂閲戦',
- receiveAccount: '鏀舵璐︽埛',
- bank: '鎵�灞為摱琛�',
- bankBranch: '寮�鎴锋敮琛屽悕绉�',
errorMessage: '閿欒淇℃伅',
},
});
@@ -372,6 +374,7 @@
code: form.code,
settlementUserCount: form.settlementTaskUsers.length,
actualSettlementAmount: form.actualSettlementAmount,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
});
}
@@ -387,6 +390,7 @@
code: '',
settlementUserCount: 0,
actualSettlementAmount: 0,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
},
});
@@ -398,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