会议管理

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

@@ -29,7 +29,7 @@ export interface OrderMaintainVO {
   /**
    * 服务类型
    */
-  serveType: number;
+  serveType: string | number;
 
   /**
    * 养护周期类型
@@ -59,7 +59,7 @@ export interface OrderMaintainVO {
   /**
    * 巡检结果
    */
-  inspectResult: number;
+  inspectResult: string | number;
 
   /**
    * 处理措施
@@ -79,7 +79,7 @@ export interface OrderMaintainVO {
   /**
    * 处理状态
    */
-  state: number;
+  state: string | number;
 }
 
 export interface OrderMaintainForm extends BaseEntity {
@@ -111,7 +111,7 @@ export interface OrderMaintainForm extends BaseEntity {
   /**
    * 服务类型
    */
-  serveType?: number;
+  serveType?: string | number;
 
   /**
    * 养护周期类型
@@ -141,7 +141,7 @@ export interface OrderMaintainForm extends BaseEntity {
   /**
    * 巡检结果
    */
-  inspectResult?: number;
+  inspectResult?: string | number;
 
   /**
    * 处理措施
@@ -161,7 +161,7 @@ export interface OrderMaintainForm extends BaseEntity {
   /**
    * 处理状态
    */
-  state?: number;
+  state?: string | number;
 }
 
 export interface OrderMaintainQuery extends PageQuery {
@@ -188,7 +188,7 @@ export interface OrderMaintainQuery extends PageQuery {
   /**
    * 服务类型
    */
-  serveType?: number;
+  serveType?: string | number;
 
   /**
    * 养护周期类型
@@ -218,7 +218,7 @@ export interface OrderMaintainQuery extends PageQuery {
   /**
    * 巡检结果
    */
-  inspectResult?: number;
+  inspectResult?: string | number;
 
   /**
    * 处理措施
@@ -238,10 +238,92 @@ export interface OrderMaintainQuery extends PageQuery {
   /**
    * 处理状态
    */
-  state?: number;
+  state?: string | number;
 
   /**
     * 日期范围参数
     */
   params?: any;
 }
+
+export interface conservationManagement extends BaseEntity {
+  /**
+   * 主键
+   */
+  id: string | number;
+
+  /**
+   * 养护名称
+   */
+  maintainName: string;
+
+  /**
+   * 小区id
+   */
+  communityId: string | number;
+
+  /**
+   * 建筑id
+   */
+  buildingId: string | number;
+
+  /**
+   * 楼层id
+   */
+  floorId: string | number;
+
+  /**
+   * 服务类型
+   */
+  serveType: string | number;
+
+  /**
+   * 养护周期类型
+   */
+  periodType: number;
+
+  /**
+   * 养护周期频次
+   */
+  periodFrequency: number;
+
+  /**
+   * 订单id
+   */
+  orderId: string | number;
+
+  /**
+   * 计划执行时间
+   */
+  startTime: string;
+
+  /**
+   * 计划完成时间
+   */
+  endTime: string;
+
+  /**
+   * 巡检结果
+   */
+  inspectResult: string | number;
+
+  /**
+   * 处理措施
+   */
+  measure: string;
+
+  /**
+   * 客户评分
+   */
+  customerScore: number;
+
+  /**
+   * 客户反馈
+   */
+  customerAdvice: string;
+
+  /**
+   * 处理状态
+   */
+  state: string | number;
+}

apps/web-antd/src/views/property/attendanceManagement/attendanceSettings/attendanceGroupSettings/index.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  考勤组设置
+</template>
+
+<style scoped lang="scss">
+
+</style>

apps/web-antd/src/views/property/attendanceManagement/attendanceSettings/festivalAndHoliday/index.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  节假日
+</template>
+
+<style scoped lang="scss">
+
+</style>

apps/web-antd/src/views/property/attendanceManagement/attendanceSettings/shiftSetting/index.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  班次设置
+</template>
+
+<style scoped lang="scss">
+
+</style>

apps/web-antd/src/views/property/attendanceManagement/attendanceStatistics/CheckInRecord/index.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  打卡记录
+</template>
+
+<style scoped lang="scss">
+
+</style>

apps/web-antd/src/views/property/attendanceManagement/attendanceStatistics/dailyStatistics/index.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  每日统计
+</template>
+
+<style scoped lang="scss">
+
+</style>

apps/web-antd/src/views/property/attendanceManagement/holidayType/index.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  假期类型
+</template>
+
+<style scoped lang="scss">
+
+</style>

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/index.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  排班管理
+</template>
+
+<style scoped lang="scss">
+
+</style>

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

@@ -64,38 +64,47 @@ export const columns: VxeGridProps['columns'] = [
         return (rowIndex + 1).toString();
       },
     },
+    width: 'auto'
   },
   {
     title: '订单号',
     field: 'orderId',
+    width: 'auto'
   },
   {
     title: '租赁合同编号',
     field: 'userId',
+    width: 'auto'
   },
   {
     title: '租赁人',
     field: 'userName',
+    width: 'auto'
   },
   {
     title: '租金',
     field: 'rent',
+    width: 'auto'
   },
   {
     title: '押金',
     field: 'deposit',
+    width: 'auto'
   },
   {
     title: '违约金',
     field: 'penalty',
+    width: 'auto'
   },
   {
     title: '总金额',
     field: 'totalAmount',
+    width: 'auto'
   },
   {
     title: '收费日期',
     field: 'chargeDate',
+    width: 'auto'
   },
   {
     title: '支付方式',
@@ -105,6 +114,7 @@ export const columns: VxeGridProps['columns'] = [
         return renderDict(row.paymentMethod, 'pro_payment_method');
       },
     },
