Merge pull request 'master' (#1) from master into prod

Reviewed-on: #1

.gitea/workflows/dev.yml

@@ -2,7 +2,7 @@ run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
 on:
   push:
     branches:
-      - master
+      - prod
 jobs:
   Explore-Gitea-Actions:
     runs-on: ubuntu
@@ -10,24 +10,24 @@ jobs:
       - name: 拉取代码仓库
         uses: http://git.missmoc.top/mocheng/checkout@v4
         with:
-          fetch-depth: 1  # 只拉取最新的1个提交（浅克隆）
+          fetch-depth: 0  # 只拉取最新的1个提交（浅克隆）
 
       - name: Set up Node.js
         uses: http://git.missmoc.top/mocheng/setup-node@v3
         with:
           node-version: 20.x
-          
+
       - name: 安装pnpm
         run: npm i pnpm -g
-        
+
       - name: 安装依赖
-        run: pnpm install 
+        run: pnpm install
         continue-on-error: false  # 依赖安装失败则终止工作流
-        
+
       - name: 构建项目
         run: pnpm build:antd
         continue-on-error: false  # 构建失败则终止工作流
-        
+
       - name: 检查构建结果
         run: |
           if [ ! -d "./apps/web-antd/dist" ]; then
@@ -38,7 +38,7 @@ jobs:
             echo "构建目录为空，构建失败"
             exit 1
           fi
-          
-      
+
+
       - name: 通过SSH复制文件
-        run: cp -rf ./apps/web-antd/dist/* /www/wwwroot/183.230.235.66_11010/property
+        run: cp -rf ./apps/web-antd/dist/* /www/wwwroot/183.230.235.66_11010/property

apps/web-antd/src/views/property/costManagement/costMeterWater/data.ts

@@ -35,7 +35,7 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     title: '抄表类型',
-    field: 'meterTypeId',
+    field: 'costTypeName',
   },
   {
     title: '本期度数',

apps/web-antd/src/views/property/costManagement/paymentReview/data.ts

@@ -33,8 +33,13 @@ export const querySchema: FormSchemaGetter = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '房屋',
-    field: 'roomNumber',
+    title: '费用类型',
+    field: 'costType',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.costType, 'pro_expense_type');
+      },
+    },
   },
   {
     title: '费用项目',

apps/web-antd/src/views/property/costManagement/paymentReview/paymentReview-detail.vue

@@ -36,7 +36,7 @@ async function handleOpenChange(open: boolean) {
   <BasicModal :footer="false" :fullscreen-button="false" title="缴费审核详情" class="w-[70%]">
     <Descriptions v-if="paymentReviewDetail" size="small" :column="2" bordered
                   :labelStyle="{width:'120px'}">
-      <DescriptionsItem label="房屋">
+      <DescriptionsItem label="房屋" v-if="paymentReviewDetail.roomNumber">
         {{ paymentReviewDetail.roomNumber }}
       </DescriptionsItem>
       <DescriptionsItem label="费用项目">