From 2f701074159b7df95eeaf6425daa1c57f476750d Mon Sep 17 00:00:00 2001
From: Zy <1448159279@qq.com>
Date: Mon, 21 Sep 2026 15:47:02 +0800
Subject: [PATCH] =?UTF-8?q?9/21=20=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF-?=
 =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=88=97=E8=A1=A8-=E5=AF=B9=E4=BA=8E?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E7=BC=B4=E8=B4=B9=E6=B7=BB=E5=8A=A0=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=E7=BC=B4=E8=B4=B9=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=B8=90?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                          |  2 +-
 src/views/system/Sdb/ChargeItem/index.vue |  4 +--
 src/views/system/house/HouseDetails.vue   | 41 +++++++++++++++++++++--
 src/views/system/parking/parkReview.vue   | 11 +++++-
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index 08168b7..eaa328f 100644
--- a/.env.development
+++ b/.env.development
@@ -11,7 +11,7 @@ VITE_APP_BASE_API='/dev-api'
 # # 开发环境  接口代理地址
 #VITE_APP_PROXY_API='http://192.168.1.222:8080'
 # 开发环境  接口代理地址
-VITE_APP_PROXY_API='http://192.168.1.6:8080'
+VITE_APP_PROXY_API='http://192.168.0.178:8080'
 # 图片基础地址
 VITE_IMG_URL='http://192.168.1.222:8080'
 
diff --git a/src/views/system/Sdb/ChargeItem/index.vue b/src/views/system/Sdb/ChargeItem/index.vue
index af277f1..f187cd1 100644
--- a/src/views/system/Sdb/ChargeItem/index.vue
+++ b/src/views/system/Sdb/ChargeItem/index.vue
@@ -42,7 +42,7 @@
       <el-table v-loading="loading" :data="chargeItemList" border @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55" />
         <el-table-column align="center" label="项目名称" prop="itemName" />
-        <el-table-column align="center" label="计费方式" prop="billingType" width="100">
+        <el-table-column align="center" label="计费方式" prop="billingType" width="150">
           <template #default="scope">
             <dict-tag :options="com_charge_item_method" :value="scope.row.billingType"></dict-tag>
           </template>
@@ -84,7 +84,7 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="备注" prop="remark" show-overflow-tooltip />
-        <el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作">
+        <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
           <template #default="scope">
             <el-button v-has-permi="['chargeItem:chargeItem:edit']" link type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
             <el-button v-has-permi="['chargeItem:chargeItem:remove']" link type="primary" @click="handleDelete(scope.row)">删除</el-button>
diff --git a/src/views/system/house/HouseDetails.vue b/src/views/system/house/HouseDetails.vue
index 8f4f8e3..3b9e612 100644
--- a/src/views/system/house/HouseDetails.vue
+++ b/src/views/system/house/HouseDetails.vue
@@ -188,12 +188,42 @@
         <span>缴费账单</span>
       </div>
       <div>
-        <el-table :data="billList" style="width: 100%">
+        <el-table :data="billList" style="width: 100%; max-height: 500px; overflow: auto">
           <el-table-column label="账单名称" prop="detailsName" />
           <el-table-column label="账单项目" prop="chargeItemName" />
           <el-table-column label="金额" prop="money">
             <template #default="scope">
-              <span>{{ scope.row.amount }}</span>
+              <div class="flex" style="width: 120px; justify-content: start; align-items: center">
+                <div style="width: 80px; text-align: left">
+                  {{ scope.row.amount }}
+                </div>
+                <el-tooltip v-if="scope.row.payStatus === '3'" class="box-item" effect="light" placement="top">
+                  <el-icon color="#909399"><QuestionFilled /></el-icon>
+                  <template #content>
+                    <div style="line-height: 1.8; font-size: 13px; width: 180px">
+                      <div class="flex justify-between" style="text-align: right">
+                        <span>总金额</span>
+                        <span>{{ scope.row.amount }}￥</span>
+                      </div>
+                      <div class="flex justify-between" style="text-align: right">
+                        <span>优惠金额</span>
+                        <span>− {{ scope.row.singleDiscountAmount }}￥</span>
+                      </div>
+                      <div class="flex justify-between" style="text-align: right">
+                        <span>已交金额</span>
+                        <span>− {{ scope.row.paidAmount }}￥</span>
+                      </div>
+                      <div
+                        class="flex justify-between cursor-pointer"
+                        style="margin-top: 6px; border-top: 1px solid #ccc; text-align: right; padding-top: 6px"
+                      >
+                        <span>待缴金额</span>
+                        <span style="font-weight: bold; color: red">{{ scope.row.needPayAmount }}￥</span>
+                      </div>
+                    </div>
+                  </template>
+                </el-tooltip>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="支付状态" prop="payStatus">
@@ -202,6 +232,7 @@
             </template>
           </el-table-column>
         </el-table>
+        <pagination v-show="total > 0" v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNum" :total="total" @pagination="getList" />
       </div>
     </div>
   </div>
@@ -213,6 +244,7 @@ import DictTag from '@/components/DictTag/index.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { Data, getHouseMain, House } from '@/api/system/house';
 import { billlistType, billQuery } from '@/api/system/SdbCashier';
+import { QuestionFilled } from '@element-plus/icons-vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_resident_relationship } = toRefs<any>(proxy?.useDict('com_resident_relationship'));
@@ -290,6 +322,11 @@ function getBillByHouse(info: House) {
     total.value = res.total;
   });
 }
+function getList() {
+  if (HouseInfo.value) {
+    getBillByHouse(HouseInfo.value.house);
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/parking/parkReview.vue b/src/views/system/parking/parkReview.vue
index f90c5c2..4bd66d4 100644
--- a/src/views/system/parking/parkReview.vue
+++ b/src/views/system/parking/parkReview.vue
@@ -284,6 +284,10 @@ type parkingReviewProcess = {
   submitTime: string;
   propertyTime: string;
   certificationTime: string;
+  'parkingId': string;
+  'propertyReviewFeedback': string;
+  'carId': null;
+  'residentId': null;
 };
 const parkingReviewInfo = ref<parkingReviewType>({
   parking: {
@@ -329,7 +333,11 @@ const parkingReviewInfo = ref<parkingReviewType>({
     certificationStatus: null,
     submitTime: null,
     propertyTime: null,
-    certificationTime: null
+    certificationTime: null,
+    parkingId: null,
+    propertyReviewFeedback: null,
+    carId: null,
+    residentId: null
   }
 });
 
@@ -346,6 +354,7 @@ function getInfo() {
         res.data.car.carImageUrlList = res.data.car.carImageUrl.split(',').filter(Boolean) ?? [];
       }
       parkingReviewInfo.value = res.data;
+      form.value.propertyReviewFeedback = res.data.parkingReviewProcess.propertyReviewFeedback || '';
       handleActiveStaus(res.data.parkingReviewProcess);
     });
   }