+    width: 'auto'
   },
   {
     title: '开票状态',
@@ -114,10 +124,12 @@ export const columns: VxeGridProps['columns'] = [
         return renderDict(row.invoiceStatus, 'pro_invoice_status');
       },
     },
+    width: 'auto'
   },
   {
     title: '发票类型',
     field: 'invoiceType',
+    width: 'auto'
   },
   {
     title: '收费状态',
@@ -127,10 +139,12 @@ export const columns: VxeGridProps['columns'] = [
         return renderDict(row.chargeStatus, 'pro_charging_status');
       },
     },
+    width: 'auto'
   },
   {
     title: '创建时间',
     field: 'createTime',
+    width: 'auto'
   },
   {
     field: 'action',
@@ -217,8 +231,11 @@ export const modalSchema: FormSchemaGetter = () => [
   {
     label: '发票类型',
     fieldName: 'invoiceType',
-    component: 'Input',
+    component: 'Select',
-    rules: 'required',
+    componentProps: {
+      options: getDictOptions('pro_invoice_type'),
+    },
+    rules: 'selectRequired',
   },
   {
     label: '收费状态',

apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-modal.vue

@@ -67,8 +67,7 @@ async function handleConfirm() {
     }
     const data = cloneDeep(await formApi.getValues());
     if (userInfo) {
-      console.log(userInfo);
+      data.userId = userInfo.userId
-      data.userId = userInfo.value
       data.userName = userInfo.userName
     }
     await (isUpdate.value ? orderChargeUpdate(data) : orderChargeAdd(data));
@@ -82,7 +81,6 @@ async function handleConfirm() {
   }
 }
 let userInfo = reactive({
-  value:'',
   userId: '',
   userName: '',
 });

apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/query-user-list.vue

@@ -1,21 +1,18 @@
 <script lang="ts" setup>
 import {ref, watch} from 'vue';
 import {Select} from 'ant-design-vue';
-import {rentalOrderInfo, rentalOrderList} from "#/api/property/rentalOrder";
+import {personInfo, personList} from "#/api/property/resident/person";
 
 defineOptions({name: 'QueryUserList'});
 
 const props = withDefaults(defineProps<{
-  disabled?: boolean;
-  placeholder?: string;
   isUpdate?: boolean;
   userName?: string;
 }>(), {
-  disabled: false,
-  placeholder: '可根据员工姓名进行搜索...',
   isUpdate: false,
   userName: ''
 });
+
 watch(() => props.userName,
   (newX) => {
     if (props.isUpdate) {
@@ -29,16 +26,16 @@ async function queryUser(value: string, callback: any) {
     pageSize: 100,
     pageNum: 1,
   }
-  const res = await rentalOrderList(queryData);
+  const res = await personList(queryData);
   const options = res.rows.map((user) => ({
-    label: user.customerName,
+    label: user.userName,
-    value: user.id,
+    value: user.userName,
-    userName: user.customerName,
+    userId: user.userId,
+    userName: user.userName,
   }));
   callback(options);
 }
 
-
 const data = ref<any[]>([]);
 const value = ref('');
 
@@ -55,12 +52,10 @@ const handleChange = (val: string) => {
 
 async function getUserInfo(val:number|string) {
   if (!val)  return;
-  const res = await rentalOrderInfo(val)
+  const user = await personInfo(val)
-  const user = res.user
   if (user) {
     data.value = [{
-      label: user.nickName,
+      userId: user.userId,
-      value: user.userId,
       userName: user.userName,
     }]
     emit('update:userInfo', data.value[0]);
@@ -72,7 +67,7 @@ async function getUserInfo(val:number|string) {
   <Select
     v-model="value"
     show-search
-    :placeholder="placeholder"
+    placeholder="可根据租赁人名称进行搜索..."
     style="width: 100%"
     :default-active-first-option="false"
     :show-arrow="false"

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

@@ -14,6 +14,7 @@ export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Select',
     componentProps: {
+      options: getDictOptions('pro_processing_status'),
     },
     fieldName: 'state',
     label: '处理状态',
@@ -30,60 +31,72 @@ export const columns: VxeGridProps['columns'] = [
         return (rowIndex + 1).toString();
       },
     },
+    width: 'auto'
   },
   {
     title: '养护名称',
     field: 'maintainName',
+    width: 'auto'
   },
   {
-    title: '小区id',
+    title: '服务地点（房间id）',
-    field: 'communityId',
+    field: 'roomId',
-  },
+    width: 'auto'
-  {
-    title: '建筑id',
-    field: 'buildingId',
-  },
-  {
-    title: '楼层id',
-    field: 'floorId',
   },
   {
     title: '服务类型',
     field: 'serveType',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.serveType, 'pro_service_type');
+      },
+    },
+    width: 'auto'
   },
   {
     title: '养护周期类型',
     field: 'periodType',
     slots: {
       default: ({ row }) => {
-        // 可选从DictEnum中获取 DictEnum.WY_TIME_UNIT 便于维护
         return renderDict(row.periodType, 'wy_time_unit');
       },
     },
+    width: 'auto'
   },
   {
     title: '养护周期频次',
     field: 'periodFrequency',
+    width: 'auto'
   },
   {
-    title: '订单id',
+    title: '关联订单',
     field: 'orderId',
+    width: 'auto'
   },
   {
     title: '计划执行时间',
     field: 'startTime',
+    width: 'auto'
   },
   {
     title: '计划完成时间',
     field: 'endTime',
+    width: 'auto'
   },
   {
     title: '巡检结果',
     field: 'inspectResult',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.inspectResult, 'pro_inspection_results');
+      },
+    },
+    width: 'auto'
   },
   {
     title: '处理措施',
     field: 'measure',
+    width: 'auto'
   },
   {
     title: '客户评分',
@@ -96,15 +109,22 @@ export const columns: VxeGridProps['columns'] = [
         });
       },
     },
