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

apps/web-antd/src/api/property/attendanceManagement/attendanceArea/model.d.ts

@@ -20,7 +20,7 @@ export interface AttendanceAreaVO {
    * 备注
    */
   reamark: string;
-
+  areaDevice?: any[];
 }
 
 export interface AttendanceAreaForm extends BaseEntity {
@@ -43,7 +43,6 @@ export interface AttendanceAreaForm extends BaseEntity {
    * 备注
    */
   reamark?: string;
-
 }
 
 export interface AttendanceAreaQuery extends PageQuery {
@@ -63,7 +62,7 @@ export interface AttendanceAreaQuery extends PageQuery {
   reamark?: string;
 
   /**
-    * 日期范围参数
+   * 日期范围参数
-    */
+   */
   params?: any;
 }

apps/web-antd/src/views/property/attendanceManagement/attendanceArea/attendanceArea-modal.vue

@@ -63,6 +63,9 @@ const [BasicModal, modalApi] = useVbenModal({
 
     if (isUpdate.value && id) {
       const record = await attendanceAreaInfo(id);
+      record.deviceManageId = record.areaDevice
+          .map((device: any) => device.remoteSisDeviceManage?.id || '')
+          .filter((id: string) => id);
       await formApi.setValues(record);
     }
     await markInitialized();

apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue

@@ -201,7 +201,7 @@ const modalSchema = [
     fieldName: 'signType',
     component: 'Select',
     componentProps: {
-      options:getDictOptions('wy_bjqdfs')
+      options: getDictOptions('wy_bjqdfs'),
     },
     dependencies: {
       show: () => (isReadonly.value ? true : false),
@@ -213,10 +213,11 @@ const modalSchema = [
     fieldName: 'signImgUrl',
     component: 'ImageUpload',
     componentProps: {
-      helpMessage:false
+      helpMessage: false,
     },
     dependencies: {
-      show: (formValue) => (isReadonly.value&&formValue.signImgUrl ? true : false),
+      show: (formValue) =>
+        isReadonly.value && formValue.signImgUrl ? true : false,
       triggerFields: [''],
     },
   },
@@ -289,7 +290,6 @@ const [BasicModal, modalApi] = useVbenModal({
     if (!isOpen) {
       return null;
     }
-    console.log(isReadonly.value);
 
     // 查询服务地址树形结构
     setupCommunitySelect();
@@ -314,6 +314,7 @@ const [BasicModal, modalApi] = useVbenModal({
     }
     if ((isUpdate.value || isReadonly.value) && id) {
       const record: any = await clean_orderInfo(id);
+
       if (record.starTime) record.starTime = dayjs(record.starTime);
       if (record.endTime) record.endTime = dayjs(record.endTime);
       editUnitId.value = record.unitId || '';
@@ -496,7 +497,6 @@ async function handleConfirm() {
       return;
     }
     const data = cloneDeep(await formApi.getValues());
-    console.log(data);
 
     // 单位数据缓存
     if (unitListData.length === 0) {
@@ -537,7 +537,6 @@ async function handleClosed() {
 // 获取服务地址
 async function setupCommunitySelect() {
   const areaList = await communityTree(4);
-  console.log(areaList);
 
   // 选中后显示在输入框的值 即父节点 / 子节点
   // addFullName(areaList, 'areaName', ' / ');

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

@@ -6,7 +6,7 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';
 import { costItemSettingList } from '#/api/property/costManagement/costItemSetting';
-import { userList } from '#/api/system/user';
+import { personList } from '#/api/property/resident/person';
 
 /**
  * 查询表单 schema
@@ -23,12 +23,12 @@ export const querySchema: FormSchemaGetter = () => [
     component: 'ApiSelect',
     componentProps: {
       api: async () => {
-        const rows = await userList({ pageSize: 1000000000, pageNum: 1 });
+        const rows = await personList({ pageSize: 1000000000, pageNum: 1 });
         return rows;
       },
       resultField: 'rows',
       labelField: 'userName',
-      valueField: 'userId',
+      valueField: 'id',
     },
   },
   {
@@ -141,7 +141,11 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'ApiSelect',
     componentProps: {
       api: async () => {
-        const rows = await costItemSettingList({ pageSize: 1000000000, pageNum: 1, costType: '2' });
+        const rows = await costItemSettingList({
+          pageSize: 1000000000,
+          pageNum: 1,
+          costType: '2',
+        });
         return rows;
       },
       resultField: 'rows',
@@ -208,12 +212,12 @@ export const addModalSchema: FormSchemaGetter = () => [
     rules: 'required',
     componentProps: {
       api: async () => {
-        const rows = await userList({ pageSize: 1000000000, pageNum: 1 });
+        const rows = await personList({ pageSize: 1000000000, pageNum: 1 });
         return rows;
       },
       resultField: 'rows',
       labelField: 'userName',
-      valueField: 'userId',
+      valueField: 'id',
     },
   },
   {
@@ -242,7 +246,11 @@ export const addModalSchema: FormSchemaGetter = () => [
     component: 'ApiSelect',
     componentProps: {
       api: async () => {
-        const rows = await costItemSettingList({ pageSize: 1000000000, pageNum: 1, costType: '2' });
+        const rows = await costItemSettingList({
+          pageSize: 1000000000,
+          pageNum: 1,
+          costType: '2',
+        });
         return rows;
       },
       resultField: 'rows',

apps/web-antd/src/views/property/costManagement/costMeterWater/costMeterWater-modal.vue

@@ -48,11 +48,11 @@ const schema = [
     componentProps: {
       api: async () => {
         const res = await personList({ pageSize: 1000000000, pageNum: 1 });
-        return res.rows.map((item: any) => ({
+        return res;
-          label: item.userName,
-          value: item.id,
-        }));
       },
+      resultField: 'rows',
+      labelField: 'userName',
+      valueField: 'id',
     },
   },
   {