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

apps/web-antd/src/api/property/resident/unit/model.d.ts

@@ -65,6 +65,9 @@ export interface Resident_unitVO {
    * 权限组名称
    */
   authGroupName?: string;
+  // 授权期限
+  authBegDate?:string;//开始
+  authEndDate?:string;//结束
 
 }
 

apps/web-antd/src/views/property/attendanceManagement/attendanceArea/data.ts

@@ -62,11 +62,13 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '区域',
     fieldName: 'area',
     component: 'Input',
+    rules: 'required',
   },
   {
     label: '摄像机',
     fieldName: 'deviceManageId',
     component: 'ApiSelect',
+    rules: 'required',
     componentProps: {
       api: async () => {
         const res = await deviceManageList({

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,
   },
 ];
 

apps/web-antd/src/views/property/resident/unit/unit-modal.vue

@@ -64,7 +64,7 @@ const [BasicModal, modalApi] = useVbenModal({
     await initLocationOptions();
     if (isUpdate.value && id) {
       const record = await resident_unitInfo(id);
-      await formApi.setValues(record);
+      await formApi.setValues({...record,authTime:[record.authBegDate,record.authEndDate]});
     }
     await markInitialized();