From 76d4c8fc70d9dbab836cc06f8c2c0097b596b12d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sat, 12 Jul 2025 17:16:55 +0800
Subject: [PATCH] 优惠需要申请测试中

---
 src/components/fee/addApplyRoomDiscount.vue      |  19 ++++++++++---------
 src/components/fee/addApplyRoomDiscountType.vue  |  37 +++++++------------------------------
 src/components/fee/addFeeDiscount.vue            |   2 +-
 src/components/fee/addPayFeeConfigDiscount.vue   |  77 ++++++++++++++++++++++++++---------------------------------------------------
 src/components/fee/applyRoomDiscountRecord.vue   |   6 ++++--
 src/components/fee/editApplyRoomDiscount.vue     |   6 +++---
 src/components/fee/editApplyRoomDiscountType.vue |  47 +++++++++--------------------------------------
 src/components/fee/editFeeDiscount.vue           |  99 +++++++++++++++++++++++++--------------------------------------------------------------------------
 src/components/fee/reviewApplyRoomDiscount.vue   |   9 ++++++---
 src/views/fee/discountTypeList.vue               |  77 +++++++++++++++--------------------------------------------------------------
 src/views/fee/payFeeConfigDiscountManageList.vue |  23 ++++++++++++-----------
 11 files changed, 118 insertions(+), 284 deletions(-)

diff --git a/src/components/fee/addApplyRoomDiscount.vue b/src/components/fee/addApplyRoomDiscount.vue
index bd05aee..b8b9494 100644
--- a/src/components/fee/addApplyRoomDiscount.vue
+++ b/src/components/fee/addApplyRoomDiscount.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('applyRoomDiscount.add.title')" :visible.sync="visible" width="60%" @close="handleClose">
+  <el-dialog :title="$t('applyRoomDiscount.add.title')" :visible.sync="visible" width="40%" @close="handleClose">
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-form-item :label="$t('applyRoomDiscount.add.room')" prop="roomName">
         <el-input v-model.trim="form.roomName" :placeholder="$t('applyRoomDiscount.add.roomPlaceholder')"
@@ -64,9 +64,10 @@
 </template>
 
 <script>
-import { queryApplyRoomDiscountType ,listRoomsWhereFeeSet} from '@/api/fee/applyRoomDiscountManageApi'
+import { queryApplyRoomDiscountType, listRoomsWhereFeeSet,saveApplyRoomDiscount } from '@/api/fee/applyRoomDiscountManageApi'
 import UploadImageUrl from '@/components/upload/UploadImageUrl'
 import { getCommunityId } from '@/api/community/communityApi'
