From b331f884097a2dc5086c8cf043c8c8f52e7640fe Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 九月 2025 17:34:39 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
src/views/ServiceChargeManage/ServiceChargeManage.vue | 100 +++++++++++++++++++++----------------------------
1 files changed, 43 insertions(+), 57 deletions(-)
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index 6888c19..b697403 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -55,7 +55,7 @@
:columns="ServiceChargeManageColumns"
:operationBtns="operationBtns"
>
- <template #operationBtn-uploadBtn="{ row }">
+ <!-- <template #operationBtn-uploadBtn="{ row }">
<BlFileUpload
v-model:file-url="editForm.settlementUrl"
ref="uploadRef"
@@ -84,13 +84,12 @@
>
<el-button text type="primary" class="pro-table-operation-btn">閲嶆柊涓婁紶</el-button>
</BlFileUpload>
- </template>
+ </template> -->
</ProTableV2>
</AppContainer>
<UploadStatementDialog v-bind="dialogProps" />
<SettleDetailDialog v-bind="dialogSettleProps" />
<RechargeEnterpriseWalletDialog v-bind="dialogRechargeProps" />
- <AlipayWalletRecharge v-bind="dialogAlipayWalletProps" />
</LoadingLayout>
</template>
@@ -119,12 +118,10 @@
} from '@/constants';
import { downloadFileByUrl, setOssFileName } from '@/utils';
import * as taskServices from '@/services/api/task';
-import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
import { ModelValueType } from 'element-plus';
import UploadStatementDialog from './components/UploadStatementDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
import RechargeEnterpriseWalletDialog from './components/RechargeEnterpriseWalletDialog.vue';
-import AlipayWalletRecharge from './components/AlipayWalletRecharge.vue';
import { Message } from '@bole-core/core';
defineOptions({
@@ -132,36 +129,36 @@
});
const operationBtns = defineOperationBtns([
- {
- data: {
- enCode: 'uploadBtn',
- name: '涓婁紶',
- },
- extraProps: {
- hide: (row: API.GetSettlementTasksQueryResultItem) =>
- row.settlementOrderStatus !== EnumTaskSettlementOrderStatus.Wait,
- },
- },
- {
- data: {
- enCode: 'reUploadBtn',
- name: '閲嶆柊涓婁紶',
- },
- extraProps: {
- hide: (row: API.GetSettlementTasksQueryResultItem) =>
- !(
- row.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
- row.settlementStatus === EnumTaskSettlementStatus.Wait
- ),
- },
- },
+ // {
+ // data: {
+ // enCode: 'uploadBtn',
+ // name: '涓婁紶',
+ // },
+ // extraProps: {
+ // hide: (row: API.GetSettlementTasksQueryResultItem) =>
+ // row.settlementOrderStatus !== EnumTaskSettlementOrderStatus.Wait,
+ // },
+ // },
+ // {
+ // data: {
+ // enCode: 'reUploadBtn',
+ // name: '閲嶆柊涓婁紶',
+ // },
+ // extraProps: {
+ // hide: (row: API.GetSettlementTasksQueryResultItem) =>
+ // !(
+ // row.settlementOrderStatus === EnumTaskSettlementOrderStatus.Completed &&
+ // row.settlementStatus === EnumTaskSettlementStatus.Wait
+ // ),
+ // },
+ // },
{
data: {
enCode: 'settleBtn',
name: '缁撶畻',
},
emits: {
- onClick: (role: API.GetSettlementTasksQueryResultItem) => openSettleDialog(role),
+ onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role, 'settlement'),
},
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
@@ -190,7 +187,7 @@
name: '璇︽儏',
},
emits: {
- onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id),
+ onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role),
},
extraProps: {
hide: (role: API.GetSettlementTasksQueryResultItem) =>
@@ -295,7 +292,7 @@
});
async function handleAddOrEdit() {
- goDetail(editForm.id, editForm.settlementUrl[0]?.path);
+ goSettlementDetail(editForm.id, editForm.settlementUrl[0]?.path);
}
const {
@@ -337,35 +334,12 @@
handleAdd: handleRechargeAdd,
editForm: rechargeEditForm,
} = useFormDialog({
- onConfirm: rechargeEnterpriseWallet,
defaultFormParams: {
+ access: EnumEnterpriseWalletAccess.Alipay,
amount: null as number,
remark: '',
},
});
-
-const { dialogProps: dialogAlipayWalletProps, handleAdd: handleAlipayWalletAdd } = useFormDialog({
- onConfirm: rechargeEnterpriseWallet,
- defaultFormParams: {
- alipayUrl: '',
- },
-});
-
-async function rechargeEnterpriseWallet() {
- try {
- let params: API.RechargeEnterpriseWalletCommand = {
- access: EnumEnterpriseWalletAccess.Alipay,
- amount: rechargeEditForm.amount,
- remark: rechargeEditForm.remark,
- };
- let res = await enterpriseWalletServices.rechargeEnterpriseWallet(params);
- if (res) {
- handleAlipayWalletAdd({
- alipayUrl: res.payUrl,
- });
- }
- } catch (error) {}
-}
function openSettleDialog(row: API.GetSettlementTasksQueryResultItem) {
handleSettleEdit({
@@ -396,11 +370,11 @@
row: API.GetSettlementTasksQueryResultItem
) {
if (response.path) {
- goDetail(row.id, response.path);
+ goSettlementDetail(row.id, response.path);
}
}
-async function goDetail(id: string, url?: string) {
+async function goSettlementDetail(id: string, url?: string) {
await router.push({
name: 'ServiceChargeDetail',
params: {
@@ -413,6 +387,18 @@
editForm.settlementUrl = [] as UploadUserFile[];
}
+function goDetail(row: API.GetSettlementTasksQueryResultItem, settlement?: string) {
+ router.push({
+ name: 'ServiceChargeDetail',
+ params: {
+ id: row?.id ?? '',
+ },
+ query: {
+ settlement: settlement ? settlement : '',
+ },
+ });
+}
+
function handleExport(val) {
console.log('val: ', val);
}
--
Gitblit v1.9.1