-    width:200
+    width: 'auto'
   },
   {
     title: '客户反馈',
     field: 'customerAdvice',
+    width: 'auto'
   },
   {
     title: '处理状态',
     field: 'state',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.state, 'pro_processing_status');
+      },
+    },
+    width: 'auto'
   },
   {
     field: 'action',
@@ -130,32 +150,24 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'maintainName',
     component: 'Input',
     rules: 'required',
+    labelWidth:100
   },
   {
-    label: '小区id',
+    label: '服务地点',
     fieldName: 'communityId',
     component: 'Input',
     rules: 'required',
-  },
+    labelWidth:100
-  {
-    label: '建筑id',
-    fieldName: 'buildingId',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '楼层id',
-    fieldName: 'floorId',
-    component: 'Input',
-    rules: 'required',
   },
   {
     label: '服务类型',
     fieldName: 'serveType',
     component: 'Select',
     componentProps: {
+      options: getDictOptions('pro_service_type'),
     },
     rules: 'selectRequired',
+    labelWidth:100
   },
   {
     label: '养护周期类型',
@@ -166,18 +178,21 @@ export const modalSchema: FormSchemaGetter = () => [
       options: getDictOptions('wy_time_unit'),
     },
     rules: 'selectRequired',
+    labelWidth:100
   },
   {
     label: '养护周期频次',
     fieldName: 'periodFrequency',
     component: 'Input',
     rules: 'required',
+    labelWidth:100
   },
   {
-    label: '订单id',
+    label: '关联订单',
     fieldName: 'orderId',
     component: 'Input',
     rules: 'required',
+    labelWidth:100
   },
   {
     label: '计划执行时间',
@@ -189,6 +204,7 @@ export const modalSchema: FormSchemaGetter = () => [
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
     rules: 'required',
+    labelWidth:100
   },
   {
     label: '计划完成时间',
@@ -200,16 +216,24 @@ export const modalSchema: FormSchemaGetter = () => [
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
     rules: 'required',
+    labelWidth:100
   },
   {
     label: '巡检结果',
     fieldName: 'inspectResult',
-    component: 'Input',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_inspection_results'),
+    },
+    rules: 'selectRequired',
+    labelWidth:100
   },
   {
     label: '处理措施',
     fieldName: 'measure',
     component: 'Input',
+    rules: 'required',
+    labelWidth:100
   },
   {
     label: '客户评分',
@@ -222,17 +246,22 @@ export const modalSchema: FormSchemaGetter = () => [
       defaultValue: 0
     },
     rules: 'required',
+    labelWidth:100
   },
   {
     label: '客户反馈',
     fieldName: 'customerAdvice',
     component: 'Textarea',
+    labelWidth:100
   },
   {
     label: '处理状态',
     fieldName: 'state',
     component: 'Select',
     componentProps: {
+      options: getDictOptions('pro_processing_status'),
     },
+    rules: 'selectRequired',
+    labelWidth:100
   },
 ];

apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/index.vue

@@ -2,6 +2,7 @@
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import { $t } from '@vben/locales';
 import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
@@ -14,6 +15,7 @@ import {
 import type { OrderMaintainForm } from '#/api/property/conservationManagement/model';
 import orderMaintainModal from './orderMaintain-modal.vue';
 import { columns, querySchema } from './data';
+import orderMaintainDetail from "#/views/property/greenPlantRentalManagement/conservationManagement/orderMaintain-detail.vue";
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -61,6 +63,15 @@ const [OrderMaintainModal, modalApi] = useVbenModal({
   connectedComponent: orderMaintainModal,
 });
 
+const [orderMaintainDetailModal, orderMaintainDetailApi] = useVbenModal({
+  connectedComponent: orderMaintainDetail,
+});
+
+async function handleInfo(row: Required<OrderMaintainForm>) {
+  orderMaintainDetailApi.setData({ id: row.id });
+  orderMaintainDetailApi.open();
+}
+
 function handleAdd() {
   modalApi.setData({});
   modalApi.open();
@@ -115,6 +126,11 @@ function handleMultiDelete() {
       </template>
       <template #action="{ row }">
         <Space>
+          <ghost-button
+            @click.stop="handleInfo(row)"
+          >
+            {{ $t('pages.common.info') }}
+          </ghost-button>
           <ghost-button
             v-access:code="['property:orderMaintain:edit']"
             @click.stop="handleEdit(row)"
@@ -139,5 +155,6 @@ function handleMultiDelete() {
       </template>
     </BasicTable>
     <OrderMaintainModal @reload="tableApi.query()" />
+    <orderMaintainDetailModal/>
   </Page>
 </template>

apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/orderMaintain-detail.vue

@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import type {conservationManagement} from '#/api/property/conservationManagement/model';
+import {shallowRef} from 'vue';
+import {useVbenModal} from '@vben/common-ui';
+import {Descriptions, DescriptionsItem, Rate} from 'ant-design-vue';
+import {orderMaintainInfo} from '#/api/property/conservationManagement';
+import {renderDict} from "#/utils/render";
+
+const [BasicModal, modalApi] = useVbenModal({
+  onOpenChange: handleOpenChange,
+  onClosed() {
+    conservationManagementDetail.value = null;
+  },
+});
+
+const conservationManagementDetail = shallowRef<null | conservationManagement>(null);
+
+async function handleOpenChange(open: boolean) {
+  if (!open) {
+    return null;
+  }
+  modalApi.modalLoading(true);
+  const {id} = modalApi.getData() as { id: number | string };
+  const response = await orderMaintainInfo(id);
+  conservationManagementDetail.value = response;
+  modalApi.modalLoading(false);
+}
+</script>
+
+<template>
+  <BasicModal :footer="false" :fullscreen-button="false" title="养护管理信息" class="w-[70%]">
+    <Descriptions v-if="conservationManagementDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
+      <DescriptionsItem label="养护名称">
+        {{ conservationManagementDetail.maintainName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="服务地点">
+        {{ conservationManagementDetail.roomId }}
+      </DescriptionsItem>
+      <DescriptionsItem label="服务类型" v-if="conservationManagementDetail.serveType!=null">
+        <component
+          :is="renderDict(conservationManagementDetail.serveType,'pro_service_type')"
+        />
+      </DescriptionsItem>
+      <DescriptionsItem label="养护周期">
+        {{ conservationManagementDetail.orderId }}
+      </DescriptionsItem>
+      <DescriptionsItem label="关联订单">
+        {{ conservationManagementDetail.orderId }}
+      </DescriptionsItem>
+      <DescriptionsItem label="计划执行时间">
+        {{ conservationManagementDetail.startTime }}
+      </DescriptionsItem>
+      <DescriptionsItem label="计划完成时间">
+        {{ conservationManagementDetail.endTime }}
+      </DescriptionsItem>
+      <DescriptionsItem label="巡检结果" v-if="conservationManagementDetail.inspectResult!=null">
+        <component
+          :is="renderDict(conservationManagementDetail.inspectResult,'pro_inspection_results')"
+        />
+      </DescriptionsItem>
+      <DescriptionsItem label="处理措施">
+        {{ conservationManagementDetail.measure }}
+      </DescriptionsItem>
+      <DescriptionsItem label="客户评分">
+        <Rate :value="conservationManagementDetail.customerScore" disabled />
+      </DescriptionsItem>
+      <DescriptionsItem label="客户反馈">
+        {{ conservationManagementDetail.customerAdvice }}
+      </DescriptionsItem>
+      <DescriptionsItem label="处理状态" v-if="conservationManagementDetail.state!=null">
+        <component
+          :is="renderDict(conservationManagementDetail.state,'pro_processing_status')"
+        />
+      </DescriptionsItem>
+    </Descriptions>
+  </BasicModal>
+</template>

apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/orderMaintain-modal.vue

@@ -17,7 +17,7 @@ const title = computed(() => {
 
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
-    formItemClass: 'col-span-2',
+    formItemClass: 'col-span-1',
     labelWidth: 80,
     componentProps: {
       class: 'w-full',
@@ -36,7 +36,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 );
 
 const [BasicModal, modalApi] = useVbenModal({
-  class: 'w-[550px]',
+  class: 'w-[60%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,
@@ -52,6 +52,9 @@ const [BasicModal, modalApi] = useVbenModal({
 
     if (isUpdate.value && id) {
       const record = await orderMaintainInfo(id);
+      record.serveType = record.serveType?.toString();
+      record.state = record.state?.toString();
+      record.inspectResult = record.inspectResult?.toString();
       await formApi.setValues(record);
     }
     await markInitialized();

apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/plantsProduct-detail.vue

@@ -2,7 +2,7 @@
 import type {plantsProduct} from '#/api/property/productManagement/model';
 import {shallowRef} from 'vue';
 import {useVbenModal} from '@vben/common-ui';
-import {Descriptions, DescriptionsItem, Rate} from 'ant-design-vue';
+import {Descriptions, DescriptionsItem} from 'ant-design-vue';
 import {plantsProductInfo} from '#/api/property/productManagement';
 import {renderDict} from "#/utils/render";
 

apps/web-antd/vite.config.mts

@@ -27,8 +27,8 @@ export default defineConfig(async () => {
             changeOrigin: true,
             rewrite: (path) => path.replace(/^\/api/, ''),
             // mock代理目标地址
-            // target: 'http://192.168.0.106:8080',
+            target: 'http://192.168.0.106:8080',
-            target: 'http://47.109.37.87:3010',
+            // target: 'http://47.109.37.87:3010',
             ws: true,
           },
         },