+import { listFee } from '@/api/fee/feeApi'
 
 export default {
   name: 'AddApplyRoomDiscount',
@@ -130,7 +131,7 @@ export default {
     },
     handleClose() {
       this.$refs.form.resetFields()
-      this.$refs.uploadImage.clear()
+      this.$refs.uploadImage.close()
       this.form = {
         roomName: '',
         roomId: '',
@@ -150,7 +151,7 @@ export default {
         const { data } = await queryApplyRoomDiscountType({
           page: 1,
           row: 50,
-          communityId: this.form.communityId
+          communityId: getCommunityId()
         })
         this.applyTypes = data
       } catch (error) {
@@ -171,7 +172,7 @@ export default {
         const params = {
           page: 1,
           row: 1,
-          communityId: this.form.communityId,
+          communityId: getCommunityId(),
           flag: 0,
           floorNum: parts[0].trim(),
           unitNum: parts[1].trim(),
@@ -199,13 +200,13 @@ export default {
         const params = {
           page: 1,
           row: 50,
-          communityId: this.form.communityId,
+          communityId: getCommunityId(),
           payerObjId: this.form.roomId,
           state: '2008001'
         }
 
-        const { data } = await this.$api.fee.listFee(params)
-        this.feeTypeCds = data.fees
+        const { fees } = await listFee(params)
+        this.feeTypeCds = fees
       } catch (error) {
         console.error('查询费用项失败:', error)
       }
@@ -233,7 +234,7 @@ export default {
     async saveApplyRoomDiscount() {
       try {
         this.form.communityId = getCommunityId()
-        await this.$api.applyRoomDiscount.saveApplyRoomDiscount(this.form)
+        await saveApplyRoomDiscount(this.form)
         this.$message.success(this.$t('applyRoomDiscount.message.saveSuccess'))
         this.visible = false
         this.$emit('success')
diff --git a/src/components/fee/addApplyRoomDiscountType.vue b/src/components/fee/addApplyRoomDiscountType.vue
index 8192c03..f084305 100644
--- a/src/components/fee/addApplyRoomDiscountType.vue
+++ b/src/components/fee/addApplyRoomDiscountType.vue
@@ -1,35 +1,12 @@
 <template>
-  <el-dialog
-    :title="$t('discountType.add.title')"
-    :visible.sync="visible"
-    width="50%"
-    @close="handleClose"
-  >
-    <el-form
-      ref="form"
-      :model="formData"
-      :rules="rules"
-      label-width="120px"
-    >
-      <el-form-item
-        :label="$t('discountType.form.typeName')"
-        prop="typeName"
-      >
-        <el-input
-          v-model="formData.typeName"
-          :placeholder="$t('discountType.form.typeNamePlaceholder')"
-        />
+  <el-dialog :title="$t('discountType.add.title')" :visible.sync="visible" width="40%" @close="handleClose">
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('discountType.form.typeName')" prop="typeName">
+        <el-input v-model="formData.typeName" :placeholder="$t('discountType.form.typeNamePlaceholder')" />
       </el-form-item>
-      <el-form-item
-        :label="$t('discountType.form.typeDesc')"
-        prop="typeDesc"
-      >
-        <el-input
-          v-model="formData.typeDesc"
-          type="textarea"
-          :placeholder="$t('discountType.form.typeDescPlaceholder')"
-          :rows="3"
-        />
+      <el-form-item :label="$t('discountType.form.typeDesc')" prop="typeDesc">
+        <el-input v-model="formData.typeDesc" type="textarea" :placeholder="$t('discountType.form.typeDescPlaceholder')"
+          :rows="3" />
       </el-form-item>
     </el-form>
 
diff --git a/src/components/fee/addFeeDiscount.vue b/src/components/fee/addFeeDiscount.vue
index ed3f4ee..7fb095d 100644
--- a/src/components/fee/addFeeDiscount.vue
+++ b/src/components/fee/addFeeDiscount.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('feeDiscountManage.add.title')" :visible.sync="visible" width="60%" @close="handleClose">
+  <el-dialog :title="$t('feeDiscountManage.add.title')" :visible.sync="visible" width="40%" @close="handleClose">
     <el-form ref="form" :model="addFeeDiscountInfo" label-width="120px" :rules="rules">
       <el-form-item :label="$t('feeDiscountManage.add.discountName')" prop="discountName">
         <el-input v-model.trim="addFeeDiscountInfo.discountName"
diff --git a/src/components/fee/addPayFeeConfigDiscount.vue b/src/components/fee/addPayFeeConfigDiscount.vue
index aa95780..25faec6 100644
--- a/src/components/fee/addPayFeeConfigDiscount.vue
+++ b/src/components/fee/addPayFeeConfigDiscount.vue
@@ -1,77 +1,51 @@
 <template>
-  <el-dialog
-    :title="$t('addPayFeeConfigDiscount.addTitle')"
-    :visible.sync="visible"
-    width="800px"
-    :close-on-click-modal="false"
-    @closed="resetForm"
-  >
+  <el-dialog :title="$t('addPayFeeConfigDiscount.addTitle')" :visible.sync="visible" width="800px"
+    :close-on-click-modal="false" @closed="resetForm">
     <el-form ref="form" :model="form" :rules="rules" label-width="160px">
       <el-form-item :label="$t('addPayFeeConfigDiscount.discountType')" prop="discountType">
-        <el-select
-          v-model="form.discountType"
-          :placeholder="$t('addPayFeeConfigDiscount.requiredPlaceholder')"
-          @change="changeDiscountType"
-          style="width: 100%"
-        >
+        <el-select v-model="form.discountType" :placeholder="$t('addPayFeeConfigDiscount.requiredPlaceholder')"
+          @change="changeDiscountType" style="width: 100%">
           <el-option disabled value="">{{ $t('addPayFeeConfigDiscount.selectDiscountType') }}</el-option>
-          <el-option value="1001">{{ $t('addPayFeeConfigDiscount.discount') }}</el-option>
-          <el-option value="2002">{{ $t('addPayFeeConfigDiscount.penalty') }}</el-option>
+          <el-option value="1001" :label="$t('addPayFeeConfigDiscount.discount')">{{
+            $t('addPayFeeConfigDiscount.discount') }}</el-option>
+          <el-option value="2002" :label="$t('addPayFeeConfigDiscount.penalty')">{{
+            $t('addPayFeeConfigDiscount.penalty') }}</el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('addPayFeeConfigDiscount.discountName')" prop="discountId">
-        <el-select
-          v-model="form.discountId"
-          :placeholder="$t('addPayFeeConfigDiscount.requiredPlaceholder')"
-          style="width: 100%"
-        >
+        <el-select v-model="form.discountId" :placeholder="$t('addPayFeeConfigDiscount.requiredPlaceholder')"
+          style="width: 100%">
           <el-option disabled value="">{{ $t('addPayFeeConfigDiscount.selectDiscountName') }}</el-option>
-          <el-option
-            v-for="item in discounts"
-            :key="item.discountId"
-            :label="item.discountName"
-            :value="item.discountId"
-          />
+          <el-option v-for="item in discounts" :key="item.discountId" :label="item.discountName"
+            :value="item.discountId" />
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('addPayFeeConfigDiscount.paymentPeriod')" required>
         <el-col :span="11">
           <el-form-item prop="startTime">
-            <el-date-picker
-              v-model="form.startTime"
-              type="datetime"
-              :placeholder="$t('addPayFeeConfigDiscount.startTimePlaceholder')"
-              style="width: 100%"
-            />
+            <el-date-picker v-model="form.startTime" type="datetime"
+              :placeholder="$t('addPayFeeConfigDiscount.startTimePlaceholder')" style="width: 100%"
+              value-format="yyyy-MM-dd HH:mm:ss" />
           </el-form-item>
           <div class="el-form-item__tip">{{ $t('addPayFeeConfigDiscount.paymentPeriodTip') }}</div>
         </el-col>
         <el-col :span="2" class="text-center">-</el-col>
         <el-col :span="11">
           <el-form-item prop="endTime">
-            <el-date-picker
-              v-model="form.endTime"
-              type="datetime"
-              :placeholder="$t('addPayFeeConfigDiscount.endTimePlaceholder')"
-              style="width: 100%"
-            />
+            <el-date-picker v-model="form.endTime" type="datetime"
+              :placeholder="$t('addPayFeeConfigDiscount.endTimePlaceholder')" style="width: 100%"
+              value-format="yyyy-MM-dd HH:mm:ss" />
           </el-form-item>
         </el-col>
       </el-form-item>
 
-      <el-form-item
-        v-if="form.discountType !== '2002'"
-        :label="$t('addPayFeeConfigDiscount.discountEndTime')"
-        prop="payMaxEndTime"
-      >
-        <el-date-picker
-          v-model="form.payMaxEndTime"
-          type="datetime"
-          :placeholder="$t('addPayFeeConfigDiscount.discountEndTimePlaceholder')"
-          style="width: 100%"
-        />
+      <el-form-item v-if="form.discountType !== '2002'" :label="$t('addPayFeeConfigDiscount.discountEndTime')"
+        prop="payMaxEndTime">
+        <el-date-picker v-model="form.payMaxEndTime" type="datetime"
+          :placeholder="$t('addPayFeeConfigDiscount.discountEndTimePlaceholder')" style="width: 100%"
+          value-format="yyyy-MM-dd HH:mm:ss" />
         <div class="el-form-item__tip">{{ $t('addPayFeeConfigDiscount.discountEndTimeTip') }}</div>
       </el-form-item>
     </el-form>
@@ -144,7 +118,7 @@ export default {
     },
     async changeDiscountType() {
       if (!this.form.discountType) return
-      
+
       try {
         const params = {
           page: 1,
@@ -161,7 +135,7 @@ export default {
     async savePayFeeConfigDiscount() {
       this.$refs.form.validate(async valid => {
         if (!valid) return
-        
+
         try {
           this.loading = true
           await savePayFeeConfigDiscount(this.form)
@@ -183,6 +157,7 @@ export default {
 .text-center {
   text-align: center;
 }
+
 .el-form-item__tip {
   text-align: left;
   color: #999;
diff --git a/src/components/fee/applyRoomDiscountRecord.vue b/src/components/fee/applyRoomDiscountRecord.vue
index 6e253d5..9ec703e 100644
--- a/src/components/fee/applyRoomDiscountRecord.vue
+++ b/src/components/fee/applyRoomDiscountRecord.vue
@@ -96,8 +96,10 @@ export default {
         isTrue: null,
         communityId: ''
       }
-      this.$refs.uploadImageUrl.clear()
-      this.$refs.uploadVedio.clear()
+      setTimeout(() => {
+        this.$refs.uploadImageUrl.clearImages()
+        this.$refs.uploadVedio.clear()
+      }, 500)
     },
     handleClose() {
       this.visible = false
diff --git a/src/components/fee/editApplyRoomDiscount.vue b/src/components/fee/editApplyRoomDiscount.vue
index 36d8d72..9a0fdf2 100644
--- a/src/components/fee/editApplyRoomDiscount.vue
+++ b/src/components/fee/editApplyRoomDiscount.vue
@@ -93,17 +93,17 @@ export default {
         ...data,
         communityId: getCommunityId()
       }
-      this.$nextTick(() => {
+      setTimeout(() => {
         if (this.$refs.uploadImage) {
           this.$refs.uploadImage.setImages(this.form.urls || [])
         }
-      })
+      }, 500)
       this.visible = true
     },
     handleClose() {
       this.$refs.form.resetFields()
       if (this.$refs.uploadImage) {
-        this.$refs.uploadImage.clear()
+        this.$refs.uploadImage.close()
       }
       this.form = {
         ardId: '',
diff --git a/src/components/fee/editApplyRoomDiscountType.vue b/src/components/fee/editApplyRoomDiscountType.vue
index aba29cb..423fd8c 100644
--- a/src/components/fee/editApplyRoomDiscountType.vue
+++ b/src/components/fee/editApplyRoomDiscountType.vue
@@ -1,44 +1,15 @@
 <template>
-  <el-dialog
-    :title="$t('discountType.edit.title')"
-    :visible.sync="visible"
-    width="50%"
-    @close="handleClose"
-  >
-    <el-form
-      ref="form"
-      :model="formData"
-      :rules="rules"
-      label-width="120px"
-    >
-      <el-form-item
-        :label="$t('discountType.form.applyType')"
-        prop="applyType"
-      >
-        <el-input
-          v-model="formData.applyType"
-          disabled
-        />
+  <el-dialog :title="$t('discountType.edit.title')" :visible.sync="visible" width="40%" @close="handleClose">
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('discountType.form.applyType')" prop="applyType">
+        <el-input v-model="formData.applyType" disabled />
       </el-form-item>
-      <el-form-item
-        :label="$t('discountType.form.typeName')"
-        prop="typeName"
-      >
-        <el-input
-          v-model="formData.typeName"
-          :placeholder="$t('discountType.form.typeNamePlaceholder')"
-        />
+      <el-form-item :label="$t('discountType.form.typeName')" prop="typeName">
+        <el-input v-model="formData.typeName" :placeholder="$t('discountType.form.typeNamePlaceholder')" />
       </el-form-item>
-      <el-form-item
-        :label="$t('discountType.form.typeDesc')"
-        prop="typeDesc"
-      >
-        <el-input
-          v-model="formData.typeDesc"
-          type="textarea"
-          :placeholder="$t('discountType.form.typeDescPlaceholder')"
-          :rows="3"
-        />
+      <el-form-item :label="$t('discountType.form.typeDesc')" prop="typeDesc">
+        <el-input v-model="formData.typeDesc" type="textarea" :placeholder="$t('discountType.form.typeDescPlaceholder')"
+          :rows="3" />
       </el-form-item>
     </el-form>
 
diff --git a/src/components/fee/editFeeDiscount.vue b/src/components/fee/editFeeDiscount.vue
index 0ee6a5d..1fc45f4 100644
--- a/src/components/fee/editFeeDiscount.vue
+++ b/src/components/fee/editFeeDiscount.vue
@@ -1,85 +1,36 @@
 <template>
-  <el-dialog
-    :title="$t('feeDiscountManage.edit.title')"
-    :visible.sync="visible"
-    width="60%"
-    @close="handleClose"
-  >
-    <el-form
-      ref="form"
-      :model="editFeeDiscountInfo"
-      label-width="120px"
-      :rules="rules"
-    >
-      <el-form-item
-        :label="$t('feeDiscountManage.edit.discountName')"
-        prop="discountName"
-      >
-        <el-input
-          v-model.trim="editFeeDiscountInfo.discountName"
-          :placeholder="$t('feeDiscountManage.edit.discountNamePlaceholder')"
-        />
+  <el-dialog :title="$t('feeDiscountManage.edit.title')" :visible.sync="visible" width="40%" @close="handleClose">
+    <el-form ref="form" :model="editFeeDiscountInfo" label-width="120px" :rules="rules">
+      <el-form-item :label="$t('feeDiscountManage.edit.discountName')" prop="discountName">
+        <el-input v-model.trim="editFeeDiscountInfo.discountName"
+          :placeholder="$t('feeDiscountManage.edit.discountNamePlaceholder')" />
       </el-form-item>
-      <el-form-item
-        :label="$t('feeDiscountManage.edit.discountType')"
-        prop="discountType"
-      >
-        <el-select
-          v-model="editFeeDiscountInfo.discountType"
-          :placeholder="$t('feeDiscountManage.edit.discountTypePlaceholder')"
-          style="width:100%"
-          @change="_changeEditFeeDiscountType"
-        >
-          <el-option
-            v-for="item in editFeeDiscountInfo.discountTypes"
-            :key="item.statusCd"
-            :label="item.name"
-            :value="item.statusCd"
-          />
+      <el-form-item :label="$t('feeDiscountManage.edit.discountType')" prop="discountType">
+        <el-select v-model="editFeeDiscountInfo.discountType"
+          :placeholder="$t('feeDiscountManage.edit.discountTypePlaceholder')" style="width:100%"
+          @change="_changeEditFeeDiscountType">
+          <el-option v-for="item in editFeeDiscountInfo.discountTypes" :key="item.statusCd" :label="item.name"
+            :value="item.statusCd" />
         </el-select>
       </el-form-item>
-      <el-form-item
-        :label="$t('feeDiscountManage.edit.rule')"
-        prop="ruleId"
-      >
-        <el-select
-          v-model="editFeeDiscountInfo.ruleId"
-          :placeholder="$t('feeDiscountManage.edit.rulePlaceholder')"
-          style="width:100%"
-          @change="_changeEditFeeDiscountRule"
-        >
-          <el-option
-            v-for="item in editFeeDiscountInfo.rules"
-            :key="item.ruleId"
-            :label="item.ruleName"
-            :value="item.ruleId"
-          />
+      <el-form-item :label="$t('feeDiscountManage.edit.rule')" prop="ruleId">
+        <el-select v-model="editFeeDiscountInfo.ruleId" :placeholder="$t('feeDiscountManage.edit.rulePlaceholder')"
+          style="width:100%" @change="_changeEditFeeDiscountRule">
+          <el-option v-for="item in editFeeDiscountInfo.rules" :key="item.ruleId" :label="item.ruleName"
+            :value="item.ruleId" />
         </el-select>
       </el-form-item>
-      <el-form-item
-        v-for="(item,index) in editFeeDiscountInfo.feeDiscountRuleSpecs"
-        :key="index"
-        :label="item.specName"
-        :prop="'feeDiscountRuleSpecs.' + index + '.specValue'"
-        :rules="{
+      <el-form-item v-for="(item, index) in editFeeDiscountInfo.feeDiscountRuleSpecs" :key="index" :label="item.specName"
+        :prop="'feeDiscountRuleSpecs.' + index + '.specValue'" :rules="{
           required: true,
-          message: $t('feeDiscountManage.edit.specValueRequired', {specName: item.specName}),
+          message: $t('feeDiscountManage.edit.specValueRequired', { specName: item.specName }),
           trigger: 'blur'
-        }"
-      >
-        <el-input
-          v-model.trim="item.specValue"
-          type="number"
-          :placeholder="item.remark"
-        />
+        }">
+        <el-input v-model.trim="item.specValue" type="number" :placeholder="item.remark" />
       </el-form-item>
       <el-form-item :label="$t('feeDiscountManage.edit.discountDesc')">
-        <el-input
-          v-model.trim="editFeeDiscountInfo.discountDesc"
-          type="textarea"
-          :placeholder="$t('feeDiscountManage.edit.discountDescPlaceholder')"
-          :rows="3"
-        />
+        <el-input v-model.trim="editFeeDiscountInfo.discountDesc" type="textarea"
+          :placeholder="$t('feeDiscountManage.edit.discountDescPlaceholder')" :rows="3" />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -164,7 +115,7 @@ export default {
     },
     async _loadEditFeeDiscountRules() {
       if (!this.editFeeDiscountInfo.discountType) return
-      
+
       try {
         const params = {
           page: 1,
@@ -196,7 +147,7 @@ export default {
     async editFeeDiscount() {
       this.$refs.form.validate(async valid => {
         if (!valid) return
-        
+
         try {
           await updateFeeDiscount(this.editFeeDiscountInfo)
           this.$message.success(this.$t('common.saveSuccess'))
diff --git a/src/components/fee/reviewApplyRoomDiscount.vue b/src/components/fee/reviewApplyRoomDiscount.vue
index 1a952f4..8057451 100644
--- a/src/components/fee/reviewApplyRoomDiscount.vue
+++ b/src/components/fee/reviewApplyRoomDiscount.vue
@@ -103,6 +103,7 @@
 import { queryFeeDiscount, updateReviewApplyRoomDiscount } from '@/api/fee/applyRoomDiscountManageApi'
 import ViewImage from '@/components/system/viewImage'
 import { getCommunityId } from '@/api/community/communityApi'
+import { queryFeeDetail } from '@/api/fee/propertyFeeApi'
 
 export default {
   name: 'ReviewApplyRoomDiscount',
@@ -228,14 +229,14 @@ export default {
     },
     async loadFees() {
       try {
-        const { data } = await this.$api.fee.queryFeeDetail({
+        const { feeDetails } = await queryFeeDetail({
           page: 1,
           row: 50,
           communityId: this.form.communityId,
           feeId: this.form.feeId,
           state: '1400'
         })
-        this.fees = data.feeDetails
+        this.fees = feeDetails
       } catch (error) {
         console.error('加载缴费记录失败:', error)
       }
@@ -266,7 +267,9 @@ export default {
       return `/callComponent/download/getFile/file?fileId=${url}&communityId=-1&time=${new Date().getTime()}`
     },
     showImage(url) {
-      this.$refs.viewImage.open(this.getImageUrl(url))
+      setTimeout(() => {
+        this.$refs.viewImage.open(this.getImageUrl(url))
+      }, 100)
     },
     submitForm() {
       this.$refs.form.validate(valid => {
diff --git a/src/views/fee/discountTypeList.vue b/src/views/fee/discountTypeList.vue
index f507efd..7ecb8bc 100644
--- a/src/views/fee/discountTypeList.vue
+++ b/src/views/fee/discountTypeList.vue
@@ -2,23 +2,15 @@
   <div class="discount-type-container">
     <!-- 查询条件 -->
     <el-card class="search-card">
-      <div slot="header" class="clearfix">
+      <div slot="header" class="flex justify-between">
         <span>{{ $t('discountType.search.title') }}</span>
       </div>
       <el-row :gutter="20">
         <el-col :span="6">
-          <el-input
-            v-model.trim="searchForm.applyType"
-            :placeholder="$t('discountType.search.applyType')"
-            clearable
-          />
+          <el-input v-model.trim="searchForm.applyType" :placeholder="$t('discountType.search.applyType')" clearable />
         </el-col>
         <el-col :span="6">
-          <el-input
-            v-model.trim="searchForm.typeName"
-            :placeholder="$t('discountType.search.typeName')"
-            clearable
-          />
+          <el-input v-model.trim="searchForm.typeName" :placeholder="$t('discountType.search.typeName')" clearable />
         </el-col>
         <el-col :span="4">
           <el-button type="primary" @click="handleSearch">
@@ -30,7 +22,7 @@
 
     <!-- 列表 -->
     <el-card class="list-card">
-      <div slot="header" class="clearfix">
+      <div slot="header" class="flex justify-between">
         <span>{{ $t('discountType.list.title') }}</span>
         <div style="float: right;">
           <el-button type="primary" size="small" @click="handleAdd">
@@ -42,65 +34,26 @@
         </div>
       </div>
 
-      <el-table
-        v-loading="loading"
-        :data="tableData"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="applyType"
-          :label="$t('discountType.table.applyType')"
-          align="center"
-        />
-        <el-table-column
-          prop="typeName"
-          :label="$t('discountType.table.typeName')"
-          align="center"
-        />
-        <el-table-column
-          prop="typeDesc"
-          :label="$t('discountType.table.typeDesc')"
-          align="center"
-        />
-        <el-table-column
-          prop="createTime"
-          :label="$t('discountType.table.createTime')"
-          align="center"
-        />
-        <el-table-column
-          :label="$t('common.operation')"
-          align="center"
-          width="200"
-        >
+      <el-table v-loading="loading" :data="tableData" border style="width: 100%">
+        <el-table-column prop="applyType" :label="$t('discountType.table.applyType')" align="center" />
+        <el-table-column prop="typeName" :label="$t('discountType.table.typeName')" align="center" />
+        <el-table-column prop="typeDesc" :label="$t('discountType.table.typeDesc')" align="center" />
+        <el-table-column prop="createTime" :label="$t('discountType.table.createTime')" align="center" />
+        <el-table-column :label="$t('common.operation')" align="center" width="200">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              @click="handleEdit(scope.row)"
-            >
+            <el-button size="mini" type="primary" @click="handleEdit(scope.row)">
               {{ $t('common.edit') }}
             </el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              @click="handleDelete(scope.row)"
-            >
+            <el-button size="mini" type="danger" @click="handleDelete(scope.row)">
               {{ $t('common.delete') }}
             </el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <el-pagination
-        :current-page.sync="page.current"
-        :page-sizes="[10, 20, 30, 50]"
-        :page-size="page.size"
-        :total="page.total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination :current-page.sync="page.current" :page-sizes="[10, 20, 30, 50]" :page-size="page.size"
+        :total="page.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange" />
     </el-card>
 
     <!-- 组件 -->
diff --git a/src/views/fee/payFeeConfigDiscountManageList.vue b/src/views/fee/payFeeConfigDiscountManageList.vue
index 339ece6..0665349 100644
--- a/src/views/fee/payFeeConfigDiscountManageList.vue
+++ b/src/views/fee/payFeeConfigDiscountManageList.vue
@@ -18,7 +18,11 @@
 
     <el-table :data="payFeeConfigDiscounts" border style="width: 100%">
       <el-table-column prop="configDiscountId" :label="$t('payFeeConfigDiscountManage.discountId')" align="center" />
-      <el-table-column prop="feeName" :label="$t('payFeeConfigDiscountManage.feeName')" align="center" />
+      <el-table-column prop="feeName" :label="$t('payFeeConfigDiscountManage.feeName')" align="center" >
+        <template >
+          {{ feeName }}
+        </template>
+      </el-table-column>
       <el-table-column prop="discountName" :label="$t('payFeeConfigDiscountManage.discountName')" align="center" />
       <el-table-column :label="$t('payFeeConfigDiscountManage.rule')" align="center">
         <template slot-scope="scope">
@@ -29,7 +33,8 @@
       </el-table-column>
       <el-table-column :label="$t('payFeeConfigDiscountManage.discountType')" align="center">
         <template slot-scope="scope">
-          {{ scope.row.discountType === '1001' ? $t('payFeeConfigDiscountManage.discount') : $t('payFeeConfigDiscountManage.penalty') }}
+          {{ scope.row.discountType === '1001' ? $t('payFeeConfigDiscountManage.discount') :
+            $t('payFeeConfigDiscountManage.penalty') }}
         </template>
       </el-table-column>
       <el-table-column :label="$t('payFeeConfigDiscountManage.paymentPeriod')" align="center">
@@ -55,15 +60,9 @@
         <div>{{ $t('payFeeConfigDiscountManage.currentYearTip2') }}</div>
       </el-col>
       <el-col :span="3" class="text-right">
-        <el-pagination
-          :current-page.sync="page.current"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="page.size"
-          :total="page.total"
-          layout="total, prev, pager, next"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-        />
+        <el-pagination :current-page.sync="page.current" :page-sizes="[10, 20, 30, 50]" :page-size="page.size"
+          :total="page.total" layout="total, prev, pager, next" @size-change="handleSizeChange"
+          @current-change="handleCurrentChange" />
       </el-col>
     </el-row>
 
@@ -145,9 +144,11 @@ export default {
   .margin-top-xs {
     margin-top: 20px;
   }
+
   .text-right {
     text-align: right;
   }
+
   .discount-desc {
     text-align: left;
     font-size: 13px;
--
libgit2 0.21.4