From b0222bb0457544f84548bb9237900fe934df6c62 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Wed, 15 Oct 2025 10:26:27 +0800
Subject: [PATCH] v1.9 优化加入费用拆分功能和费用合并功能

---
 src/api/fee/feeDetailSubApi.js      |  4 ----
 src/components/fee/feeDetailSub.vue |  6 +++---
 src/components/fee/mergeFee.vue     | 11 +++--------
 src/components/fee/splitFee.vue     |  7 +++++--
 src/views/fee/feeDetailLang.js      | 20 ++++++++++++++++++++
 5 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/api/fee/feeDetailSubApi.js b/src/api/fee/feeDetailSubApi.js
index 081d12b..75cb558 100644
--- a/src/api/fee/feeDetailSubApi.js
+++ b/src/api/fee/feeDetailSubApi.js
@@ -27,11 +27,7 @@ export function listFee(params) {
       params
     }).then(response => {
       const res = response.data
-      if (res.code === 0) {
         resolve(res)
-      } else {
-        reject(new Error(res.msg || 'Failed to get fee list'))
-      }
     }).catch(error => {
       reject(error)
     })
diff --git a/src/components/fee/feeDetailSub.vue b/src/components/fee/feeDetailSub.vue
index 6714ef5..44f0d27 100644
--- a/src/components/fee/feeDetailSub.vue
+++ b/src/components/fee/feeDetailSub.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="text-right">
         <el-button type="primary" size="small" style="margin-left: 10px"
-          v-if="hasPrivilege('502020090427190001') && feeDetailSubInfo.fee.state === '2008001'" @click="_splitPayFee">
+          v-if="hasPrivilege('502020090427190001') && feeDetailSubInfo.fee.state == '2008001'" @click="_splitPayFee">
           {{ $t('feeDetailSub.split') }}
         </el-button>
       </el-col>
@@ -49,8 +49,8 @@
       </el-col>
     </el-row>
 
-    <merge-fee ref="mergeFee" @merge-success="loadData" />
-    <split-fee ref="splitFee" @split-success="loadData" />
+    <merge-fee ref="mergeFee" @success="loadData" />
+    <split-fee ref="splitFee" @success="loadData" />
   </div>
 </template>
 
diff --git a/src/components/fee/mergeFee.vue b/src/components/fee/mergeFee.vue
index df4c57a..0e6cabd 100644
--- a/src/components/fee/mergeFee.vue
+++ b/src/components/fee/mergeFee.vue
@@ -5,13 +5,8 @@
     width="50%"
     :before-close="closeMergeFeeModel"
   >
-    <el-table :data="[]" border style="width: 100%">
-      <el-table-column align="center">
-        <template >
-          {{ $t('mergeFee.mergeDescription') }}
-        </template>
-      </el-table-column>
-    </el-table>
+  {{ $t('mergeFee.mergeDescription') }}
+
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeMergeFeeModel">{{ $t('mergeFee.cancel') }}</el-button>
       <el-button type="primary" @click="_doMergeFee">{{ $t('mergeFee.confirmMerge') }}</el-button>
@@ -50,7 +45,7 @@ export default {
         const res = await mergePayFee(params)
         if (res.code === 0) {
           this.closeMergeFeeModel()
-          this.$emit('merge-success')
+          this.$emit('success')
           this.$message.success(this.$t('common.operationSuccess'))
         } else {
           this.$message.error(res.msg)
diff --git a/src/components/fee/splitFee.vue b/src/components/fee/splitFee.vue
index eaf0808..da1e460 100644
--- a/src/components/fee/splitFee.vue
+++ b/src/components/fee/splitFee.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="$t('splitFee.title')" :visible.sync="visible" width="50%">
-    <el-form :model="splitFeeInfo" label-width="120px">
+    <el-form :model="splitFeeInfo" label-width="120px" class="text-left">
       <el-form-item :label="$t('splitFee.timePeriod')">
         <div>{{ splitFeeInfo.endTime }} ~ {{ splitFeeInfo.deadlineTime }}</div>
       </el-form-item>
@@ -33,6 +33,8 @@
 
 <script>
 import { splitFee } from '@/api/fee/listCarFeeApi'
+import {dateFormat} from '@/utils/dateUtil'
+import {getCommunityId} from '@/api/community/communityApi'
 
 export default {
   name: 'SplitFee',
@@ -52,7 +54,7 @@ export default {
     open(fee) {
       this.splitFeeInfo = {
         feeId: fee.feeId,
-        endTime: this.$formatDate(fee.endTime),
+        endTime: dateFormat(fee.endTime),
         deadlineTime: this._computeSplitDeadLineTime(fee),
         splitTime: '',
         remark: ''
@@ -71,6 +73,7 @@ export default {
       const data = {
         preFeeId: this.splitFeeInfo.feeId,
         splitTime: this.splitFeeInfo.splitTime,
+        communityId:getCommunityId(),
         remark: this.splitFeeInfo.remark
       }
       
diff --git a/src/views/fee/feeDetailLang.js b/src/views/fee/feeDetailLang.js
index 42d8fb4..b1e9218 100644
--- a/src/views/fee/feeDetailLang.js
+++ b/src/views/fee/feeDetailLang.js
@@ -243,6 +243,16 @@ export const messages = {
     },
     feeDetailSubDemo: {
       openComponent: 'Open Fee Detail Sub Component'
+    },
+    splitFee: {
+      title: 'Split Fee',
+      timePeriod: 'Time Period',
+      splitTime: 'Split Time',
+      splitTimePlaceholder: 'Please select split time',
+      note: 'Note: The split time must be within the billing period',
+      remark: 'Remark',
+      remarkPlaceholder: 'Please enter remark',
+      splitTimeRequired: 'Split time is required'
     }
   },
   zh: {
@@ -488,6 +498,16 @@ export const messages = {
     },
     feeDetailSubDemo: {
       openComponent: '打开费用子详情组件'
+    },
+    splitFee: {
+      title: '拆分费用',
+      timePeriod: '时间段',
+      splitTime: '拆分时间',
+      splitTimePlaceholder: '请选择拆分时间',
+      note: '注意：拆分时间必须在计费时间段内',
+      remark: '备注',
+      remarkPlaceholder: '请输入备注',
+      splitTimeRequired: '拆分时间不能为空'
     }
   }
 }
--
libgit2 0.21.4