From 94f20f13dbb3b6392a7813a36953be038fea1916 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 05 九月 2025 14:47:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient

---
 src/views/ServiceChargeManage/ServiceChargeDetail.vue |   54 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 8c10aa8..f10c238 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <LoadingLayout :loading="isLoading">
-    <AppScrollContainer>
+    <AppContainer>
       <ChunkCell title="缁撶畻鍗曡鎯�">
         <ProForm :model="form" ref="formRef" label-width="120px" :is-read="true">
           <ProFormCol>
@@ -34,12 +34,12 @@
           <ProFormCol>
             <ProFormColItem :span="8">
               <ProFormItemV2 label="缁撶畻閲戦:" prop="settlementAmount">
-                <ProFormInputNumber v-model="form.settlementAmount"> </ProFormInputNumber>
+                <ProFormText v-model="form.settlementAmount"> </ProFormText>
               </ProFormItemV2>
             </ProFormColItem>
             <ProFormColItem :span="8">
               <ProFormItemV2 label="瀹炲彂閲戦:" prop="actualSettlementAmount">
-                <ProFormInputNumber v-model="form.actualSettlementAmount"> </ProFormInputNumber>
+                <ProFormText v-model="form.actualSettlementAmount"> </ProFormText>
               </ProFormItemV2>
             </ProFormColItem>
           </ProFormCol>
@@ -67,7 +67,7 @@
           </el-steps>
         </div>
       </ChunkCell> -->
-      <ChunkCell title="缁撶畻鍚嶅崟">
+      <ChunkCell title="缁撶畻鍚嶅崟" style="flex: 1">
         <ProTableQueryFilterBar @on-reset="reset">
           <template #query>
             <QueryFilterItem>
@@ -84,7 +84,7 @@
         <ProTableV2
           v-bind="proTableProps"
           :columns="SettlementListColumns"
-          :operationBtns="operationBtns"
+          :show-operation-column="false"
           :auto-height="false"
           ref="proTable"
           :tableProps="{
@@ -93,19 +93,24 @@
         >
         </ProTableV2>
         <div class="chuck-add-or-edit-actions">
-          <el-button @click="handleBack">鍙栨秷</el-button>
-          <el-button class="chuck-add-or-edit-actions" type="primary" @click="handleSubmit"
+          <el-button class="chuck-add-or-edit-actions" @click="handleBack">鍙栨秷</el-button>
+          <el-button
+            v-if="!isDetail"
+            class="chuck-add-or-edit-actions"
+            type="primary"
+            @click="handleSubmit"
             >纭</el-button
           >
         </div>
       </ChunkCell>
-    </AppScrollContainer>
+    </AppContainer>
     <EditAccountInfoDialog v-bind="dialogProps"></EditAccountInfoDialog>
   </LoadingLayout>
 </template>
 <script setup lang="ts">
 import {
   LoadingLayout,
+  AppContainer,
   AppScrollContainer,
   ChunkCell,
   ProForm,
@@ -129,7 +134,7 @@
 import * as taskUserServices from '@/services/api/taskUser';
 import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
 import { Message } from '@bole-core/core';
-import { paginateList } from '@/utils';
+import { paginateList, setOssFileName, toThousand } from '@/utils';
 
 defineOptions({
   name: 'ServiceChargeDetail',
@@ -150,13 +155,15 @@
 ]);
 
 const route = useRoute();
-const id = (route.query.id as string) ?? '';
+const id = (route.params.id as string) ?? '';
 const url = (route.query.url as string) ?? '';
+
+const isDetail = computed(() => !url);
 
 const form = reactive({
   name: '',
-  settlementAmount: 0,
-  actualSettlementAmount: 0,
+  settlementAmount: '',
+  actualSettlementAmount: '',
   code: '',
   settlementOrderName: '',
   settlementOrderTime: '',
@@ -175,11 +182,11 @@
   placeholderData: () => ({} as API.GetSettlementTaskQueryResult),
   onSuccess(data) {
     form.name = data.name;
-    form.settlementAmount = data.settlementAmount;
-    form.actualSettlementAmount = data.actualSettlementAmount;
+    form.settlementAmount = toThousand(data.settlementAmount);
+    form.actualSettlementAmount = toThousand(data.actualSettlementAmount);
     form.code = data.code;
-    form.settlementOrderName = data.settlementOrderName;
-    form.settlementOrderTime = data.settlementOrderTime;
+    form.settlementOrderName = setOssFileName(data.settlementOrderName);
+    form.settlementOrderTime = data.settlementOrderTime ?? '';
   },
   enabled: !!id,
 });
@@ -199,7 +206,7 @@
       };
       let res = await taskUserServices.getSettlementTaskUsers(params);
       if (extraParamState.keywords) {
-        res.data = res.data.filter((item) => {
+        res.data = res.data?.filter((item) => {
           return (
             item.name.includes(extraParamState.keywords) ||
             item.contactPhoneNumber.includes(extraParamState.keywords) ||
@@ -225,7 +232,11 @@
       orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
     },
     queryKey: ['taskUserServices/getSettlementTaskUsers'],
-    columnsRenderProps: {},
+    columnsRenderProps: {
+      settlementTime: { type: 'date' },
+      settlementAmount: { type: 'money' },
+      actualSettlementAmount: { type: 'money' },
+    },
   }
 );
 
@@ -253,7 +264,12 @@
     let params: API.SureTaskSettlementOrderCommand = {
       taskInfoId: id,
       settlementOrderUrl: url,
-      taskInfoUsers: [],
+      taskInfoUsers:
+        proTableProps.value.tableData?.length > 0
+          ? proTableProps.value.tableData.map(
+              (x) => ({ ...x } as API.SureTaskSettlementOrderCommandUser)
+            )
+          : [],
     };
     let res = await taskServices.sureTaskSettlementOrder(params);
     if (res) {

--
Gitblit v1.9.1