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

# Conflicts:
#	apps/web-antd/vite.config.mts

apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts

@@ -98,7 +98,7 @@ export const modalSchema: FormSchemaGetter = () => [
   },
   {
     label: '完成时效（小时）',
-    fieldName: 'isTransfers',
+    fieldName: 'completionNumber',
     component: 'Input',
     rules: 'required',
   },

apps/web-antd/src/views/property/businessManagement/workOrdersType/workOrdersType-detail.vue

@@ -41,11 +41,6 @@ async function handleOpenChange(open: boolean) {
           :is="renderDict(workOrdersTypeInfoDetail.operationMode,'pro_operation_pattern')"
         />
       </DescriptionsItem>
-      <DescriptionsItem label="运作模式" v-if="workOrdersTypeInfoDetail.operationMode!=null">
-        <component
-          :is="renderDict(workOrdersTypeInfoDetail.operationMode,'pro_operation_pattern')"
-        />
-      </DescriptionsItem>
       <DescriptionsItem label="排序值">
         {{ workOrdersTypeInfoDetail.sort }}
       </DescriptionsItem>

apps/web-antd/src/views/property/clean/cleanSettings/data.ts

@@ -189,6 +189,6 @@ export const modalSchema: FormSchemaGetter = () => [
   {
     label: '备注',
     fieldName: 'remark',
-    component: 'Input',
+    component: 'Textarea',
   },
 ];

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

@@ -120,6 +120,7 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '价格体系',
     fieldName: 'price',
     component: 'Input',
+    rules: 'required',
   },
   {
     label: '状态',
@@ -134,6 +135,6 @@ export const modalSchema: FormSchemaGetter = () => [
   {
     label: '备注',
     fieldName: 'remarks',
-    component: 'Input',
+    component: 'Textarea',
   },
 ];

apps/web-antd/src/views/property/roomBooking/conferenceReservations/conferenceReservations-modal.vue

@@ -118,6 +118,7 @@ async function queryAddServices() {
     unit: item.unit,
     quantity: 0
   }))
+  console.log(res,addServiceList.value);
 }
 
 async function queryPersonData() {

apps/web-antd/src/views/property/roomBooking/conferenceReservations/index.vue

@@ -4,8 +4,6 @@
     <a-form
       :model="formState"
       layout="inline"
-      @finish="onFinish"
-      @finishFailed="onFinishFailed"
       class="form-box"
     >
       <a-form-item label="会议日期">
@@ -80,6 +78,7 @@ const formState = reactive<FormState>({
 });
 const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE;
 
+const meetingList = ref<MeetVO[]>([])
 async function handleSearch() {
   let hours = '';
   if (formState.openHours && formState.openHours.length) {
@@ -107,15 +106,6 @@ function handleAdd(id:string) {
   modalApi.setData({id});
   modalApi.open();
 }
-
-const onFinish = (values: any) => {
-  console.log('Success:', values);
-};
-const onFinishFailed = (errorInfo: any) => {
-  console.log('Failed:', errorInfo);
-};
-
-const meetingList = ref<MeetVO[]>([])
 </script>
 
 <style lang="scss">

apps/web-antd/vite.config.mts

@@ -1,5 +1,4 @@
 import { defineConfig } from '@vben/vite-config';
-import path from 'path';
 
 // 自行取消注释来启用按需导入功能
 // import { AntDesignVueResolver } from 'unplugin-vue-components/resolvers';
@@ -28,8 +27,7 @@ export default defineConfig(async () => {
             changeOrigin: true,
             rewrite: (path) => path.replace(/^\/api/, ''),
             // mock代理目标地址
-            // target: 'http://192.168.43.169:8080',
+            target: 'http://192.168.1.101:8080',
-            target: 'http://127.0.0.1:8080',
             // target: 'http://192.168.0.108:8080',
             // target: 'http://192.168.0.106:8080',
             // target: 'http://47.109.37.87:3010',