From ab1ebb3cfd864717c68e39507f74587bf5eba458 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sat, 19 Jul 2025 16:17:11 +0800
Subject: [PATCH] 缴费支持 押金 优惠券 优惠折扣 账户等功能

---
 src/api/fee/payFeeOrderApi.js                    |   8 ++++----
 src/components/fee/payFeeCoupon.vue              |  45 +++++++++------------------------------------
 src/components/fee/payFeeDeposit.vue             |  18 +++++++++---------
 src/components/fee/payFeeDiscount.vue            |  88 +++++++++++++++++++++++++---------------------------------------------------------------
 src/components/fee/payFeeUserAccount.vue         | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------
 src/components/fee/refundDepositFee.vue          |  10 +++++-----
 src/components/fee/roomCreateFeeAdd.vue          |   5 +++--
 src/views/fee/batchPayFeeOrderLang.js            |  26 --------------------------
 src/views/fee/batchPayFeeOrderList.vue           |  68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 src/views/fee/owePayFeeOrderList.vue             | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------
 src/views/fee/payFeeConfigDiscountManageList.vue |   2 +-
 src/views/fee/payFeeOrderLang.js                 |  40 ----------------------------------------
 src/views/fee/payFeeOrderList.vue                | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
 src/views/fee/refundDepositFeeLang.js            |  28 ++++++++++++++++++++++++----
 14 files changed, 350 insertions(+), 393 deletions(-)

