From 6f9168702157da397bf7501dc54dba360a403b9c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 25 Jul 2025 02:25:58 +0800
Subject: [PATCH] 优化甘肃客户反馈bug

---
 src/api/fee/listApplyRoomDiscountRecordDetailsApi.js     |  31 +++++++++++++++++++++++++++++++
 src/components/fee/applyRoomDiscountRecord.vue           |  14 +++++++-------
 src/components/fee/batchFeeCycle.vue                     |  89 ++++++++++++++++++-----------------------------------------------------------------------
 src/components/fee/simplifyFeeReceipt.vue                |  96 ++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
 src/components/org/ChooseOrgTree.vue                     |   2 +-
 src/components/room/selectRooms.vue                      |   4 ++++
 src/components/simplify/simplifyCarFee.vue               |  80 +++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
 src/components/staff/selectStaffsDiv.vue                 |   4 ++--
 src/i18n/commonLang.js                                   |   8 ++++++--
 src/i18n/feeI18n.js                                      |   3 +++
 src/router/feeRouter.js                                  |   5 +++++
 src/views/car/parkingBoxManageList.vue                   |  10 +++-------
 src/views/car/tempCarPaymentList.vue                     |   6 +++---
 src/views/common/commonLang.js                           |  14 --------------
 src/views/fee/batchPayFeeOrderList.vue                   |   5 ++++-
 src/views/fee/buyCarMonthCardList.vue                    |   2 +-
 src/views/fee/listApplyRoomDiscountRecordDetailsLang.js  |  20 ++++++++++++++++++++
 src/views/fee/listApplyRoomDiscountRecordDetailsList.vue | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/fee/listApplyRoomDiscountRecordList.vue        |   8 +++++---
 src/views/fee/listOweFeeList.vue                         |   8 ++++----
 src/views/oa/staffAttendanceManageList.vue               |  14 ++++++++------
 21 files changed, 350 insertions(+), 199 deletions(-)
 create mode 100644 src/api/fee/listApplyRoomDiscountRecordDetailsApi.js
 delete mode 100644 src/views/common/commonLang.js
 create mode 100644 src/views/fee/listApplyRoomDiscountRecordDetailsLang.js
 create mode 100644 src/views/fee/listApplyRoomDiscountRecordDetailsList.vue

