From 601f80076bb62e7b3213fda15cabe49eb4d60ccf Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 17 十月 2025 14:24:31 +0800
Subject: [PATCH] feat: 1.2.0.1

---
 src/views/ServiceChargeManage/ServiceChargeManage.vue |   76 +++++++++++++++++++++++++++++++++----
 1 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index be4341d..b0f30e4 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -3,10 +3,10 @@
     <AppContainer>
       <ProTableQueryFilterBar @on-reset="reset">
         <template #query>
-          <QueryFilterItem tip-content="缁撶畻鍗曠姸鎬�">
+          <QueryFilterItem tip-content="楠屾敹鐘舵��">
             <FieldRadio
-              v-model="extraParamState.settlementOrderStatus"
-              :value-enum="EnumTaskSettlementOrderStatusText"
+              v-model="extraParamState.checkReceiveStatus"
+              :value-enum="EnumTaskCheckReceiveStatusTextForFilter"
               buttonStyle
               showAllBtn
               @change="getList()"
@@ -88,8 +88,10 @@
       </ProTableV2>
     </AppContainer>
     <UploadStatementDialog v-bind="dialogProps" />
-    <SettleDetailDialog v-bind="dialogSettleProps" />
+    <!-- <SettleDetailDialog v-bind="dialogSettleProps" /> -->
     <RechargeEnterpriseWalletDialog v-bind="dialogRechargeProps" />
+    <SettlMethodDialog v-bind="dialogSettlMethodProps" />
+    <EditSettleInfoDialog v-bind="dialogSettleInfoProps" />
   </LoadingLayout>
 </template>
 
@@ -115,12 +117,16 @@
   EnumTaskSettlementOrderStatusText,
   EnumTaskSettlementOrderStatus,
   EnumTaskSettlementStatus,
+  EnumTaskCheckReceiveStatusText,
+  EnumTaskCheckReceiveStatusTextForFilter,
+  EnumTaskCheckReceiveStatus,
 } from '@/constants';
 import { downloadFileByUrl, format, setOssFileName } from '@/utils';
 import * as taskServices from '@/services/api/task';
 import { ModelValueType } from 'element-plus';
 import UploadStatementDialog from './components/UploadStatementDialog.vue';
 import SettleDetailDialog from './components/SettleDetailDialog.vue';
+import SettlMethodDialog from './components/SettlMethodDialog.vue';
 import RechargeEnterpriseWalletDialog from './components/RechargeEnterpriseWalletDialog.vue';
 import { Message } from '@bole-core/core';
 
@@ -158,7 +164,7 @@
       name: '缁撶畻',
     },
     emits: {
-      onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role, 'settlement'),
+      onClick: (role: API.GetSettlementTasksQueryResultItem) => openSettleMethodDialog(role),
     },
     extraProps: {
       hide: (role: API.GetSettlementTasksQueryResultItem) =>
@@ -186,11 +192,24 @@
   },
   {
     data: {
+      enCode: 'settleAuditBtn',
+      name: '缁撶畻瀹℃牳',
+    },
+    emits: {
+      onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id),
+    },
+    // extraProps: {
+    //   hide: (role: API.GetSettlementTasksQueryResultItem) =>
+    //     role.settlementOrderStatus === EnumTaskSettlementOrderStatus.Wait,
+    // },
+  },
+  {
+    data: {
       enCode: 'detailBtn',
       name: '璇︽儏',
     },
     emits: {
-      onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role),
+      onClick: (role: API.GetSettlementTasksQueryResultItem) => goDetail(role.id),
     },
     // extraProps: {
     //   hide: (role: API.GetSettlementTasksQueryResultItem) =>
@@ -248,7 +267,7 @@
           orderInput: extraParamState.orderInput,
         },
         keywords: extraParamState.keywords,
-        settlementOrderStatus: extraParamState.settlementOrderStatus,
+        checkReceiveStatus: extraParamState.checkReceiveStatus,
         settlementStatus: extraParamState.settlementStatus,
         settlementTimeBegin: format(extraParamState.time?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
         settlementTimeEnd: format(extraParamState.time?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
@@ -266,6 +285,7 @@
     defaultExtraParams: {
       keywords: '',
       settlementOrderStatus: '' as any as EnumTaskSettlementOrderStatus,
+      checkReceiveStatus: '' as any as EnumTaskCheckReceiveStatus,
       settlementStatus: '' as any as EnumTaskSettlementStatus,
       time: [] as unknown as ModelValueType,
       orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
@@ -400,14 +420,38 @@
   editForm.settlementUrl = [] as UploadUserFile[];
 }
 
-function goDetail(row: API.GetSettlementTasksQueryResultItem, settlement?: string) {
+const {
+  dialogProps: dialogSettlMethodProps,
+  handleAdd: handleSettlMethodAdd,
+  editForm: settlMethodEditForm,
+} = useFormDialog({
+  onConfirm: handleSettlMethod,
+  defaultFormParams: {
+    id: '',
+    settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+  },
+});
+
+function openSettleMethodDialog(row: API.GetSettlementTasksQueryResultItem) {
+  handleSettlMethodAdd({
+    id: row.id,
+    settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+  });
+}
+
+async function handleSettlMethod() {
+  goDetail(settlMethodEditForm.id, 'settlement', settlMethodEditForm.settlementAccess);
+}
+
+function goDetail(id: string, settlement?: string, settlementAccess?: EnumEnterpriseWalletAccess) {
   router.push({
     name: 'ServiceChargeDetail',
     params: {
-      id: row?.id ?? '',
+      id: id ?? '',
     },
     query: {
       settlement: settlement ? settlement : '',
+      settlementAccess: settlementAccess ? settlementAccess : '',
     },
   });
 }
@@ -422,4 +466,18 @@
     '缁撶畻鍗曟ā鏉�'
   );
 }
+
+const {
+  dialogProps: dialogSettleInfoProps,
+  handleEdit: handleSettleInfoEdit,
+  editForm: settleInfoEditForm,
+} = useFormDialog({
+  onConfirm: handleSettleInfo,
+  defaultFormParams: {
+    id: '',
+    actualSettlementAmount: 0,
+  },
+});
+
+async function handleSettleInfo() {}
 </script>

--
Gitblit v1.9.1