Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

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

@@ -55,7 +55,7 @@ export const columns: VxeGridProps['columns'] = [
   },
   { title: '车牌号', field: 'carNumber' },
   { title: '车位', field: 'location' },
-  { title: '业主', field: 'personId' },
+  { title: '业主', field: 'personName' },
   {
     title: '缴费状态',
     field: 'chargeStatus',

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

@@ -92,7 +92,7 @@ async function handleEdit(row: Required<PaymentReviewForm>) {
           <ghost-button
               :disabled="row.state!=='0'"
               @click.stop="handleEdit(row)"
-              v-access:code="['property:payFeeAudit:query']"
+              v-access:code="['property:payFeeAudit:edit']"
           >
             {{ '审核' }}
           </ghost-button>

apps/web-antd/src/views/property/customerService/questionnaire/index.vue

@@ -175,8 +175,7 @@ async function handleDelete(row: Required<QuestionnaireForm>) {
             </ghost-button>
           </Popconfirm>
           <ghost-button
-            v-access:code="['property:questionnaire:statistics']"
-            @click.stop="handleEdit(row)"
+            :disabled="row.status=='1'"
           >
             统计分析
           </ghost-button>

apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/data.ts

@@ -47,7 +47,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '订单号',
     field: 'orderNo',
-    width: 100
+    minWidth: 180
   },
   {
     title: '客户名称',
@@ -134,7 +134,7 @@ export const columns: VxeGridProps['columns'] = [
     fixed: 'right',
     slots: {default: 'action'},
     title: '操作',
-    minWidth: 180,
+   width: 180,
   },
 ];