diff --git a/src/api/fee/listApplyRoomDiscountRecordDetailsApi.js b/src/api/fee/listApplyRoomDiscountRecordDetailsApi.js
new file mode 100644
index 0000000..2d8e4c7
--- /dev/null
+++ b/src/api/fee/listApplyRoomDiscountRecordDetailsApi.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+/**
+ * 查询房间折扣记录详情
+ * @param {Object} params 查询参数
+ * @param {string} params.ardrId 折扣记录ID
+ * @param {string} params.roomName 房间名称
+ * @param {string} params.state 状态
+ * @param {string} params.roomId 房间ID
+ * @param {string} params.communityId 小区ID
+ * @param {number} params.page 当前页码
+ * @param {number} params.row 每页条数
+ * @returns {Promise} 返回Promise对象
+ */
+export function queryApplyRoomDiscountRecordDetail(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/applyRoomDiscountRecord/queryApplyRoomDiscountRecordDetail',
+      method: 'get',
+      params
+    }).then(response => {
+      const res = response.data
+      resolve({
+        data: res.data,
+        total: res.total
+      })
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
\ No newline at end of file
diff --git a/src/components/fee/applyRoomDiscountRecord.vue b/src/components/fee/applyRoomDiscountRecord.vue
index 9ec703e..7d6322a 100644
--- a/src/components/fee/applyRoomDiscountRecord.vue
+++ b/src/components/fee/applyRoomDiscountRecord.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog :title="$t('applyRoomDiscountRecord.title')" :visible.sync="visible" width="60%"
     :before-close="handleClose">
-    <el-form :model="form" label-width="120px" label-position="left">
+    <el-form :model="form" label-width="120px" label-position="left" class="text-left">
       <el-form-item :label="$t('applyRoomDiscountRecord.room')">
         <el-input v-model="form.roomName" disabled></el-input>
       </el-form-item>
@@ -20,7 +20,7 @@
           :placeholder="$t('applyRoomDiscountRecord.remarkPlaceholder')"></el-input>
       </el-form-item>
       <el-form-item :label="$t('applyRoomDiscountRecord.uploadImages')">
-        <upload-image-url ref="uploadImageUrl" />
+        <upload-image-url ref="uploadImageUrl" @notifyUploadCoverImage="handleNotifyUploadCoverImage" />
       </el-form-item>
       <el-form-item :label="$t('applyRoomDiscountRecord.uploadVideo')">
         <upload-vedio ref="uploadVedio" />
@@ -105,10 +105,7 @@ export default {
       this.visible = false
     },
     validateForm() {
-      if (this.form.isTrue === null) {
-        this.$message.error(this.$t('applyRoomDiscountRecord.violationRequired'))
-        return false
-      }
+   
       if (!this.form.remark) {
         this.$message.error(this.$t('applyRoomDiscountRecord.remarkRequired'))
         return false
@@ -119,7 +116,6 @@ export default {
       if (!this.validateForm()) return
 
       try {
-        this.form.photos = this.$refs.uploadImageUrl.getPhotos()
         this.form.videoName = this.$refs.uploadVedio.getVideoName()
 
         const res = await addApplyRoomDiscountRecord(this.form)
@@ -131,8 +127,12 @@ export default {
           this.$message.error(res.msg)
         }
       } catch (error) {
+        console.log(error)
         this.$message.error(this.$t('common.saveFailed'))
       }
+    },
+    handleNotifyUploadCoverImage(photosUrl) {
+      this.form.photos = photosUrl
     }
   }
 }
diff --git a/src/components/fee/batchFeeCycle.vue b/src/components/fee/batchFeeCycle.vue
index f3c0861..93f045c 100644
--- a/src/components/fee/batchFeeCycle.vue
+++ b/src/components/fee/batchFeeCycle.vue
@@ -1,70 +1,29 @@
 <template>
-  <el-dialog
-    :title="batchFeeCycleInfo.fee.feeName"
-    :visible.sync="visible"
-    width="500px"
-    :before-close="handleClose"
-  >
+  <el-dialog :title="batchFeeCycleInfo.feeName" :visible.sync="visible" width="500px" :before-close="handleClose">
     <el-form label-width="120px">
       <el-form-item :label="$t('batchFeeCycle.paymentCycle')">
-        <el-select 
-          v-model="batchFeeCycleInfo.tempCycle" 
-          @change="changeTempCycle"
-          style="width:100%"
-          :placeholder="$t('batchFeeCycle.selectCycleTip')"
-        >
-          <el-option 
-            value="-100" 
-            :label="$t('batchFeeCycle.default')"
-          ></el-option>
-          <el-option 
-            value="-102" 
-            :label="$t('batchFeeCycle.customCycle')"
-          ></el-option>
-          <el-option 
-            value="-101" 
-            :label="$t('batchFeeCycle.customAmount')"
-          ></el-option>
-          <el-option 
-            value="-103" 
-            :label="$t('batchFeeCycle.customEndTime')"
-          ></el-option>
+        <el-select v-model="batchFeeCycleInfo.tempCycle" @change="changeTempCycle" style="width:100%"
+          :placeholder="$t('batchFeeCycle.selectCycleTip')">
+          <el-option value="-100" :label="$t('batchFeeCycle.default')"></el-option>
+          <el-option value="-102" :label="$t('batchFeeCycle.customCycle')"></el-option>
+          <el-option value="-101" :label="$t('batchFeeCycle.customAmount')"></el-option>
+          <el-option value="-103" :label="$t('batchFeeCycle.customEndTime')"></el-option>
         </el-select>
       </el-form-item>
 
-      <el-form-item 
-        v-if="batchFeeCycleInfo.tempCycle === '-101'" 
-        :label="$t('batchFeeCycle.customAmount')"
-      >
-        <el-input
-          type="number"
-          v-model="batchFeeCycleInfo.receivedAmount"
-          :placeholder="$t('batchFeeCycle.enterCustomAmount')"
-        ></el-input>
+      <el-form-item v-if="batchFeeCycleInfo.tempCycle === '-101'" :label="$t('batchFeeCycle.customAmount')">
+        <el-input type="number" v-model="batchFeeCycleInfo.receivedAmount"
+          :placeholder="$t('batchFeeCycle.enterCustomAmount')"></el-input>
       </el-form-item>
 
-      <el-form-item 
-        v-if="batchFeeCycleInfo.tempCycle === '-102'" 
-        :label="$t('batchFeeCycle.actualCycle')"
-      >
-        <el-input
-          type="number"
-          v-model="batchFeeCycleInfo.cycles"
-          :placeholder="$t('batchFeeCycle.enterActualCycle')"
-        ></el-input>
+      <el-form-item v-if="batchFeeCycleInfo.tempCycle === '-102'" :label="$t('batchFeeCycle.actualCycle')">
+        <el-input type="number" v-model="batchFeeCycleInfo.cycles"
+          :placeholder="$t('batchFeeCycle.enterActualCycle')"></el-input>
       </el-form-item>
 
-      <el-form-item 
-        v-if="batchFeeCycleInfo.tempCycle === '-103'" 
-        :label="$t('batchFeeCycle.endTime')"
-      >
-        <el-date-picker
-          v-model="batchFeeCycleInfo.custEndTime"
-          type="date"
-          style="width:100%"
-          :placeholder="$t('batchFeeCycle.selectEndTime')"
-          value-format="yyyy-MM-dd"
-        ></el-date-picker>
+      <el-form-item v-if="batchFeeCycleInfo.tempCycle === '-103'" :label="$t('batchFeeCycle.endTime')">
+        <el-date-picker v-model="batchFeeCycleInfo.custEndTime" type="date" style="width:100%"
+          :placeholder="$t('batchFeeCycle.selectEndTime')" value-format="yyyy-MM-dd"></el-date-picker>
       </el-form-item>
     </el-form>
 
@@ -92,12 +51,7 @@ export default {
   },
   methods: {
     open(fee) {
-      this.batchFeeCycleInfo = {
-        cycles: fee.cycles,
-        tempCycle: fee.tempCycle,
-        receivedAmount: fee.receivedAmount,
-        fee: { ...fee }
-      }
+      this.batchFeeCycleInfo = fee
       this.visible = true
     },
 
@@ -113,15 +67,8 @@ export default {
     },
 
     _doSubmitFeeCycle() {
-      const updatedFee = {
-        ...this.batchFeeCycleInfo.fee,
-        tempCycle: this.batchFeeCycleInfo.tempCycle,
-        cycles: this.batchFeeCycleInfo.cycles,
-        custEndTime: this.batchFeeCycleInfo.custEndTime,
-        receivedAmount: this.batchFeeCycleInfo.receivedAmount
-      }
 
-      this.$emit('changeMonth', updatedFee)
+      this.$emit('changeMonth', this.batchFeeCycleInfo)
       this.handleClose()
     }
   }
diff --git a/src/components/fee/simplifyFeeReceipt.vue b/src/components/fee/simplifyFeeReceipt.vue
index 2bbefdf..e3b5b75 100644
--- a/src/components/fee/simplifyFeeReceipt.vue
+++ b/src/components/fee/simplifyFeeReceipt.vue
@@ -1,47 +1,49 @@
 <template>
   <div>
-    <el-row class="margin-top-lg">
-      <el-col :span="4" class="padding-right-xs padding-left-xl">
-        <el-select v-model="simplifyFeeReceiptInfo.objType" size="small" @change="_changeSimplifyFeeReceiptFeeTypeCd"
-          :placeholder="$t('simplifyFeeReceipt.selectFeeType')">
-          <el-option v-for="(item, index) in simplifyFeeReceiptInfo.objTypes" :key="index" :label="item.name"
-            :value="item.statusCd"></el-option>
-        </el-select>
-      </el-col>
-      <el-col :span="4" class="padding-right-xs padding-left-xl" v-if="simplifyFeeReceiptInfo.objType == '6666'">
-        <el-select v-model="simplifyFeeReceiptInfo.carId" size="small" @change="changeSimplifyFeeReceiptCar"
-          :placeholder="$t('simplifyFeeReceipt.selectCar')">
-          <el-option v-for="(item, index) in simplifyFeeReceiptInfo.ownerCars" :key="index" :label="item.carNum"
-            :value="item.carId"></el-option>
-        </el-select>
-      </el-col>
-      <el-col :span="4" class="padding-right-xs padding-left-xl" v-else-if="simplifyFeeReceiptInfo.objType == '7777'">
-        <el-select v-model="simplifyFeeReceiptInfo.contractId" size="small" @change="changeSimplifyFeeReceiptCar"
-          :placeholder="$t('simplifyFeeReceipt.selectContract')">
-          <el-option v-for="(item, index) in simplifyFeeReceiptInfo.ownerContracts" :key="index"
-            :label="item.contractCode" :value="item.contractId"></el-option>
-        </el-select>
-      </el-col>
-      <el-col :span="4" class="padding-right-xs padding-left-xl" v-if="simplifyFeeReceiptInfo.objType != '7777'">
-        <el-select v-model="simplifyFeeReceiptInfo.ownerFlag" size="small" @change="_queryFeeReceiptMethod">
-          <el-option
-            :label="$t('simplifyFeeReceipt.current') + (simplifyFeeReceiptInfo.objType == '6666' ? $t('simplifyFeeReceipt.car') : $t('simplifyFeeReceipt.room'))"
-            value="F"></el-option>
-          <el-option
-            :label="$t('simplifyFeeReceipt.all') + (simplifyFeeReceiptInfo.objType == '6666' ? $t('simplifyFeeReceipt.car') : $t('simplifyFeeReceipt.room'))"
-            value="T"></el-option>
-        </el-select>
-      </el-col>
-      <el-col :span="4" class="padding-right-xs padding-left-xl">
-        <el-input v-model="simplifyFeeReceiptInfo.receiptCode" size="small"
-          :placeholder="$t('simplifyFeeReceipt.receiptCode')"></el-input>
-      </el-col>
-      <el-col :span="4" class="padding-right-xs padding-left-xl">
-        <el-button type="primary" size="small" @click="_queryFeeReceiptMethod">
-          {{ $t('simplifyFeeReceipt.query') }}
-        </el-button>
-      </el-col>
-      <el-col :span="8" class="text-right padding-right-lg">
+    <div class="margin-top-lg flex justify-between">
+      <div class="flex justify-start">
+        <div :span="3" class="padding-right-xs padding-left-xl">
+          <el-select v-model="simplifyFeeReceiptInfo.objType" size="small" @change="_changeSimplifyFeeReceiptFeeTypeCd"
+            :placeholder="$t('simplifyFeeReceipt.selectFeeType')">
+            <el-option v-for="(item, index) in simplifyFeeReceiptInfo.objTypes" :key="index" :label="item.name"
+              :value="item.statusCd"></el-option>
+          </el-select>
+        </div>
+        <div :span="3" class="padding-right-xs padding-left-xl" v-if="simplifyFeeReceiptInfo.objType == '6666'">
+          <el-select v-model="simplifyFeeReceiptInfo.carId" size="small" @change="changeSimplifyFeeReceiptCar"
+            :placeholder="$t('simplifyFeeReceipt.selectCar')">
+            <el-option v-for="(item, index) in simplifyFeeReceiptInfo.ownerCars" :key="index" :label="item.carNum"
+              :value="item.carId"></el-option>
+          </el-select>
+        </div>
+        <div :span="3" class="padding-right-xs padding-left-xl" v-else-if="simplifyFeeReceiptInfo.objType == '7777'">
+          <el-select v-model="simplifyFeeReceiptInfo.contractId" size="small" @change="changeSimplifyFeeReceiptCar"
+            :placeholder="$t('simplifyFeeReceipt.selectContract')">
+            <el-option v-for="(item, index) in simplifyFeeReceiptInfo.ownerContracts" :key="index"
+              :label="item.contractCode" :value="item.contractId"></el-option>
+          </el-select>
+        </div>
+        <div :span="3" class="padding-right-xs padding-left-xl" v-if="simplifyFeeReceiptInfo.objType != '7777'">
+          <el-select v-model="simplifyFeeReceiptInfo.ownerFlag" size="small" @change="_queryFeeReceiptMethod">
+            <el-option
+              :label="$t('simplifyFeeReceipt.current') + (simplifyFeeReceiptInfo.objType == '6666' ? $t('simplifyFeeReceipt.car') : $t('simplifyFeeReceipt.room'))"
+              value="F"></el-option>
+            <el-option
+              :label="$t('simplifyFeeReceipt.all') + (simplifyFeeReceiptInfo.objType == '6666' ? $t('simplifyFeeReceipt.car') : $t('simplifyFeeReceipt.room'))"
+              value="T"></el-option>
+          </el-select>
+        </div>
+        <div :span="3" class="padding-right-xs padding-left-xl">
+          <el-input v-model="simplifyFeeReceiptInfo.receiptCode" size="small"
+            :placeholder="$t('simplifyFeeReceipt.receiptCode')"></el-input>
+        </div>
+        <div :span="2" class="padding-right-xs padding-left-xl">
+          <el-button type="primary" size="small" @click="_queryFeeReceiptMethod">
+            {{ $t('simplifyFeeReceipt.query') }}
+          </el-button>
+        </div>
+      </div>
+      <div :span="8" class="text-right padding-right-lg">
         <el-button type="primary" size="small" @click="_printFeeReceipt('OFF')">
           {{ $t('simplifyFeeReceipt.print') }}
         </el-button>
@@ -54,11 +56,11 @@
         <el-button type="primary" size="small" @click="_printApplyFeeReceipt">
           {{ $t('simplifyFeeReceipt.apply') }}
         </el-button>
-      </el-col>
-    </el-row>
+      </div>
+    </div>
     <div class="margin-top">
       <el-table :data="simplifyFeeReceiptInfo.feeReceipts" @selection-change="handleSelectionChange" border stripe>
-        <el-table-column type="selection" width="55" align="center" ></el-table-column>
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
         <el-table-column prop="receiptCode" :label="$t('simplifyFeeReceipt.receiptCode')"
           align="center"></el-table-column>
         <el-table-column :label="$t('simplifyFeeReceipt.feeType')" align="center">
@@ -143,12 +145,14 @@ export default {
     }
   },
   created() {
-    this._loadDictData()
   },
   methods: {
     handleSwitch(param) {
       if (param.roomId === '') return
+
       this.clearSimplifyFeeReceiptInfo()
+      this._loadDictData()
+
       this._listFeePrintPages()
       Object.assign(this.simplifyFeeReceiptInfo, param)
       this.simplifyFeeReceiptInfo.objId = param.roomId
diff --git a/src/components/org/ChooseOrgTree.vue b/src/components/org/ChooseOrgTree.vue
index 3b1ba93..f5e5ffd 100644
--- a/src/components/org/ChooseOrgTree.vue
+++ b/src/components/org/ChooseOrgTree.vue
@@ -52,7 +52,7 @@ export default {
         const { data } = await listOrgTree(params)
         
         // 确保数据是数组格式
-        let treeData = data
+        let treeData = [data]
         
         // 如果返回的是对象而不是数组，尝试提取数组
         if (Array.isArray(treeData)) {
diff --git a/src/components/room/selectRooms.vue b/src/components/room/selectRooms.vue
index 06c5c0b..f605667 100644
--- a/src/components/room/selectRooms.vue
+++ b/src/components/room/selectRooms.vue
@@ -110,6 +110,10 @@ export default {
         }
         const res = await queryRooms(params)
         this.rooms = res.rooms
+        this.rooms.forEach(item => {
+          this.roomIds.push(item)
+        });
+        this.handleRoomSelect()
       } catch (error) {
         this.$message.error(this.$t('selectRoom.loadRoomError'))
       }
diff --git a/src/components/simplify/simplifyCarFee.vue b/src/components/simplify/simplifyCarFee.vue
index 6837fe8..513b13d 100644
--- a/src/components/simplify/simplifyCarFee.vue
+++ b/src/components/simplify/simplifyCarFee.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-row class="margin-top">
-      <el-col :span="4">
+    <div class="margin-top flex justify-between">
+      <div >
         <el-select v-model="simplifyCarFeeInfo.carId" @change="changeSimplifyCar">
           <el-option
             v-for="(item,index) in simplifyCarFeeInfo.ownerCars"
@@ -10,9 +10,8 @@
             :value="item.carId">
           </el-option>
         </el-select>
-      </el-col>
-      <el-col :span="16"></el-col>
-      <el-col :span="4" v-if="simplifyCarFeeInfo.carId">
+      </div>
+      <div  v-if="simplifyCarFeeInfo.carId">
         <el-button type="primary" size="small" @click="_toBuyCarMonthCard">
           {{ $t('simplifyCarFee.buyMonthCard') }}
         </el-button>
@@ -22,8 +21,8 @@
         <el-button type="primary" size="small" @click="_openSimplifyCarCreateFeeAddModal">
           {{ $t('simplifyCarFee.createFee') }}
         </el-button>
-      </el-col>
-    </el-row>
+      </div>
+    </div>
 
     <el-table
       :data="simplifyCarFeeInfo.fees"
@@ -115,12 +114,22 @@
         </el-pagination>
       </el-col>
     </el-row>
+    <car-create-fee-add ref="carCreateFeeAdd" @success="handleNotify" />
+    <delete-fee ref="deleteFee" @success="handleNotify"></delete-fee>
+    <edit-fee ref="editFee" @success="handleNotify"></edit-fee>
+    <finish-fee ref="finishFee" @success="handleNotify"></finish-fee>
+
   </div>
 </template>
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
 import { listFee, queryOwnerCars } from '@/api/simplify/simplifyCarFeeApi'
+import CarCreateFeeAdd from '@/components/fee/carCreateFeeAdd'
+import DeleteFee from '@/components/fee/deleteFee'
+import EditFee from '@/components/fee/editFee'
+import FinishFee from '@/components/fee/finishFee'
+
 
 export default {
   name: 'SimplifyCarFee',
@@ -145,14 +154,20 @@ export default {
       total: 0
     }
   },
+  components: {
+    CarCreateFeeAdd,
+    DeleteFee,
+    EditFee,
+    FinishFee
+  },
   created() {
     this.communityId = getCommunityId()
-    this.initEvents()
+
   },
   methods: {
-    initEvents() {
-      this.$on('switch', this.handleSwitch)
-      this.$on('notify', this.handleNotify)
+
+    open(param) {
+      this.handleSwitch(param)
     },
     handleSwitch(param) {
       if (param.ownerId == '') return
@@ -204,13 +219,14 @@ export default {
         }
         
         queryOwnerCars(params).then(res => {
-          this.simplifyCarFeeInfo.ownerCars = res.data
-          if (res.data.length > 0) {
-            this.simplifyCarFeeInfo.carId = res.data[0].carId
-            this.simplifyCarFeeInfo.carNum = res.data[0].carNum
-            this.simplifyCarFeeInfo.num = res.data[0].num
-            this.simplifyCarFeeInfo.parkingName = `${res.data[0].areaNum}${this.$t('simplifyCarFee.parkingLot')}${res.data[0].num}${this.$t('simplifyCarFee.parkingSpace')}`
-            resolve(res.data)
+          let _json = res.data;
+          this.simplifyCarFeeInfo.ownerCars = _json.data
+          if (_json.data.length > 0) {
+            this.simplifyCarFeeInfo.carId = _json.data[0].carId
+            this.simplifyCarFeeInfo.carNum = _json.data[0].carNum
+            this.simplifyCarFeeInfo.num = _json.data[0].num
+            this.simplifyCarFeeInfo.parkingName = `${_json.data[0].areaNum}${this.$t('simplifyCarFee.parkingLot')}${_json.data[0].num}${this.$t('simplifyCarFee.parkingSpace')}`
+            resolve(_json.data)
           } else {
             reject(this.$t('simplifyCarFee.noParkingSpace'))
           }
@@ -262,37 +278,39 @@ export default {
       return `${this.$t('simplifyCarFee.owner')}：${ownerName},${this.$t('simplifyCarFee.phone')}：${ownerLink}`
     },
     _simplifyCarPayFee(fee) {
-      this.$router.push(`/views/fee/payFeeOrderfeeId=${fee.feeId}`)
+      this.$router.push(`/views/fee/payFeeOrder?feeId=${fee.feeId}`)
     },
     _simplifyCarPayFeeHis(fee) {
-      this.$router.push(`/views/fee/propertyFee?${this.objToGetParam(fee)}`)
+
+      this.$router.push({
+        path: '/views/fee/propertyFee',
+        query: fee
+      })
     },
     _simplifyCarEditFee(fee) {
-      this.$emit('editFee', fee)
+      fee.maxEndTime = this._getAttrValue(fee.feeAttrs, '390010')
+      this.$refs.editFee.open(fee)
     },
     _simplifyCarDeleteFee(fee) {
-      this.$emit('deleteFee', {
-        communityId: this.communityId,
+      this.$refs.deleteFee.open({
+        communityId: getCommunityId(),
         feeId: fee.feeId
       })
     },
     _openSimplifyCarCreateFeeAddModal() {
-      this.$emit('carCreateFeeAdd', {
-        isMore: false,
-        car: this.simplifyCarFeeInfo
-      })
+      this.$refs.carCreateFeeAdd.open({ isMore: false, car: this.simplifyCarFeeInfo })
     },
     _simplifyCarFinishFee(fee) {
-      this.$emit('finishFee', {
-        communityId: this.communityId,
+      this.$refs.finishFee.open({
+        communityId: getCommunityId(),
         feeId: fee.feeId
       })
     },
     _toBuyCarMonthCard() {
-      this.$router.push(`/pages/fee/buyCarMonthCard?carNum=${this.simplifyCarFeeInfo.carNum}`)
+      this.$router.push(`/views/fee/buyCarMonthCard?carNum=${this.simplifyCarFeeInfo.carNum}`)
     },
     _openBatchPayCarFeeModal() {
-      this.$router.push(`/pages/property/batchPayFeeOrder?ownerId=${this.simplifyCarFeeInfo.ownerId}&payerObjType=6666`)
+      this.$router.push(`/views/fee/batchPayFeeOrder?ownerId=${this.simplifyCarFeeInfo.ownerId}&payerObjType=6666`)
     },
     _viewCarFeeConfig(fee) {
       // Implement view fee config logic
diff --git a/src/components/staff/selectStaffsDiv.vue b/src/components/staff/selectStaffsDiv.vue
index 725eec3..92a2fd7 100644
--- a/src/components/staff/selectStaffsDiv.vue
+++ b/src/components/staff/selectStaffsDiv.vue
@@ -64,10 +64,10 @@ export default {
     },
 
     async handleNodeClick(node) {
-      this.currentOrgId = node.id
+      this.currentOrgId = node.orgId
       try {
         const { staffs } = await listStaffsByOrgId({
-          orgId: node.id,
+          orgId: node.orgId,
           page: 1,
           row: 100
         })
diff --git a/src/i18n/commonLang.js b/src/i18n/commonLang.js
index b342f33..870c1a3 100644
--- a/src/i18n/commonLang.js
+++ b/src/i18n/commonLang.js
@@ -60,7 +60,9 @@ export const messages = {
         saveSuccess:'successfully',
         noData:'No Data',
         file:'File',
-        hide:'Hide'
+        hide:'Hide',
+        viewDetail:'View Detail',
+        yuan:'yuan'
       }
     },
     zh: {
@@ -124,7 +126,9 @@ export const messages = {
         saveSuccess:'成功',
         noData:'暂无数据',
         file:'附件',
-        hide:'隐藏'
+        hide:'隐藏',
+        viewDetail:'查看详情',
+        yuan:'元'
       }
     }
   } 
\ No newline at end of file
diff --git a/src/i18n/feeI18n.js b/src/i18n/feeI18n.js
index 9f295d7..fa7358f 100644
--- a/src/i18n/feeI18n.js
+++ b/src/i18n/feeI18n.js
@@ -36,6 +36,7 @@ import { messages as feeDetailMessages } from '../views/fee/feeDetailLang'
 import { messages as roomCreatePayFeeMessages } from '../views/fee/roomCreatePayFeeLang'
 import { messages as printAccountReceiptMessages } from '../views/account/printAccountReceiptLang'
 import { messages as printSmallAccountReceiptMessages } from '../views/account/printSmallAccountReceiptLang'
+import { messages as listApplyRoomDiscountRecordDetailsMessages } from '../views/fee/listApplyRoomDiscountRecordDetailsLang'
 
 export const messages = {
     en: {
@@ -77,6 +78,7 @@ export const messages = {
         ...roomCreatePayFeeMessages.en,
         ...printAccountReceiptMessages.en,
         ...printSmallAccountReceiptMessages.en,
+        ...listApplyRoomDiscountRecordDetailsMessages.en,
     },
     zh: {
         ...contractCreateFeeMessages.zh,
@@ -117,5 +119,6 @@ export const messages = {
         ...roomCreatePayFeeMessages.zh,
         ...printAccountReceiptMessages.zh,
         ...printSmallAccountReceiptMessages.zh,
+        ...listApplyRoomDiscountRecordDetailsMessages.zh,
     }
 }
\ No newline at end of file
diff --git a/src/router/feeRouter.js b/src/router/feeRouter.js
index c2f3520..23d36e9 100644
--- a/src/router/feeRouter.js
+++ b/src/router/feeRouter.js
@@ -164,6 +164,11 @@ export default [
         name: '/pages/fee/roomCreatePayFee',
         component: () => import('@/views/fee/roomCreatePayFeeList.vue')
     },
+    {
+        path:'/views/fee/listApplyRoomDiscountRecordDetails',
+        name:'/views/fee/listApplyRoomDiscountRecordDetails',
+        component: () => import('@/views/fee/listApplyRoomDiscountRecordDetailsList.vue')
+        },
 
 
 ]
\ No newline at end of file
diff --git a/src/views/car/parkingBoxManageList.vue b/src/views/car/parkingBoxManageList.vue
index 4f84fea..c9bb99d 100644
--- a/src/views/car/parkingBoxManageList.vue
+++ b/src/views/car/parkingBoxManageList.vue
@@ -93,6 +93,7 @@
 
 <script>
 import { getParkingBoxList } from '@/api/car/parkingBoxManageApi'
+import {jumpToIot} from '@/api/user/menuApi.js'
 
 export default {
   name: 'ParkingBoxManageList',
@@ -182,13 +183,8 @@ export default {
 
     handleOpenConsole(row) {
       // 跳转到控制台页面
-      this.$router.push({
-        path: '/car/parkingAreaControl',
-        query: {
-          boxId: row.boxId,
-          paId: row.paId
-        }
-      })
+      jumpToIot(`/#/pages/car/parkingAreaControl?paId=${row.paId}&boxId=${row.boxId}`)
+
     }
   }
 }
diff --git a/src/views/car/tempCarPaymentList.vue b/src/views/car/tempCarPaymentList.vue
index 0318813..1eae77e 100644
--- a/src/views/car/tempCarPaymentList.vue
+++ b/src/views/car/tempCarPaymentList.vue
@@ -6,7 +6,7 @@
           <div class="treeview">
             <ul class="list-group">
               <li v-for="(item, index) in parkingAreas" :key="index" class="list-group-item"
-                :class="{ 'vc-node-selected': conditions.paId === item.paId }" @click="handleSwitchParkingArea(item)">
+                :class="{ 'vc-node-selected': conditions.paNum === item.num }" @click="handleSwitchParkingArea(item)">
                 {{ item.num }}
               </li>
             </ul>
@@ -106,7 +106,7 @@ export default {
         total: 0
       },
       conditions: {
-        paId: '',
+        paNum: '',
         state: null,
         carNum: '',
         startTime: null,
@@ -139,7 +139,7 @@ export default {
     },
 
     handleSwitchParkingArea(parkingArea) {
-      this.conditions.paId = parkingArea.paId
+      this.conditions.paNum = parkingArea.num
       this.queryCarInoutMethod()
     },
 
diff --git a/src/views/common/commonLang.js b/src/views/common/commonLang.js
deleted file mode 100644
index ac67c77..0000000
--- a/src/views/common/commonLang.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const messages = {
-  en: {
-    common: {
-      cancel: 'Cancel',
-      confirm: 'Confirm'
-    }
-  },
-  zh: {
-    common: {
-      cancel: '取消',
-      confirm: '确定'
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/views/fee/batchPayFeeOrderList.vue b/src/views/fee/batchPayFeeOrderList.vue
index 9bdfe2a..d2022db 100644
--- a/src/views/fee/batchPayFeeOrderList.vue
+++ b/src/views/fee/batchPayFeeOrderList.vue
@@ -106,7 +106,7 @@
     </el-row>
 
     <batch-pay-confirm ref="batchPayConfirm"></batch-pay-confirm>
-    <batch-fee-cycle ref="batchFeeCycle"></batch-fee-cycle>
+    <batch-fee-cycle ref="batchFeeCycle" @changeMonth="batchChangeMonth"></batch-fee-cycle>
   </div>
 </template>
 
@@ -459,6 +459,9 @@ export default {
         })
       }
       this._doComputeTotalFee();
+    },
+    batchChangeMonth(fee) {
+      this._changeMonth(fee.cycle, fee)
     }
   }
 }
diff --git a/src/views/fee/buyCarMonthCardList.vue b/src/views/fee/buyCarMonthCardList.vue
index a63aeee..3a1afbb 100644
--- a/src/views/fee/buyCarMonthCardList.vue
+++ b/src/views/fee/buyCarMonthCardList.vue
@@ -164,7 +164,7 @@ export default {
         }
 
         const res = await getOpenApi(params)
-        this.buyCarMonthCardInfo.cards = res.data.data || []
+        this.buyCarMonthCardInfo.cards = res.data || []
       } catch (error) {
         console.error('获取月卡列表失败:', error)
         this.$message.error(this.$t('buyCarMonthCard.errors.getCardsFailed'))
diff --git a/src/views/fee/listApplyRoomDiscountRecordDetailsLang.js b/src/views/fee/listApplyRoomDiscountRecordDetailsLang.js
new file mode 100644
index 0000000..ffb0ed5
--- /dev/null
+++ b/src/views/fee/listApplyRoomDiscountRecordDetailsLang.js
@@ -0,0 +1,20 @@
+export const messages = {
+  en: {
+    listApplyRoomDiscountRecordDetails: {
+      title: 'Decoration Records',
+      back: 'Back',
+      room: 'Room',
+      image: 'Image/Video',
+      createTime: 'Create Time'
+    }
+  },
+  zh: {
+    listApplyRoomDiscountRecordDetails: {
+      title: '装修记录',
+      back: '返回',
+      room: '房屋',
+      image: '图片/视频',
+      createTime: '创建时间'
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/views/fee/listApplyRoomDiscountRecordDetailsList.vue b/src/views/fee/listApplyRoomDiscountRecordDetailsList.vue
new file mode 100644
index 0000000..07b010a
--- /dev/null
+++ b/src/views/fee/listApplyRoomDiscountRecordDetailsList.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="listApplyRoomDiscountRecordDetails-container">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>{{ applyRoomDiscountRecordDetailsInfo.conditions.roomName }} {{
+          $t('listApplyRoomDiscountRecordDetails.title') }}</span>
+        <el-button type="primary" size="small" style="float: right;" @click="_goBack">
+          <i class="el-icon-close"></i>
+          {{ $t('listApplyRoomDiscountRecordDetails.back') }}
+        </el-button>
+      </div>
+
+      <el-table :data="applyRoomDiscountRecordDetailsInfo.applyRoomDiscountRecordDetails" border style="width: 100%">
+        <el-table-column prop="roomName" :label="$t('listApplyRoomDiscountRecordDetails.room')" align="center" />
+        <el-table-column :label="$t('listApplyRoomDiscountRecordDetails.image')" align="center">
+          <template slot-scope="scope">
+            <div v-if="scope.row.relTypeCd === '19000'" style="position: relative; display: inline-block;"
+              @click="showImg(scope.row.url)">
+              <img width="50" height="50" :src="scope.row.url" @error="handleImageError">
+              <img src="/img/icon-bigimg.png" style="position: absolute; right: 0; bottom: 0;" width="50" height="50"
+                alt="">
+            </div>
+            <video v-else-if="scope.row.relTypeCd === '21000'" width="200" height="200" controls autoplay>
+              <source :src="scope.row.url" type="video/mp4">
+            </video>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" :label="$t('listApplyRoomDiscountRecordDetails.createTime')"
+          align="center" />
+      </el-table>
+
+      <el-pagination :current-page.sync="pagination.current" :page-sizes="[10, 20, 30, 50]" :page-size="pagination.size"
+        :total="pagination.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange" />
+    </el-card>
+
+    <view-image ref="viewImage" />
+  </div>
+</template>
+
+<script>
+import { queryApplyRoomDiscountRecordDetail } from '@/api/fee/listApplyRoomDiscountRecordDetailsApi'
+import { getCommunityId } from '@/api/community/communityApi'
+import ViewImage from '@/components/system/viewImage'
+
+export default {
+  name: 'ListApplyRoomDiscountRecordDetails',
+  components: {
+    ViewImage
+  },
+  data() {
+    return {
+      applyRoomDiscountRecordDetailsInfo: {
+        applyRoomDiscountRecordDetails: [],
+        conditions: {
+          ardrId: '',
+          roomName: '',
+          state: '',
+          roomId: '',
+          communityId: ''
+        }
+      },
+      pagination: {
+        current: 1,
+        size: 10,
+        total: 0
+      }
+    }
+  },
+  created() {
+    this.applyRoomDiscountRecordDetailsInfo.conditions.ardrId = this.$route.query.ardrId
+    this.applyRoomDiscountRecordDetailsInfo.conditions.roomName = this.$route.query.roomName
+    this.applyRoomDiscountRecordDetailsInfo.conditions.state = this.$route.query.state
+    this.applyRoomDiscountRecordDetailsInfo.conditions.communityId = getCommunityId()
+    this._listApplyRoomDiscountRecordDetails()
+  },
+  methods: {
+    async _listApplyRoomDiscountRecordDetails() {
+      try {
+        const params = {
+          page: this.pagination.current,
+          row: this.pagination.size,
+          ...this.applyRoomDiscountRecordDetailsInfo.conditions
+        }
+        const { data, total } = await queryApplyRoomDiscountRecordDetail(params)
+        this.applyRoomDiscountRecordDetailsInfo.applyRoomDiscountRecordDetails = data
+        this.pagination.total = total
+      } catch (error) {
+        console.error('Failed to fetch apply room discount record details:', error)
+      }
+    },
+    handleSizeChange(val) {
+      this.pagination.size = val
+      this._listApplyRoomDiscountRecordDetails()
+    },
+    handleCurrentChange(val) {
+      this.pagination.current = val
+      this._listApplyRoomDiscountRecordDetails()
+    },
+    _goBack() {
+      this.$router.go(-1)
+    },
+    showImg(url) {
+      this.$refs.viewImage.open(url)
+    },
+    handleImageError(e) {
+      e.target.src = '/img/noPhoto.jpg'
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.listApplyRoomDiscountRecordDetails-container {
+  padding: 20px;
+
+  .box-card {
+    margin-bottom: 20px;
+  }
+
+  .el-pagination {
+    margin-top: 20px;
+    text-align: right;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/fee/listApplyRoomDiscountRecordList.vue b/src/views/fee/listApplyRoomDiscountRecordList.vue
index de9a343..d87b401 100644
--- a/src/views/fee/listApplyRoomDiscountRecordList.vue
+++ b/src/views/fee/listApplyRoomDiscountRecordList.vue
@@ -3,8 +3,10 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <div class="card-header">
-          <span>{{ listApplyRoomDiscountRecordsInfo.conditions.roomName }}</span>
-          <span class="header-title">{{ $t('listApplyRoomDiscountRecord.title') }}</span>
+          <div>
+            <span>{{ listApplyRoomDiscountRecordsInfo.conditions.roomName }}</span>
+            <span class="header-title">{{ $t('listApplyRoomDiscountRecord.title') }}</span>
+          </div>
           <div class="header-tools">
             <el-button type="primary" size="small" @click="_openAddModal(listApplyRoomDiscountRecordsInfo.applyRoomDiscount)">
               <i class="el-icon-plus"></i>
@@ -35,7 +37,7 @@
           <template slot-scope="scope">
             <el-button-group>
               <el-button size="mini" @click="_openApplyRoomDiscountRecordDetailsModel(scope.row)">
-                {{ $t('common.viewDetails') }}
+                {{ $t('common.viewDetail') }}
               </el-button>
               <el-button size="mini" type="danger" @click="_openDeleteApplyRoomDiscountRecordModel(scope.row)">
                 {{ $t('common.delete') }}
diff --git a/src/views/fee/listOweFeeList.vue b/src/views/fee/listOweFeeList.vue
index 8bc58c1..cd553e0 100644
--- a/src/views/fee/listOweFeeList.vue
+++ b/src/views/fee/listOweFeeList.vue
@@ -47,7 +47,7 @@
         <el-col :span="6">
           <el-select v-model="listOweFeeInfo.conditions.roomSubType" :placeholder="$t('listOweFee.search.roomType')"
             style="width:100%">
-            <el-option :label="$t('common.selectRoomType')" value=""></el-option>
+            <el-option :label="$t('listOweFee.search.roomType')" value=""></el-option>
             <el-option v-for="(item, index) in listOweFeeInfo.roomSubTypes" :key="index" :label="item.name"
               :value="item.statusCd"></el-option>
           </el-select>
@@ -59,14 +59,14 @@
         <el-col :span="6">
           <el-select v-model="listOweFeeInfo.conditions.payObjType" :placeholder="$t('listOweFee.search.payObjType')"
             style="width:100%">
-            <el-option :label="$t('common.selectPayObjType')" value=""></el-option>
+            <el-option :label="$t('listOweFee.search.payObjType')" value=""></el-option>
             <el-option v-for="(item, index) in listOweFeeInfo.payObjTypes" :key="index" :label="item.name"
               :value="item.statusCd"></el-option>
           </el-select>
         </el-col>
       </el-row>
 
-      <el-row v-show="listOweFeeInfo.moreCondition" :gutter="20">
+      <el-row v-show="listOweFeeInfo.moreCondition" :gutter="20" class="margin-top">
         <el-col v-if="listOweFeeInfo.conditions.payObjType === '3333'" :span="6">
           <el-input v-model.trim="listOweFeeInfo.conditions.num"
             :placeholder="$t('listOweFee.search.roomNumFormat')"></el-input>
@@ -148,7 +148,7 @@
 <script>
 import { getDict } from '@/api/community/communityApi'
 import { getCommunityId } from '@/api/community/communityApi'
-import { queryReportOweFee, listFeeConfigs, exportData,queryUnits } from '@/api/fee/listOweFeeApi'
+import { queryReportOweFee, listFeeConfigs, exportData, queryUnits } from '@/api/fee/listOweFeeApi'
 import SearchFloor from '@/components/fee/searchFloor'
 
 export default {
diff --git a/src/views/oa/staffAttendanceManageList.vue b/src/views/oa/staffAttendanceManageList.vue
index 867ca7c..f3c8d7d 100644
--- a/src/views/oa/staffAttendanceManageList.vue
+++ b/src/views/oa/staffAttendanceManageList.vue
@@ -16,9 +16,11 @@
               :placeholder="$t('staffAttendance.staffPlaceholder')" class="filter-item"
               @keyup.enter.native="loadStaffs"></el-input>
 
-            <el-button type="primary" class="filter-item" @click="loadStaffs">
-              {{ $t('common.search') }}
-            </el-button>
+            <div class="filter-item text-right">
+              <el-button type="primary" @click="loadStaffs">
+                {{ $t('common.search') }}
+              </el-button>
+            </div>
           </div>
 
           <div class="staff-list">
@@ -71,7 +73,7 @@
     </el-row>
 
     <!-- 子组件 -->
-     
+
     <choose-org-tree ref="chooseOrgTree" @switchOrg="handleSwitchOrg"></choose-org-tree>
     <staff-attendance-detail ref="staffAttendanceDetail"></staff-attendance-detail>
     <staff-attendance-replenish-check-in ref="staffAttendanceReplenishCheckIn"></staff-attendance-replenish-check-in>
@@ -83,7 +85,7 @@ import { getCommunityId } from '@/api/community/communityApi'
 import {
   queryStaffInfos,
   queryAttendanceClassesTask,
-  
+
 } from '@/api/oa/staffAttendanceManageApi'
 import { dateFormat } from '@/utils/dateUtil'
 import ChooseOrgTree from '@/components/org/ChooseOrgTree'
@@ -149,7 +151,7 @@ export default {
           communityId: this.communityId
         }
 
-        const { data } = await queryStaffInfos(params)
+        const data = await queryStaffInfos(params)
         this.staffAttendanceManageInfo.staffs = data.staffs || []
 
         if (this.staffAttendanceManageInfo.staffs.length > 0) {
--
libgit2 0.21.4