diff --git a/src/api/fee/payFeeOrderApi.js b/src/api/fee/payFeeOrderApi.js
index 39a2730..0f3cc81 100644
--- a/src/api/fee/payFeeOrderApi.js
+++ b/src/api/fee/payFeeOrderApi.js
@@ -38,7 +38,7 @@ export function computePayFeeCoupon(params) {
   return new Promise((resolve, reject) => {
     const communityId = getCommunityId()
     request({
-      url: '/coupon/computePayFeeCoupon',
+      url: '/coupon.computePayFeeCoupon',
       method: 'get',
       params: { ...params, communityId }
     }).then(response => {
@@ -54,7 +54,7 @@ export function queryCommunityOwnerAccount(params) {
   return new Promise((resolve, reject) => {
     const communityId = getCommunityId()
     request({
-      url: '/account/queryCommunityOwnerAccount',
+      url: '/account.queryCommunityOwnerAccount',
       method: 'get',
       params: { ...params, communityId }
     }).then(response => {
@@ -70,7 +70,7 @@ export function queryFeeDeposit(params) {
   return new Promise((resolve, reject) => {
     const communityId = getCommunityId()
     request({
-      url: '/fee/queryFeeDeposit',
+      url: '/fee.queryFeeDeposit',
       method: 'get',
       params: { ...params, communityId, state: '1400' }
     }).then(response => {
@@ -86,7 +86,7 @@ export function refundFeeDeposit(data) {
   return new Promise((resolve, reject) => {
     data.communityId = getCommunityId()
     request({
-      url: '/fee/refundFeeDeposit',
+      url: '/fee.refundFeeDeposit',
       method: 'post',
       data
     }).then(response => {
diff --git a/src/components/fee/payFeeCoupon.vue b/src/components/fee/payFeeCoupon.vue
index d50fe9a..e7b1af1 100644
--- a/src/components/fee/payFeeCoupon.vue
+++ b/src/components/fee/payFeeCoupon.vue
@@ -1,51 +1,25 @@
 <template>
-  <el-dialog
-    :title="$t('payFeeCoupon.title')"
-    :visible.sync="dialogVisible"
-    width="70%"
-    @close="handleClose"
-  >
     <el-card v-if="feeCoupons.length > 0">
-      <div slot="header" class="clearfix">
+      <div slot="header" class="flex justify-between">
         <span>{{ $t('payFeeCoupon.couponInfo') }}</span>
       </div>
 
-      <el-table
-        :data="feeCoupons"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="ruleName"
-          align="center"
-          :label="$t('payFeeCoupon.ruleName')"
-        />
-        <el-table-column
-          prop="couponName"
-          align="center"
-          :label="$t('payFeeCoupon.couponName')"
-        />
-        <el-table-column
-          prop="quantity"
-          align="center"
-          :label="$t('payFeeCoupon.quantity')"
-        >
+      <el-table :data="feeCoupons" border style="width: 100%">
+        <el-table-column prop="ruleName" align="center" :label="$t('payFeeCoupon.ruleName')" />
+        <el-table-column prop="couponName" align="center" :label="$t('payFeeCoupon.couponName')" />
+        <el-table-column prop="quantity" align="center" :label="$t('payFeeCoupon.quantity')">
           <template slot-scope="scope">
             {{ scope.row.quantity }}{{ $t('payFeeCoupon.unit') }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="toTypeName"
-          align="center"
-          :label="$t('payFeeCoupon.purpose')"
-        />
+        <el-table-column prop="toTypeName" align="center" :label="$t('payFeeCoupon.purpose')" />
       </el-table>
     </el-card>
-  </el-dialog>
 </template>
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
+import { computePayFeeCoupon } from '@/api/fee/payFeeOrderApi'
 
 export default {
   name: 'PayFeeCoupon',
@@ -65,7 +39,6 @@ export default {
       this.cycles = params.cycles || 1
       this.endTime = params.endTime || ''
       this.listFeeCoupons()
-      this.dialogVisible = true
     },
     close() {
       this.dialogVisible = false
@@ -82,8 +55,8 @@ export default {
           endTime: this.endTime
         }
 
-        const response = await this.$http.get('/coupon.computePayFeeCoupon', { params })
-        this.feeCoupons = response.data.data || []
+        const response = await computePayFeeCoupon(params)
+        this.feeCoupons = response.data || []
       } catch (error) {
         console.error('查询优惠券信息失败:', error)
       }
diff --git a/src/components/fee/payFeeDeposit.vue b/src/components/fee/payFeeDeposit.vue
index 5d592f4..9c2cf17 100644
--- a/src/components/fee/payFeeDeposit.vue
+++ b/src/components/fee/payFeeDeposit.vue
@@ -1,7 +1,7 @@
 <template>
-  <el-dialog :title="$t('payFeeDeposit.title')" :visible.sync="dialogVisible" width="80%" @close="handleClose">
-    <el-card v-if="fees.length > 0">
-      <div slot="header" class="clearfix">
+  <div>
+    <el-card v-if="fees.length > 0" class="margin-bottom-sm">
+      <div slot="header" class="flex justify-between">
         <span>{{ $t('payFeeDeposit.depositInfo') }}</span>
         <el-button type="primary" size="small" style="float: right;" @click="queryPayFeeDeposit">
           <i class="el-icon-refresh"></i>
@@ -29,13 +29,14 @@
       </el-table>
     </el-card>
 
-    <refund-deposit-fee ref="refundDepositFee"></refund-deposit-fee>
-  </el-dialog>
+    <refund-deposit-fee ref="refundDepositFee" @success="listFeeDeposit"></refund-deposit-fee>
+  </div>
 </template>
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
 import RefundDepositFee from './refundDepositFee'
+import { queryFeeDeposit } from '@/api/fee/payFeeOrderApi'
 
 export default {
   name: 'PayFeeDeposit',
@@ -58,7 +59,6 @@ export default {
       this.payerObjType = params.payerObjType
       this.ownerId = params.ownerId || ''
       this.listFeeDeposit()
-      this.dialogVisible = true
     },
     close() {
       this.dialogVisible = false
@@ -75,9 +75,9 @@ export default {
           state: '1400'
         }
 
-        const response = await this.$http.get('/fee.queryFeeDeposit', { params })
-        if (response.data.code === 0) {
-          this.fees = response.data.data || []
+        const response = await queryFeeDeposit(params)
+        if (response.code === 0) {
+          this.fees = response.data || []
         }
       } catch (error) {
         console.error('查询押金信息失败:', error)
diff --git a/src/components/fee/payFeeDiscount.vue b/src/components/fee/payFeeDiscount.vue
index 7c39af9..2a9ad9a 100644
--- a/src/components/fee/payFeeDiscount.vue
+++ b/src/components/fee/payFeeDiscount.vue
@@ -1,72 +1,34 @@
 <template>
-  <el-dialog
-    :title="$t('payFeeDiscount.title')"
-    :visible.sync="dialogVisible"
-    width="80%"
-    @close="handleClose"
-  >
     <el-card v-if="shouldShowDiscounts">
-      <div slot="header" class="clearfix">
+      <div slot="header" class="flex justify-between">
         <span>{{ $t('payFeeDiscount.discountInfo') }}</span>
       </div>
 
-      <el-table
-        :data="feeDiscounts"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          align="center"
-          width="60"
-        >
+      <el-table :data="feeDiscounts" border style="width: 100%">
+        <el-table-column align="center" width="60">
           <template slot-scope="scope">
-            <el-checkbox
-              v-model="selectDiscountIds"
-              :label="scope.row.discountId"
-              @change="computeFeeDiscount"
-            ></el-checkbox>
+            <el-checkbox v-model="selectDiscountIds" :label="scope.row.discountId"
+              @change="computeFeeDiscount"></el-checkbox>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="discountType"
-          align="center"
-          :label="$t('payFeeDiscount.discountType')"
-        >
+        <el-table-column prop="discountType" align="center" :label="$t('payFeeDiscount.discountType')">
           <template slot-scope="scope">
             {{ getDiscountTypeName(scope.row.discountType) }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="discountName"
-          align="center"
-          :label="$t('payFeeDiscount.discountName')"
-        />
-        <el-table-column
-          prop="ruleName"
-          align="center"
-          :label="$t('payFeeDiscount.ruleName')"
-        />
-        <el-table-column
-          align="center"
-          :label="$t('payFeeDiscount.rule')"
-        >
+        <el-table-column prop="discountName" align="center" :label="$t('payFeeDiscount.discountName')" />
+        <el-table-column prop="ruleName" align="center" :label="$t('payFeeDiscount.ruleName')" />
+        <el-table-column align="center" :label="$t('payFeeDiscount.rule')">
           <template slot-scope="scope">
-            <div v-for="(item,index) in scope.row.feeDiscountSpecs" :key="index">
+            <div v-for="(item, index) in scope.row.feeDiscountSpecs" :key="index">
               {{ item.specName }}：{{ item.specValue }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          :label="$t('payFeeDiscount.discountAmount')"
-        >
+        <el-table-column align="center" :label="$t('payFeeDiscount.discountAmount')">
           <template slot="header">
             <span>{{ $t('payFeeDiscount.discountAmount') }}</span>
-            <el-tooltip 
-              effect="dark" 
-              :content="$t('payFeeDiscount.discountTooltip')" 
-              placement="top"
-            >
+            <el-tooltip effect="dark" :content="$t('payFeeDiscount.discountTooltip')" placement="top">
               <i class="el-icon-info" style="margin-left:5px"></i>
             </el-tooltip>
           </template>
@@ -77,12 +39,13 @@
         </el-table-column>
       </el-table>
     </el-card>
-  </el-dialog>
+
 </template>
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
-import {dateAdd} from '@/utils/dateUtil'
+import { dateAdd } from '@/utils/dateUtil'
+import { computeFeeDiscount } from '@/api/fee/payFeeOrderApi'
 
 export default {
   name: 'PayFeeDiscount',
@@ -117,7 +80,6 @@ export default {
       this.custEndTime = params.custEndTime
       this.cycles = params.cycles || 1
       this.listFeeDiscounts()
-      this.dialogVisible = true
     },
     close() {
       this.dialogVisible = false
@@ -126,7 +88,7 @@ export default {
       try {
         this.communityId = await getCommunityId()
         let cycles = this.cycles
-        
+
         const params = {
           page: 1,
           row: 20,
@@ -139,8 +101,8 @@ export default {
           custEndTime: this.custEndTime ? dateAdd(this.custEndTime) : ''
         }
 
-        const response = await this.$http.get('/feeDiscount/computeFeeDiscount', { params })
-        this.feeDiscounts = response.data.data || []
+        const response = await computeFeeDiscount(params)
+        this.feeDiscounts = response.data || []
         this.selectDiscountIds = this.feeDiscounts.map(item => item.discountId)
         this.computeFeeDiscount()
       } catch (error) {
@@ -166,7 +128,7 @@ export default {
     computeFeeDiscount() {
       let totalDiscountMoney = 0.0
       let selectDiscount = []
-      
+
       this.selectDiscountIds.forEach(item => {
         this.feeDiscounts.forEach(disItem => {
           if (disItem.feeDiscountSpecs && disItem.feeDiscountSpecs.length > 0) {
@@ -176,12 +138,12 @@ export default {
                 specValue = feeItem.specValue
               }
             })
-            if ((disItem.discountType === '1001' || disItem.discountType === '3003') && 
-                parseFloat(this.cycles) < parseFloat(specValue)) {
+            if ((disItem.discountType === '1001' || disItem.discountType === '3003') &&
+              parseFloat(this.cycles) < parseFloat(specValue)) {
               return
             }
           }
-          
+
           if (item === disItem.discountId && disItem.discountPrice !== 0 && disItem.ruleId !== "102020008") {
             if (disItem.feeDiscountSpecs && disItem.feeDiscountSpecs.length > 0) {
               let specValue = ""
@@ -207,8 +169,8 @@ export default {
               }
             }
           } else if (item === disItem.discountId && disItem.ruleId === "102020008") {
-            if (disItem.feeDiscountSpecs != null && disItem.feeDiscountSpecs != undefined && 
-                disItem.feeDiscountSpecs.length > 0) {
+            if (disItem.feeDiscountSpecs != null && disItem.feeDiscountSpecs != undefined &&
+              disItem.feeDiscountSpecs.length > 0) {
               let specValue = ""
               disItem.feeDiscountSpecs.forEach(feeItem => {
                 if (feeItem.specName === this.$t('payFeeDiscount.monthSpec')) {
@@ -222,7 +184,7 @@ export default {
           }
         })
       })
-      
+
       this.totalDiscountMoney = totalDiscountMoney
       this.$emit('changeDiscountPrice', {
         totalDiscountMoney,
diff --git a/src/components/fee/payFeeUserAccount.vue b/src/components/fee/payFeeUserAccount.vue
index 22c1ade..2280c75 100644
--- a/src/components/fee/payFeeUserAccount.vue
+++ b/src/components/fee/payFeeUserAccount.vue
@@ -1,72 +1,31 @@
 <template>
-  <el-dialog
-    :title="$t('payFeeUserAccount.title')"
-    :visible.sync="dialogVisible"
-    width="70%"
-    @close="handleClose"
-  >
-    <el-card v-if="accountList.length > 0">
-      <div slot="header" class="clearfix">
+  <div>
+    <el-card v-if="accountList.length > 0" class="margin-bottom-sm">
+      <div slot="header" class="flex justify-between">
         <span>{{ $t('payFeeUserAccount.accountInfo') }}</span>
-        <el-button
-          type="primary"
-          size="small"
-          style="float: right;"
-          @click="queryPayFeeUserAccount"
-        >
+        <el-button type="primary" size="small" style="float: right;" @click="queryPayFeeUserAccount">
           <i class="el-icon-refresh"></i>
           {{ $t('payFeeUserAccount.refresh') }}
         </el-button>
       </div>
 
-      <el-table
-        :data="accountList"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          align="center"
-          :label="$t('payFeeUserAccount.select')"
-          width="80"
-        >
+      <el-table :data="accountList" border style="width: 100%">
+        <el-table-column align="center" :label="$t('payFeeUserAccount.select')" width="80">
           <template slot-scope="scope">
-            <el-radio
-              v-model="selectedAccount"
-              :label="scope.row.acctId"
-              @change="computeFeeUserAmount(scope.row.acctId)"
-            ></el-radio>
+            <el-checkbox v-model="selectedAccounts" :value="scope.row.acctId"
+              @change="(checked) => handleAccountChange(scope.row.acctId, checked)"></el-checkbox>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="acctTypeName"
-          align="center"
-          :label="$t('payFeeUserAccount.accountType')"
-        />
-        <el-table-column
-          prop="acctName"
-          align="center"
-          :label="$t('payFeeUserAccount.accountName')"
-        />
-        <el-table-column
-          prop="amount"
-          align="center"
-          :label="$t('payFeeUserAccount.accountAmount')"
-        >
+        <el-table-column prop="acctTypeName" align="center" :label="$t('payFeeUserAccount.accountType')" />
+        <el-table-column prop="acctName" align="center" :label="$t('payFeeUserAccount.accountName')" />
+        <el-table-column prop="amount" align="center" :label="$t('payFeeUserAccount.accountAmount')">
           <template slot-scope="scope">
             {{ scope.row.amount }} {{ $t('payFeeUserAccount.yuan') }}
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          :label="$t('payFeeUserAccount.operation')"
-          width="150"
-        >
+        <el-table-column align="center" :label="$t('payFeeUserAccount.operation')" width="150">
           <template slot-scope="scope">
-            <el-button
-              type="primary"
-              size="mini"
-              @click="openAddUserAmountModal(scope.row)"
-            >
+            <el-button type="primary" size="mini" @click="openAddUserAmountModal(scope.row)">
               <i class="el-icon-plus"></i>
               {{ $t('payFeeUserAccount.prestore') }}
             </el-button>
@@ -74,22 +33,22 @@
         </el-table-column>
       </el-table>
     </el-card>
-  </el-dialog>
+  </div>
 </template>
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
+import { queryCommunityOwnerAccount } from '@/api/fee/payFeeOrderApi'
 
 export default {
   name: 'PayFeeUserAccount',
   data() {
     return {
-      dialogVisible: false,
       accountList: [],
       feeId: '',
       ownerId: '',
       communityId: '',
-      selectedAccount: null
+      selectedAccounts: [] // 改为数组，支持多选
     }
   },
   methods: {
@@ -97,7 +56,6 @@ export default {
       this.feeId = params.feeId
       this.ownerId = params.ownerId || ''
       this.listUserAccount()
-      this.dialogVisible = true
     },
     close() {
       this.dialogVisible = false
@@ -113,8 +71,8 @@ export default {
           communityId: this.communityId
         }
 
-        const response = await this.$http.get('/account.queryCommunityOwnerAccount', { params })
-        this.accountList = response.data.data || []
+        const response = await queryCommunityOwnerAccount(params)
+        this.accountList = response.data || []
       } catch (error) {
         console.error('查询用户账户失败:', error)
       }
@@ -125,17 +83,53 @@ export default {
     openAddUserAmountModal(userAccount) {
       window.open(`/#/views/owner/ownerDetail?ownerId=${userAccount.objId}&currentTab=ownerDetailAccount`)
     },
-    computeFeeUserAmount(acctId) {
+    // 新增：处理账户选择变化
+    handleAccountChange(acctId, checked) {
+      console.log('选中的账户ID:', acctId, '是否选中:', checked)
+      console.log('当前selectedAccounts:', this.selectedAccounts)
+      
+      // 确保 selectedAccounts 是数组
+      if (!Array.isArray(this.selectedAccounts)) {
+        this.selectedAccounts = []
+      }
+      
+      if (checked) {
+        // 添加到选中数组
+        if (!this.selectedAccounts.includes(acctId)) {
+          this.selectedAccounts.push(acctId)
+        }
+      } else {
+        // 从选中数组中移除
+        const index = this.selectedAccounts.indexOf(acctId)
+        if (index > -1) {
+          this.selectedAccounts.splice(index, 1)
+        }
+      }
+      
+      console.log('更新后的selectedAccounts:', this.selectedAccounts)
+      this.computeFeeUserAmount()
+    },
+    // 修复：computeFeeUserAmount 方法
+    computeFeeUserAmount() {
+      console.log('计算费用，选中的账户:', this.selectedAccounts)
+      
       let totalUserAmount = 0.0
       let selectAccount = []
-      
+
+      // 确保 selectedAccounts 是数组
+      if (!Array.isArray(this.selectedAccounts)) {
+        this.selectedAccounts = []
+      }
+
       this.accountList.forEach(item => {
-        if (acctId === item.acctId && item.amount != 0) {
+        if (this.selectedAccounts.includes(item.acctId) && item.amount != 0) {
           totalUserAmount += parseFloat(item.amount)
           selectAccount.push(item)
         }
       })
 
+      console.log('计算的总金额:', totalUserAmount, '选中的账户列表:', selectAccount)
+
       this.$emit('changeUserAmountPrice', {
         totalUserAmount,
         accountList: this.accountList,
@@ -147,7 +141,7 @@ export default {
     },
     handleClose() {
       this.accountList = []
-      this.selectedAccount = null
+      this.selectedAccounts = [] // 清空选中的账户
       this.feeId = ''
       this.ownerId = ''
     }
diff --git a/src/components/fee/refundDepositFee.vue b/src/components/fee/refundDepositFee.vue
index 9bd7a2a..3fcaa2d 100644
--- a/src/components/fee/refundDepositFee.vue
+++ b/src/components/fee/refundDepositFee.vue
@@ -12,14 +12,15 @@
     ></el-alert>
 
     <div slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">{{ $t('refundDepositFee.cancel') }}</el-button>
-      <el-button type="primary" @click="refundDepositFee">{{ $t('refundDepositFee.confirm') }}</el-button>
+      <el-button @click="dialogVisible = false">{{ $t('common.cancel') }}</el-button>
+      <el-button type="primary" @click="refundDepositFee">{{ $t('common.confirm') }}</el-button>
     </div>
   </el-dialog>
 </template>
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
+import { refundFeeDeposit } from '@/api/fee/payFeeOrderApi'
 
 export default {
   name: 'RefundDepositFee',
@@ -41,11 +42,10 @@ export default {
       try {
         this.refundData.communityId = await getCommunityId()
         
-        const response = await this.$http.post('/fee.refundFeeDeposit', this.refundData)
-        if (response.data.code === 0) {
+        const response = await refundFeeDeposit(this.refundData)
+        if (response.code === 0) {
           this.$message.success(this.$t('refundDepositFee.success'))
           this.$emit('success')
-          this.dialogVisible = false
         } else {
           this.$message.error(response.data.msg)
         }
diff --git a/src/components/fee/roomCreateFeeAdd.vue b/src/components/fee/roomCreateFeeAdd.vue
index 1b4d1e7..a54376b 100644
--- a/src/components/fee/roomCreateFeeAdd.vue
+++ b/src/components/fee/roomCreateFeeAdd.vue
@@ -65,6 +65,7 @@
 <script>
 import { saveRoomCreateFee, listFeeConfigs } from '@/api/fee/roomCreateFeeAddApi'
 import { getDict, getCommunityId } from '@/api/community/communityApi'
+import { dateFormat,addMonth } from '@/utils/dateUtil'
 
 export default {
   name: 'RoomCreateFeeAdd',
@@ -135,8 +136,8 @@ export default {
 
     handleFeeTypeChange(value) {
       if (value === '888800010006' || value === '888800010014') {
-        this.formData.startTime = this.$dayjs().format('YYYY-MM-DD')
-        this.formData.endTime = this.$dayjs().add(1, 'month').format('YYYY-MM-DD')
+        this.formData.startTime = dateFormat(new Date())
+        this.formData.endTime = dateFormat(addMonth(new Date(),1))
       }
 
       this.formData.configId = ''
diff --git a/src/views/fee/batchPayFeeOrderLang.js b/src/views/fee/batchPayFeeOrderLang.js
index 2820e7e..6f932b3 100644
--- a/src/views/fee/batchPayFeeOrderLang.js
+++ b/src/views/fee/batchPayFeeOrderLang.js
@@ -26,19 +26,6 @@ export const messages = {
       preSave: 'Pre-save',
       yuan: 'yuan'
     },
-    payFeeDeposit: {
-      title: 'Deposit Information',
-      payerObj: 'Payer Object',
-      feeItem: 'Fee Item',
-      timePeriod: 'Time Period',
-      amount: 'Amount',
-      payTime: 'Payment Time',
-      refund: 'Refund Deposit'
-    },
-    refundDepositFee: {
-      title: 'Confirm Operation',
-      confirmText: 'After the deposit is refunded, it will be automatically deposited into the account. You can choose to pay from the account. If you refund cash to the owner, please go to the business homepage to refund the deposit!'
-    },
     batchPayConfirm: {
       title: 'Payment Confirmation',
       amount: 'Amount:',
@@ -94,19 +81,6 @@ export const messages = {
       preSave: '预存',
       yuan: '元'
     },
-    payFeeDeposit: {
-      title: '押金信息',
-      payerObj: '收费对象',
-      feeItem: '费用项',
-      timePeriod: '时间段',
-      amount: '金额',
-      payTime: '缴费时间',
-      refund: '退押金'
-    },
-    refundDepositFee: {
-      title: '请确认您的操作!',
-      confirmText: '押金退款后自动存到账户中，您可以从账户中选择缴费，如果退现金给业主，请到业务首页面退押金！'
-    },
     batchPayConfirm: {
       title: '收费确认',
       amount: '金额：',
diff --git a/src/views/fee/batchPayFeeOrderList.vue b/src/views/fee/batchPayFeeOrderList.vue
index 0a96893..9bdfe2a 100644
--- a/src/views/fee/batchPayFeeOrderList.vue
+++ b/src/views/fee/batchPayFeeOrderList.vue
@@ -20,7 +20,8 @@
             }}</el-button>
           </div>
 
-          <el-table :data="batchPayFeeOrderInfo.batchFees" border style="width: 100%" v-loading="loading">
+          <el-table :data="batchPayFeeOrderInfo.batchFees" border style="width: 100%" v-loading="loading"
+            @selection-change="handleSelectionChange" ref="batchFeeTable">
             <el-table-column type="selection" width="55" align="center"></el-table-column>
             <el-table-column prop="feeTypeCdName" :label="$t('batchPayFeeOrder.feeType')"
               align="center"></el-table-column>
@@ -76,7 +77,8 @@
           </el-table>
         </el-card>
         <div class="margin-top">
-          <pay-fee-user-account ref="payFeeUserAccount"></pay-fee-user-account>
+          <pay-fee-user-account ref="payFeeUserAccount"
+            @changeUserAmountPrice="changeUserAmountPrice"></pay-fee-user-account>
         </div>
         <pay-fee-deposit ref="payFeeDeposit"></pay-fee-deposit>
 
@@ -115,7 +117,7 @@ import PayFeeDeposit from '@/components/fee/payFeeDeposit'
 import BatchPayConfirm from '@/components/fee/batchPayConfirm'
 import BatchFeeCycle from '@/components/fee/batchFeeCycle'
 import { listFee, listFeeObj } from '@/api/fee/batchPayFeeOrderApi'
-import {dateFormat,dateAdd} from '@/utils/dateUtil'
+import { dateFormat, dateAdd } from '@/utils/dateUtil'
 
 export default {
   name: 'BatchPayFeeOrderList',
@@ -149,6 +151,33 @@ export default {
     this._initData()
   },
   methods: {
+    // 新增：处理表格选择变化
+    handleSelectionChange(selection) {
+      console.log('选中的行:', selection)
+
+      // 更新 selectPayFeeIds 数组
+      this.batchPayFeeOrderInfo.selectPayFeeIds = selection.map(item => item.feeId)
+
+      console.log('更新后的 selectPayFeeIds:', this.batchPayFeeOrderInfo.selectPayFeeIds)
+
+      // 重新计算总费用
+      this._doComputeTotalFee()
+    },
+
+    // 新增：设置表格选中状态
+    setTableSelection() {
+      // 根据 selectPayFeeIds 设置表格的选中状态
+      this.$nextTick(() => {
+        if (this.$refs.batchFeeTable) {
+          this.batchPayFeeOrderInfo.batchFees.forEach(row => {
+            if (this.batchPayFeeOrderInfo.selectPayFeeIds.includes(row.feeId)) {
+              this.$refs.batchFeeTable.toggleRowSelection(row, true)
+            }
+          })
+        }
+      })
+    },
+
     async _initData() {
       const ownerId = this.$route.query.ownerId
       const payerObjType = this.$route.query.payerObjType
@@ -164,8 +193,10 @@ export default {
 
       await this._loadBatchFees()
 
-      this.$refs.payFeeUserAccount._listUserAccount(1, 20)
-      this.$refs.payFeeDeposit._listFeeDeposit(1, 20)
+      setTimeout(() => {
+        this.$refs.payFeeUserAccount.open({ ownerId: this.batchPayFeeOrderInfo.ownerId })
+        this.$refs.payFeeDeposit.open({ payerObjId: this.batchPayFeeOrderInfo.ownerId, payerObjType: this.batchPayFeeOrderInfo.payerObjType })
+      }, 1000)
     },
 
     async _loadBatchFees() {
@@ -181,7 +212,7 @@ export default {
         }
 
         const res = await listFee(params)
-     
+
         let _batchFees = []
         let _selectPayFeeIds = []
 
@@ -205,6 +236,9 @@ export default {
 
         this._pushPayObjs()
         this._doComputeTotalFee()
+
+        // 设置表格选中状态
+        this.setTableSelection()
       } catch (error) {
         console.error('请求失败:', error)
       } finally {
@@ -271,7 +305,17 @@ export default {
       })
 
       this.batchPayFeeOrderInfo.batchFees = _batchFees
+
+      // 更新 selectPayFeeIds，只保留当前显示的费用ID
+      const currentFeeIds = _batchFees.map(fee => fee.feeId)
+      this.batchPayFeeOrderInfo.selectPayFeeIds = this.batchPayFeeOrderInfo.selectPayFeeIds.filter(id =>
+        currentFeeIds.includes(id)
+      )
+
       this._doComputeTotalFee()
+
+      // 重新设置表格选中状态
+      this.setTableSelection()
     },
 
     _openPayFee(payType) {
@@ -403,6 +447,18 @@ export default {
 
     _settingsFeeCycle(batchFee) {
       this.$refs.batchFeeCycle.open(batchFee)
+    },
+
+    changeUserAmountPrice(data) {
+      this.batchPayFeeOrderInfo.accountAmount = data.totalUserAmount;
+      if (data.selectAccount && data.selectAccount.length > 0) {
+        data.selectAccount.forEach(_acct => {
+          if (_acct.acctType == '2003') {
+            this.batchPayFeeOrderInfo.acctId = _acct.acctId;
+          }
+        })
+      }
+      this._doComputeTotalFee();
     }
   }
 }
diff --git a/src/views/fee/owePayFeeOrderList.vue b/src/views/fee/owePayFeeOrderList.vue
index e930c7f..ed0da9f 100644
--- a/src/views/fee/owePayFeeOrderList.vue
+++ b/src/views/fee/owePayFeeOrderList.vue
@@ -4,34 +4,21 @@
       <div slot="header" class="clearfix">
         <span>{{ owePayFeeOrderInfo.roomName }}</span>
         <div class="card-header-actions">
-          <el-button 
-            type="primary" 
-            size="small" 
-            @click="_printOwnOrder()"
-            v-if="owePayFeeOrderInfo.oweFees.length > 0">
+          <el-button type="primary" size="small" @click="_printOwnOrder()" v-if="owePayFeeOrderInfo.oweFees.length > 0">
             {{ $t('owePayFeeOrder.printNotice1') }}
           </el-button>
-          <el-button 
-            type="primary" 
-            size="small" 
-            @click="_printOwnOrder2()"
+          <el-button type="primary" size="small" @click="_printOwnOrder2()"
             v-if="owePayFeeOrderInfo.oweFees.length > 0">
             {{ $t('owePayFeeOrder.printNotice2') }}
           </el-button>
-          <el-button 
-            type="primary" 
-            size="small" 
-            @click="_goBack()">
+          <el-button type="primary" size="small" @click="_goBack()">
             <i class="el-icon-close"></i>
             {{ $t('common.back') }}
           </el-button>
         </div>
       </div>
 
-      <el-table
-        :data="owePayFeeOrderInfo.oweFees"
-        border
-        style="width: 100%">
+      <el-table :data="owePayFeeOrderInfo.oweFees" border style="width: 100%">
         <el-table-column type="selection" width="55" @selection-change="handleSelectionChange"></el-table-column>
         <el-table-column prop="payerObjName" :label="$t('owePayFeeOrder.payerObj')" align="center"></el-table-column>
         <el-table-column prop="feeTypeCdName" :label="$t('owePayFeeOrder.feeType')" align="center"></el-table-column>
@@ -59,20 +46,12 @@
           <span>{{ $t('owePayFeeOrder.yuan') }}</span>
         </el-col>
         <el-col :span="2">
-          <el-button 
-            type="success" 
-            size="medium" 
-            @click="_openPayFee('qrCode')"
-            class="pay-btn">
+          <el-button type="success" size="medium" @click="_openPayFee('qrCode')" class="pay-btn">
             {{ $t('owePayFeeOrder.scanPay') }}
           </el-button>
         </el-col>
         <el-col :span="2">
-          <el-button 
-            type="primary" 
-            size="medium" 
-            @click="_payFee()"
-            class="pay-btn">
+          <el-button type="primary" size="medium" @click="_payFee()" class="pay-btn">
             {{ $t('owePayFeeOrder.pay') }}
           </el-button>
         </el-col>
@@ -80,10 +59,7 @@
     </el-card>
 
     <!-- 缴费确认弹窗 -->
-    <el-dialog 
-      :title="$t('owePayFeeOrder.paymentConfirm')" 
-      :visible.sync="showPayModal"
-      width="50%">
+    <el-dialog :title="$t('owePayFeeOrder.paymentConfirm')" :visible.sync="showPayModal" width="50%">
       <el-form label-width="120px">
         <el-form-item :label="$t('owePayFeeOrder.room')">
           <span>{{ owePayFeeOrderInfo.roomName }}</span>
@@ -93,62 +69,40 @@
           <span>{{ $t('owePayFeeOrder.yuan') }}</span>
         </el-form-item>
         <el-form-item :label="$t('owePayFeeOrder.paymentMethod')" required>
-          <el-select 
-            v-model="owePayFeeOrderInfo.primeRate" 
-            style="width:100%"
+          <el-select v-model="owePayFeeOrderInfo.primeRate" style="width:100%"
             :placeholder="$t('owePayFeeOrder.selectPaymentMethod')">
-            <el-option
-              v-for="item in filteredPrimeRates"
-              :key="item.statusCd"
-              :label="item.name"
+            <el-option v-for="item in filteredPrimeRates" :key="item.statusCd" :label="item.name"
               :value="item.statusCd">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('owePayFeeOrder.remark')">
-          <el-input
-            type="textarea"
-            :placeholder="$t('owePayFeeOrder.inputRemark')"
-            v-model="owePayFeeOrderInfo.remark">
+          <el-input type="textarea" :placeholder="$t('owePayFeeOrder.inputRemark')" v-model="owePayFeeOrderInfo.remark">
           </el-input>
         </el-form-item>
-        <el-form-item 
-          v-if="owePayFeeOrderInfo.payType === 'qrCode'"
-          :label="$t('owePayFeeOrder.authCode')">
-          <el-input
-            v-model="owePayFeeOrderInfo.authCode"
-            :placeholder="$t('owePayFeeOrder.scanCodeTip')"
+        <el-form-item v-if="owePayFeeOrderInfo.payType === 'qrCode'" :label="$t('owePayFeeOrder.authCode')">
+          <el-input v-model="owePayFeeOrderInfo.authCode" :placeholder="$t('owePayFeeOrder.scanCodeTip')"
             @keyup.enter.native="_qrCodePayFee">
           </el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="_closeDoOwePayFeeModal()">{{ $t('common.close') }}</el-button>
-        <el-button 
-          type="primary" 
-          @click="_doPayFee()"
-          v-if="owePayFeeOrderInfo.payType === 'common'">
+        <el-button type="primary" @click="_doPayFee()" v-if="owePayFeeOrderInfo.payType === 'common'">
           {{ $t('owePayFeeOrder.confirmPayment') }}
         </el-button>
       </span>
     </el-dialog>
 
     <!-- 缴费结果弹窗 -->
-    <el-dialog 
-      :title="$t('owePayFeeOrder.paymentTip')" 
-      :visible.sync="showResultModal"
-      width="30%">
+    <el-dialog :title="$t('owePayFeeOrder.paymentTip')" :visible.sync="showResultModal" width="30%">
       <p>{{ $t('owePayFeeOrder.paymentSuccess') }}</p>
       <span slot="footer" class="dialog-footer">
         <el-button @click="_back()">{{ $t('common.back') }}</el-button>
-        <el-button 
-          type="primary" 
-          @click="_printAndBack('ON')">
+        <el-button type="primary" @click="_printAndBack('ON')">
           {{ $t('owePayFeeOrder.mergePrint') }}
         </el-button>
-        <el-button 
-          type="primary" 
-          @click="_printAndBack('OFF')">
+        <el-button type="primary" @click="_printAndBack('OFF')">
           {{ $t('owePayFeeOrder.printReceipt') }}
         </el-button>
       </span>
@@ -162,7 +116,7 @@
 import { getDict } from '@/api/community/communityApi'
 import { getCommunityId } from '@/api/community/communityApi'
 import { dateFormat } from '@/utils/dateUtil'
-import { 
+import {
   listOweFees,
   payOweFee,
   qrCodePayment,
@@ -221,7 +175,7 @@ export default {
     async _initData() {
       const _payObjId = this.$route.query.payObjId
       const _payObjType = this.$route.query.payObjType
-      
+
       if (!_payObjId) {
         this.$message.error(this.$t('owePayFeeOrder.illegalOperation'))
         this.$router.go(-1)
@@ -237,11 +191,11 @@ export default {
       await this._loadPrimeRates()
       await this._listFeePrintPages()
     },
-    
+
     handleSelectionChange(val) {
       this.owePayFeeOrderInfo.selectPayFeeIds = val.map(item => item.feeId)
     },
-    
+
     async _loadOweFees() {
       try {
         const params = {
@@ -251,30 +205,30 @@ export default {
           payObjId: this.owePayFeeOrderInfo.payObjId,
           payObjType: this.owePayFeeOrderInfo.payObjType,
         }
-        
+
         const { data } = await listOweFees(params)
-        
+
         if (data.length < 1) {
           this.owePayFeeOrderInfo.oweFees = []
           this.$message.warning(this.$t('owePayFeeOrder.noOweData'))
           return
         }
-        
+
         this.owePayFeeOrderInfo.oweFees = data
         this.owePayFeeOrderInfo.selectPayFeeIds = data.map(item => item.feeId)
         this.owePayFeeOrderInfo.toFixedSign = data[0].val
-        
+
         this.owePayFeeOrderInfo.oweFees.forEach(item => {
           item.receivableAmount = item.feeTotalPrice
           item.feePrice = item.feeTotalPrice
         })
-        
+
         this._dealSelectFee()
       } catch (error) {
         console.error('获取欠费数据失败:', error)
       }
     },
-    
+
     async _loadPrimeRates() {
       try {
         const data = await getDict('pay_fee_detail', 'prime_rate')
@@ -283,7 +237,7 @@ export default {
         console.error('获取支付方式失败:', error)
       }
     },
-    
+
     async _listFeePrintPages() {
       try {
         const params = {
@@ -292,7 +246,7 @@ export default {
           state: 'T',
           communityId: this.communityId
         }
-        
+
         const { data } = await listFeePrintPages(params)
         if (data && data.length > 0) {
           this.owePayFeeOrderInfo.printUrl = data[0].url
@@ -301,7 +255,7 @@ export default {
         console.error('获取打印页面失败:', error)
       }
     },
-    
+
     _payFee() {
       if (this.owePayFeeOrderInfo.selectPayFeeIds.length <= 0) {
         this.$message.warning(this.$t('owePayFeeOrder.noSelectedFee'))
@@ -310,7 +264,7 @@ export default {
       this.showPayModal = true
       this.owePayFeeOrderInfo.payType = 'common'
     },
-    
+
     _openPayFee() {
       if (this.owePayFeeOrderInfo.selectPayFeeIds.length <= 0) {
         this.$message.warning(this.$t('owePayFeeOrder.noSelectedFee'))
@@ -319,11 +273,11 @@ export default {
       this.showPayModal = true
       this.owePayFeeOrderInfo.payType = 'qrCode'
     },
-    
+
     _closeDoOwePayFeeModal() {
       this.showPayModal = false
     },
-    
+
     _getPayFees() {
       const _fees = []
       this.owePayFeeOrderInfo.selectPayFeeIds.forEach(_item => {
@@ -341,25 +295,25 @@ export default {
       })
       return _fees
     },
-    
+
     async _doPayFee() {
       if (!this.owePayFeeOrderInfo.primeRate) {
         this.$message.warning(this.$t('owePayFeeOrder.selectPaymentMethod'))
         return
       }
-      
+
       const _fees = this._getPayFees()
       if (_fees.length < 1) {
         this.$message.warning(this.$t('owePayFeeOrder.noSelectedFeeItem'))
         return
       }
-      
+
       const _data = {
         communityId: this.communityId,
         fees: _fees,
         remark: this.owePayFeeOrderInfo.remark
       }
-      
+
       try {
         const res = await payOweFee(_data)
         if (res.code === 0) {
@@ -373,19 +327,19 @@ export default {
         this.$message.error(error)
       }
     },
-    
+
     async _qrCodePayFee() {
       if (!this.owePayFeeOrderInfo.primeRate) {
         this.$message.warning(this.$t('owePayFeeOrder.selectPaymentMethod'))
         return
       }
-      
+
       const _fees = this._getPayFees()
       if (_fees.length < 1) {
         this.$message.warning(this.$t('owePayFeeOrder.noSelectedFeeItem'))
         return
       }
-      
+
       const _data = {
         communityId: this.communityId,
         fees: _fees,
@@ -394,7 +348,7 @@ export default {
         receivedAmount: this.owePayFeeOrderInfo.feePrices,
         subServiceCode: 'fee.payOweFee'
       }
-      
+
       try {
         const res = await qrCodePayment(_data)
         if (res.code === 404) {
@@ -416,14 +370,14 @@ export default {
         this.$message.error(error)
       }
     },
-    
+
     async _qrCodeCheckPayFinish() {
       const _fees = this._getPayFees()
       if (_fees.length < 1) {
         this.$message.warning(this.$t('owePayFeeOrder.noSelectedFeeItem'))
         return
       }
-      
+
       const _data = {
         communityId: this.communityId,
         fees: _fees,
@@ -434,7 +388,7 @@ export default {
         paymentPoolId: this.owePayFeeOrderInfo.paymentPoolId,
         subServiceCode: 'fee.payOweFee'
       }
-      
+
       try {
         const res = await checkPayFinish(_data)
         if (res.code === 404) {
@@ -451,7 +405,7 @@ export default {
         this.$message.error(error)
       }
     },
-    
+
     _doDealPayResult(res) {
       this._closeDoOwePayFeeModal()
       const _data = res.data
@@ -460,26 +414,26 @@ export default {
         _detailIds += (item + ',')
       })
       this.owePayFeeOrderInfo.detailIds = _detailIds
-      
+
       setTimeout(() => {
         this.showResultModal = true
       }, 2000)
-      
+
       this.owePayFeeOrderInfo.selectPayFeeIds = []
       this._loadOweFees()
       this.$message.success(res.msg)
     },
-    
+
     _back() {
       this.showResultModal = false
       this.$router.go(-1)
     },
-    
+
     _printAndBack(merge) {
       this.showResultModal = false
       window.open(`${this.owePayFeeOrderInfo.printUrl}?detailIds=${this.owePayFeeOrderInfo.detailIds}&merge=${merge}`)
     },
-    
+
     _dealSelectFee() {
       let totalFee = 0.00
       this.owePayFeeOrderInfo.selectPayFeeIds.forEach(_item => {
@@ -490,15 +444,15 @@ export default {
       })
       this.owePayFeeOrderInfo.feePrices = Math.round(totalFee * 100, 2) / 100
     },
-    
+
     _goBack() {
       this.$router.go(-1)
     },
-    
+
     _printOwnOrder() {
       window.open(`/#/views/fee/printOweFee?payObjId=${this.owePayFeeOrderInfo.payObjId}&payObjType=${this.owePayFeeOrderInfo.payObjType}&payObjName=${this.owePayFeeOrderInfo.roomName}`)
     },
-    
+
     _printOwnOrder2() {
       this.$refs.printOwnFee.open({
         payObjId: this.owePayFeeOrderInfo.payObjId,
@@ -506,7 +460,7 @@ export default {
         payObjName: this.owePayFeeOrderInfo.roomName
       })
     },
-    
+
     _getDeadlineTime(fee) {
       if (fee.amountOwed === 0 && fee.endTime === fee.deadlineTime) {
         return "-"
@@ -516,7 +470,7 @@ export default {
       }
       return dateFormat(fee.deadlineTime)
     },
-    
+
     _getEndTime(fee) {
       if (fee.state === '2009001') {
         return "-"
@@ -530,41 +484,41 @@ export default {
 <style lang="scss" scoped>
 .owe-pay-fee-order-container {
   padding: 20px;
-  
+
   .box-card {
     margin-bottom: 20px;
-    
+
     .clearfix {
       display: flex;
       justify-content: space-between;
       align-items: center;
     }
-    
+
     .card-header-actions {
       .el-button {
         margin-left: 10px;
       }
     }
   }
-  
+
   .footer-row {
     margin-top: 20px;
     display: flex;
     align-items: center;
-    
+
     .amount-col {
       display: flex;
       align-items: center;
       justify-content: flex-end;
       padding-right: 20px;
-      
+
       .amount-text {
         font-size: 30px;
         color: red;
         padding: 0 5px;
       }
     }
-    
+
     .pay-btn {
       width: 100%;
     }
diff --git a/src/views/fee/payFeeConfigDiscountManageList.vue b/src/views/fee/payFeeConfigDiscountManageList.vue
index 0665349..db29d3f 100644
--- a/src/views/fee/payFeeConfigDiscountManageList.vue
+++ b/src/views/fee/payFeeConfigDiscountManageList.vue
@@ -3,7 +3,7 @@
     <div slot="header">
       <el-row type="flex" justify="space-between" align="middle">
         <el-col :span="12" class="text-left">
-          <h5>{{ $t('payFeeConfigDiscountManage.title') }}</h5>
+          <span>{{ $t('payFeeConfigDiscountManage.title') }}</span>
         </el-col>
         <el-col :span="12" class="text-right">
           <el-button type="primary" size="small" @click="goBack">
diff --git a/src/views/fee/payFeeOrderLang.js b/src/views/fee/payFeeOrderLang.js
index 5891423..e6f1fd5 100644
--- a/src/views/fee/payFeeOrderLang.js
+++ b/src/views/fee/payFeeOrderLang.js
@@ -100,26 +100,6 @@ export const messages = {
       yuan: 'yuan',
       prestore: 'Prestore'
     },
-    payFeeDeposit: {
-      title: 'Deposit Information',
-      depositInfo: 'Deposit Information',
-      refresh: 'Refresh',
-      payerObj: 'Payer Object',
-      feeName: 'Fee Item',
-      timeRange: 'Time Range',
-      amount: 'Amount',
-      paymentTime: 'Payment Time',
-      operation: 'Operation',
-      refund: 'Refund'
-    },
-    refundDepositFee: {
-      title: 'Please confirm your operation!',
-      alertText: 'After the deposit is refunded, it will be automatically deposited into the account. You can choose to pay from the account. If you refund cash to the owner, please go to the business home page to refund the deposit!',
-      cancel: 'Cancel',
-      confirm: 'Confirm',
-      success: 'Refund deposit successfully',
-      error: 'Refund deposit failed'
-    },
     payFeeOrderResult: {
       title: 'Payment Prompt',
       success: 'Payment successful',
@@ -290,26 +270,6 @@ export const messages = {
       yuan: '元',
       prestore: '预存'
     },
-    payFeeDeposit: {
-      title: '押金信息',
-      depositInfo: '押金信息',
-      refresh: '刷新',
-      payerObj: '收费对象',
-      feeName: '费用项',
-      timeRange: '时间段',
-      amount: '金额',
-      paymentTime: '缴费时间',
-      operation: '操作',
-      refund: '退押金'
-    },
-    refundDepositFee: {
-      title: '请确认您的操作!',
-      alertText: '押金退款后自动存到账户中，您可以从账户中选择缴费，如果退现金给业主，请到业务首页面退押金！',
-      cancel: '点错了',
-      confirm: '确认',
-      success: '退押金成功',
-      error: '退押金失败'
-    },
     payFeeOrderResult: {
       title: '缴费提示',
       success: '缴费成功',
diff --git a/src/views/fee/payFeeOrderList.vue b/src/views/fee/payFeeOrderList.vue
index de3dd14..a8b88e0 100644
--- a/src/views/fee/payFeeOrderList.vue
+++ b/src/views/fee/payFeeOrderList.vue
@@ -187,10 +187,10 @@
       </el-row>
     </el-card>
 
-    <pay-fee-user-account ref="payFeeUserAccount"></pay-fee-user-account>
+    <pay-fee-user-account ref="payFeeUserAccount" @changeUserAmountPrice="changeUserAmountPrice"></pay-fee-user-account>
     <pay-fee-deposit ref="payFeeDeposit"></pay-fee-deposit>
     <pay-fee-order-confirm ref="payFeeOrderConfirm"></pay-fee-order-confirm>
-    <pay-fee-discount ref="payFeeDiscount"></pay-fee-discount>
+    <pay-fee-discount ref="payFeeDiscount" @changeDiscountPrice="changeDiscountPrice"></pay-fee-discount>
     <pay-fee-coupon ref="payFeeCoupon"></pay-fee-coupon>
     <prestore-account2 ref="prestoreAccount2"></prestore-account2>
     <view-room-data ref="viewRoomData"></view-room-data>
@@ -290,6 +290,9 @@ export default {
   },
   created() {
     this.initData()
+    setTimeout(() => {
+      this.handleAccountChange(true)
+    }, 1000)
   },
   methods: {
     async initData() {
@@ -449,7 +452,6 @@ export default {
       for (let index = 1; index < 7; index++) {
         this.payFeeOrderInfo.paymentCycles.push(index * listRoomData.data.paymentCycle);
       }
-      console.log('listRoomData', listRoomData)
       //发送get请求
 
       if (Object.prototype.hasOwnProperty.call(listRoomData.data, 'custEndTime')) {
@@ -469,35 +471,96 @@ export default {
         this.$message.warning('超过最大计费结束时间，' + dateSub(listRoomData.data.maxEndTime, listRoomData.data.feeFlag) + ",请用更小缴费周期或者自定义结束时间缴费");
         return;
       }
-      // vc.emit('payFeeDiscount', 'computeFeeDiscount', {
-      //   feeId: this.payFeeOrderInfo.feeId,
-      //   cycles: _cycles,
-      //   payerObjId: this.payFeeOrderInfo.payerObjId,
-      //   payerObjType: this.payFeeOrderInfo.payerObjType,
-      //   endTime: this.payFeeOrderInfo.endTime,
-      //   custEndTime: this.payFeeOrderInfo.custEndTime
-      // });
-      // vc.emit('payFeeCoupon', 'computeFeeCoupon', {
-      //   feeId: this.payFeeOrderInfo.feeId,
-      //   cycles: _cycles,
-      //   payerObjId: this.payFeeOrderInfo.payerObjId,
-      //   payerObjType: this.payFeeOrderInfo.payerObjType,
-      //   endTime: this.payFeeOrderInfo.endTime
-      // });
-      // vc.emit('payFeeDeposit', 'computeFeeDeposit', {
-      //   payerObjId: this.payFeeOrderInfo.payerObjId,
-      //   payerObjType: this.payFeeOrderInfo.payerObjType,
-      // });
+      this.$refs.payFeeDiscount.open({
+        feeId: this.payFeeOrderInfo.feeId,
+        cycles: _cycles,
+        payerObjId: this.payFeeOrderInfo.payerObjId,
+        payerObjType: this.payFeeOrderInfo.payerObjType,
+        endTime: this.payFeeOrderInfo.endTime,
+      })
+      this.$refs.payFeeCoupon.open({
+        feeId: this.payFeeOrderInfo.feeId,
+        cycles: _cycles,
+        payerObjId: this.payFeeOrderInfo.payerObjId,
+        payerObjType: this.payFeeOrderInfo.payerObjType,
+        endTime: this.payFeeOrderInfo.endTime,
+      })
+      this.$refs.payFeeDeposit.open({
+        payerObjId: this.payFeeOrderInfo.payerObjId,
+        payerObjType: this.payFeeOrderInfo.payerObjType,
+      })
       this._listFeeIntegral(_cycles);
-
-
     },
-
+    changeDiscountPrice(data) {
+      let _totalFeePrice = this.payFeeOrderInfo.totalFeePrice;
+      if (_totalFeePrice < 0) {
+        return;
+      }
+      let _totalDiscountMoney = data.totalDiscountMoney;
+      //如果应收小区 优惠金额 则不优惠
+      if (_totalFeePrice < _totalDiscountMoney) {
+        this.$message.warning("实收款不能为负数！")
+      }
+      this.payFeeOrderInfo.selectDiscount = data.selectDiscount;
+      this.payFeeOrderInfo.totalDiscountMoney = _totalDiscountMoney;
+      // 该处js做减法后，会出现小数点后取不尽的bug，再次处理
+      let receivedAmount = _totalFeePrice - _totalDiscountMoney;
+      this.payFeeOrderInfo.receivedAmount = receivedAmount;//this._getFixedNum(receivedAmount);
+    },
     async _listFeeIntegral(_cycles) {
       // 实现积分计算逻辑
       console.log(_cycles)
     },
-
+    changeUserAmountPrice(data) {
+      this.payFeeOrderInfo.selectUserAccount = data.selectAccount;
+      this.payFeeOrderInfo.accountAmount = data.totalUserAmount;
+      this.payFeeOrderInfo.accountList = data.accountList;
+      this.payFeeOrderInfo.integralAmount = data.integralAmount;
+      this.payFeeOrderInfo.cashAmount = data.cashAmount;
+      this.payFeeOrderInfo.couponAmount = data.couponAmount;
+      this._doComputeAccountRedepositDeduction();
+    },
+    /**
+             * 如果选择使用用户余额，则更新应缴金额
+             *
+             *  accountAmount: 0.0, // 账户金额
+             viewAccountAmount: 0.0, // 账户金额
+             deductionAmount: 0.0, //抵扣金额
+             needDeductionAmount: false,
+             redepositAmount: 0.0, //转存金额
+             */
+    _doComputeAccountRedepositDeduction: function () {
+      let receivedAmount = this.payFeeOrderInfo.receivedAmount; //实缴
+      //计算
+      let accountAmount = this.payFeeOrderInfo.accountAmount;
+      let deductionAmount = 0.0; // 抵消金额
+      this.payFeeOrderInfo.deductionAmount = deductionAmount;
+      let redepositAmount = 0.0; //转存金额
+      this.payFeeOrderInfo.redepositAmount = redepositAmount;
+      let totalDiscountMoney = this.payFeeOrderInfo.totalDiscountMoney; // 优惠金额
+      let totalFeePrice = this.payFeeOrderInfo.totalFeePrice; //应缴
+      //将显示账户金额实际刷成 账户金额
+      this.payFeeOrderInfo.viewAccountAmount = accountAmount;
+      //计算转存 ，转存 = 实缴 + 折扣优惠 - 应缴  
+      redepositAmount = parseFloat(receivedAmount) + parseFloat(totalDiscountMoney) - parseFloat(totalFeePrice);
+      //转存
+      if (parseFloat(redepositAmount) > 0) {
+        this.payFeeOrderInfo.redepositAmount = redepositAmount.toFixed(2); // 计算转存
+        this.payFeeOrderInfo.viewAccountAmount = parseFloat(this.payFeeOrderInfo.viewAccountAmount) + parseFloat(this.payFeeOrderInfo.redepositAmount);
+        return;
+      }
+      // 计算抵消金额 应缴 - 折扣  - 实缴 = 抵消金额  
+      deductionAmount = parseFloat(totalFeePrice) - parseFloat(totalDiscountMoney) - parseFloat(receivedAmount);
+      if (parseFloat(deductionAmount) > 0 && parseFloat(accountAmount) >= parseFloat(deductionAmount)) {
+        this.payFeeOrderInfo.deductionAmount = deductionAmount.toFixed(2);
+        let viewAccountAmount = this.payFeeOrderInfo.viewAccountAmount;
+        this.payFeeOrderInfo.viewAccountAmount = parseFloat(this.payFeeOrderInfo.viewAccountAmount) - parseFloat(this.payFeeOrderInfo.deductionAmount);
+        if (parseFloat(this.payFeeOrderInfo.viewAccountAmount) < 0) { //账户小于0
+          this.payFeeOrderInfo.viewAccountAmount = 0;
+          this.payFeeOrderInfo.deductionAmount = viewAccountAmount;
+        }
+      }
+    },
   }
 }
 </script>
diff --git a/src/views/fee/refundDepositFeeLang.js b/src/views/fee/refundDepositFeeLang.js
index 25fb8f7..c48e3aa 100644
--- a/src/views/fee/refundDepositFeeLang.js
+++ b/src/views/fee/refundDepositFeeLang.js
@@ -5,7 +5,8 @@ export const messages = {
       unrefunded: 'Unrefunded',
       refunded: 'Refunded',
       pendingReview: 'Pending Review',
-      printReceipt: 'Reprint Receipt'
+      printReceipt: 'Reprint Receipt',
+      alertText: 'Are you sure you want to refund the deposit?'
     },
     payFeeDeposit: {
       payerObject: 'Payer',
@@ -16,7 +17,14 @@ export const messages = {
       status: 'Status',
       operation: 'Operation',
       refundDeposit: 'Refund Deposit',
-      detail: 'Detail'
+      detail: 'Detail',
+      title: 'Deposit Information',
+      depositInfo: 'Deposit Information',
+      refresh: 'Refresh',
+      payerObj: 'Payer Object',
+      feeName: 'Fee Item',
+      timeRange: 'Time Range',
+      refund: 'Refund'
     },
     returnPayFee: {
       fillRefundReason: 'Fill Refund Reason',
@@ -39,7 +47,9 @@ export const messages = {
       unrefunded: '未退押金',
       refunded: '已退押金',
       pendingReview: '待审核',
-      printReceipt: '补打退款单'
+      printReceipt: '补打退款单',
+      alertText: '押金退款后自动存到账户中，您可以从账户中选择缴费，如果退现金给业主，请到业务首页面退押金！'
+
     },
     payFeeDeposit: {
       payerObject: '收费对象',
@@ -50,7 +60,17 @@ export const messages = {
       status: '状态',
       operation: '操作',
       refundDeposit: '退押金',
-      detail: '详情'
+      detail: '详情',
+      title: '押金信息',
+      depositInfo: '押金信息',
+      refresh: '刷新',
+      payerObj: '收费对象',
+      feeName: '费用项',
+      timeRange: '时间段',
+      // amount: '金额',
+      // paymentTime: '缴费时间',
+      // operation: '操作',
+      refund: '退押金'
     },
     returnPayFee: {
       fillRefundReason: '填写退费原因',
--
libgit2 0.21.4