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

apps/web-antd/src/api/property/customerService/contingenPlan/index.ts

@@ -0,0 +1,61 @@
+import type { ContingenPlanVO, ContingenPlanForm, ContingenPlanQuery } from './model';
+
+import type { ID, IDS } from '#/api/common';
+import type { PageResult } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+* 查询应急预案管理列表
+* @param params
+* @returns 应急预案管理列表
+*/
+export function contingenPlanList(params?: ContingenPlanQuery) {
+  return requestClient.get<PageResult<ContingenPlanVO>>('/property/contingenPlan/list', { params });
+}
+
+/**
+ * 导出应急预案管理列表
+ * @param params
+ * @returns 应急预案管理列表
+ */
+export function contingenPlanExport(params?: ContingenPlanQuery) {
+  return commonExport('/property/contingenPlan/export', params ?? {});
+}
+
+/**
+ * 查询应急预案管理详情
+ * @param id id
+ * @returns 应急预案管理详情
+ */
+export function contingenPlanInfo(id: ID) {
+  return requestClient.get<ContingenPlanVO>(`/property/contingenPlan/${id}`);
+}
+
+/**
+ * 新增应急预案管理
+ * @param data
+ * @returns void
+ */
+export function contingenPlanAdd(data: ContingenPlanForm) {
+  return requestClient.postWithMsg<void>('/property/contingenPlan', data);
+}
+
+/**
+ * 更新应急预案管理
+ * @param data
+ * @returns void
+ */
+export function contingenPlanUpdate(data: ContingenPlanForm) {
+  return requestClient.putWithMsg<void>('/property/contingenPlan', data);
+}
+
+/**
+ * 删除应急预案管理
+ * @param id id
+ * @returns void
+ */
+export function contingenPlanRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/property/contingenPlan/${id}`);
+}

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

@@ -0,0 +1,159 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface ContingenPlanVO {
+  /**
+   * 主键
+   */
+  id: string | number;
+
+  /**
+   * 预案类型(1.自然灾害,2事故灾难3公共卫生,4社会安全)
+   */
+  contingenPlanType: string;
+
+  /**
+   * 预案名称
+   */
+  contingenPlanName: string;
+
+  /**
+   * 预案内容
+   */
+  contingenPlanContent: string;
+
+  /**
+   * 发起人
+   */
+  initiat: string;
+
+  /**
+   * 责任人
+   */
+  dutyPersion: number;
+
+  /**
+   * 风险等级
+   */
+  grade: number;
+
+  /**
+   * 完成时间
+   */
+  compleTimes: string;
+
+  /**
+   * 状态(1.待审核2待进行3已完成)
+   */
+  status: string;
+
+  /**
+   * 搜索值
+   */
+  searchValue: string;
+
+}
+
+export interface ContingenPlanForm extends BaseEntity {
+  /**
+   * 主键
+   */
+  id?: string | number;
+
+  /**
+   * 预案类型(1.自然灾害,2事故灾难3公共卫生,4社会安全)
+   */
+  contingenPlanType?: string;
+
+  /**
+   * 预案名称
+   */
+  contingenPlanName?: string;
+
+  /**
+   * 预案内容
+   */
+  contingenPlanContent?: string;
+
+  /**
+   * 发起人
+   */
+  initiat?: string;
+
+  /**
+   * 责任人
+   */
+  dutyPersion?: number;
+
+  /**
+   * 风险等级
+   */
+  grade?: number;
+
+  /**
+   * 完成时间
+   */
+  compleTimes?: string;
+
+  /**
+   * 状态(1.待审核2待进行3已完成)
+   */
+  status?: string;
+
+  /**
+   * 搜索值
+   */
+  searchValue?: string;
+
+}
+
+export interface ContingenPlanQuery extends PageQuery {
+  /**
+   * 预案类型(1.自然灾害,2事故灾难3公共卫生,4社会安全)
+   */
+  contingenPlanType?: string;
+
+  /**
+   * 预案名称
+   */
+  contingenPlanName?: string;
+
+  /**
+   * 预案内容
+   */
+  contingenPlanContent?: string;
+
+  /**
+   * 发起人
+   */
+  initiat?: string;
+
+  /**
+   * 责任人
+   */
+  dutyPersion?: number;
+
+  /**
+   * 风险等级
+   */
+  grade?: number;
+
+  /**
+   * 完成时间
+   */
+  compleTimes?: string;
+
+  /**
+   * 状态(1.待审核2待进行3已完成)
+   */
+  status?: string;
+
+  /**
+   * 搜索值
+   */
+  searchValue?: string;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}

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

@@ -0,0 +1,65 @@
+import type {FormSchemaGetter} from '#/adapter/form';
+import type {VxeGridProps} from '#/adapter/vxe-table';
+import {renderDict} from "#/utils/render";
+
+export const querySchema: FormSchemaGetter = () => [
+  {
+    component: 'Input',
+    fieldName: 'orderNo',
+    label: '工单编号',
+  },
+  {
+    component: 'Input',
+    fieldName: 'orderName',
+    label: '工单名称',
+  },
+  // {
+  //   component: 'Select',
+  //   componentProps: {
+  //     options: getDictOptions('wy_gdclzt'),
+  //   },
+  //   fieldName: 'status',
+  //   label: '状态',
+  // },
+];
+
+export const columns: VxeGridProps['columns'] = [
+  {
+    title: '工单编号',
+    field: 'orderNo',
+  },
+  {
+    title: '工单名称',
+    field: 'orderName',
+  },
+  {
+    title: '工单类型',
+    field: 'typeName',
+  },
+  {
+    title: '状态',
+    field: 'status',
+    slots: {
+      default: ({row}) => {
+        return renderDict(row.status, 'wy_gdclzt');
+      },
+    },
+  },
+  {
+    title: '地址',
+    field: 'location',
+  },
+  {
+    title: '计划完成时间',
+    field: 'planCompleTime',
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: {default: 'action'},
+    title: '操作',
+    width: 120,
+  },
+];
+
+

apps/web-antd/src/views/property/businessManagement/workOrderPending/index.vue

@@ -1,11 +1,92 @@
 <script setup lang="ts">
+import {Page, useVbenModal, type VbenFormProps} from '@vben/common-ui';
+import {Space} from 'ant-design-vue';
+import {
+  useVbenVxeGrid,
+  type VxeGridProps
+} from '#/adapter/vxe-table';
+import {
+  workOrdersList,
+} from '#/api/property/businessManagement/workOrders';
+import workOrdersDetail from './work-orders-detail.vue';
+import {columns, querySchema} from './data';
 
+const formOptions: VbenFormProps = {
+  commonConfig: {
+    labelWidth: 80,
+    componentProps: {
+      allowClear: true,
+    },
+  },
+  schema: querySchema(),
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+};
+
+const gridOptions: VxeGridProps = {
+  checkboxConfig: {
+    // 高亮
+    highlight: true,
+    // 翻页时保留选中状态
+    reserve: true,
+    // 点击行选中
+    // trigger: 'row',
+  },
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {},
+  proxyConfig: {
+    ajax: {
+      query: async ({page}, formValues = {}) => {
+        return await workOrdersList({
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          status:'0',
+          ...formValues,
+        });
+      },
+    },
+  },
+  rowConfig: {
+    keyField: 'id',
+  },
+  // 表格全局唯一表示 保存列配置需要用到
+  id: 'property-workOrders-index'
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({
+  formOptions,
+  gridOptions,
+});
+
+const [WorkOrdersDetail, detailApi] = useVbenModal({
+  connectedComponent: workOrdersDetail,
+});
+
+function handleInfo(row:any) {
+  detailApi.setData({id:row.id});
+  detailApi.open();
+}
 </script>
 
 <template>
-
+  <Page :auto-content-height="true">
+    <BasicTable table-title="工单待办列表" class="order-work-left-radio">
+      <template #action="{ row }">
+        <Space>
+          <ghost-button
+            v-access:code="['property:workOrders:info']"
+            @click.stop="handleInfo(row)"
+          >
+            {{ $t('pages.common.info') }}
+          </ghost-button>
+        </Space>
+      </template>
+    </BasicTable>
+    <WorkOrdersDetail/>
+  </Page>
 </template>
 
-<style scoped>
-
+<style lang="scss" scoped>
 </style>
+

apps/web-antd/src/views/property/businessManagement/workOrderPending/orders-modal.vue

@@ -0,0 +1,138 @@
+<script setup lang="ts">
+import {useVbenModal} from '@vben/common-ui';
+import {cloneDeep} from '@vben/utils';
+import {useVbenForm} from '#/adapter/form';
+import {
+  workOrdersInfo,
+  workOrdersUpdate
+} from '#/api/property/businessManagement/workOrders';
+import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
+import {ordersModalSchema} from './data';
+import {personList} from "#/api/property/resident/person";
+import {renderDictValue} from "#/utils/render";
+import {onMounted, ref} from "vue";
+import { useUserStore } from '@vben/stores';
+
+const userStore = useUserStore();
+const emit = defineEmits<{ reload: [] }>();
+
+const [BasicForm, formApi] = useVbenForm({
+  commonConfig: {
+    // 默认占满两列
+    formItemClass: 'col-span-1',
+    // 默认label宽度 px
+    labelWidth: 80,
+    // 通用配置项 会影响到所有表单项
+    componentProps: {
+      class: 'w-full',
+    }
+  },
+  schema: ordersModalSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
+  {
+    initializedGetter: defaultFormValueGetter(formApi),
+    currentGetter: defaultFormValueGetter(formApi),
+  },
+);
+
+const record = ref({})
+const title = ref('派单')
+const [BasicModal, modalApi] = useVbenModal({
+  // 在这里更改宽度
+  class: 'w-[550px]',
+  fullscreenButton: false,
+  onBeforeClose,
+  onClosed: handleClosed,
+  onConfirm: handleConfirm,
+  onOpenChange: async (isOpen) => {
+    if (!isOpen) {
+      return null;
+    }
+    modalApi.modalLoading(true);
+    await queryPersonData()
+    const {id} = modalApi.getData() as { id?: number | string };
+    const {mean} = modalApi.getData() as { rob?: number | string };
+    if (id) {
+      record.value = await workOrdersInfo(id);
+      if(mean === 'rob'){
+        title.value = '抢单'
+        record.value.status = '2';
+        record.value.handler = record.value.initiatorPeople;
+      }else{
+        title.value = '派单'
+        record.value.status = '1';
+        record.value.handler = null;
+      }
+      await formApi.setValues(record.value);
+    }
+    await markInitialized();
+
+    modalApi.modalLoading(false);
+  },
+});
+
+async function handleConfirm() {
+  try {
+    modalApi.lock(true);
+    const {valid} = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    const data = cloneDeep(await formApi.getValues());
+    if(title.value === '派单'){
+      record.value.handler = data.handler
+    }else{
+      record.value.handler = userStore.userInfo.userId
+    }
+    await  workOrdersUpdate(record.value)
+    resetInitialized();
+    emit('reload');
+    modalApi.close();
+  } catch (error) {
+    console.error(error);
+  } finally {
+    modalApi.lock(false);
+  }
+}
+
+async function handleClosed() {
+  await formApi.resetForm();
+  resetInitialized();
+}
+
+async function queryPersonData() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1,
+  }
+  const res = await personList(params);
+  const options = res.rows.map((user) => ({
+    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') + '-' + user.phone,
+    value: user.id,
+  }));
+  formApi.updateSchema([
+    {
+      componentProps: () => ({
+        options: options,
+        showSearch:true,
+        filterOption: filterOption
+      }),
+      fieldName: 'handler',
+    }])
+}
+
+const filterOption = (input: string, option: any) => {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
+</script>
+
+<template>
+  <BasicModal :title="title">
+    <BasicForm/>
+  </BasicModal>
+</template>
+

apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue

@@ -0,0 +1,80 @@
+<script setup lang="ts">
+import {computed, ref, shallowRef} from 'vue';
+import {useVbenModal} from '@vben/common-ui';
+import {Descriptions, DescriptionsItem, Timeline, TimelineItem, Rate,Divider} from 'ant-design-vue';
+import dayjs from 'dayjs';
+import duration from 'dayjs/plugin/duration';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import {renderDict} from "#/utils/render";
+import {workOrdersInfo} from "#/api/property/businessManagement/workOrders";
+import type {WorkOrdersVO} from "#/api/property/businessManagement/workOrders/model";
+
+dayjs.extend(duration);
+dayjs.extend(relativeTime);
+
+const [BasicModal, modalApi] = useVbenModal({
+  onOpenChange: handleOpenChange,
+  onClosed() {
+    orderDetail.value = null;
+  },
+});
+
+const orderDetail = shallowRef<null | WorkOrdersVO>(null);
+const handleRecords=ref<any[]>([])
+async function handleOpenChange(open: boolean) {
+  if (!open) {
+    return null;
+  }
+  modalApi.modalLoading(true);
+  const {id} = modalApi.getData() as { id: number | string };
+  orderDetail.value = await workOrdersInfo(id);
+  if(orderDetail.value){
+    handleRecords.value = orderDetail.value.workOrdersRecordVoList.map( (item, index) => ({
+      status: item.status,
+      createTime: item.createTime,
+      handlerName: index === 0 ? item.initiatorPeople : item.handlerName
+    }))
+  }
+  modalApi.modalLoading(false);
+}
+</script>
+
+<template>
+  <BasicModal :footer="false" :fullscreen-button="false" title="工单详情信息" class="w-[70%]">
+    <div v-if="orderDetail">
+      <Descriptions size="small" :column="2" :labelStyle="{width:'100px'}">
+        <DescriptionsItem label="订单号">
+          {{ orderDetail.orderNo }}
+        </DescriptionsItem>
+        <DescriptionsItem label="工单名称">
+          {{ orderDetail.orderName }}
+        </DescriptionsItem>
+        <DescriptionsItem label="工单类型">
+         {{orderDetail.typeName}}
+        </DescriptionsItem>
+        <DescriptionsItem label="发起人">
+          {{ orderDetail.initiatorPeople }}
+        </DescriptionsItem>
+        <DescriptionsItem label="具体位置">
+          {{ orderDetail.location }}
+        </DescriptionsItem>
+        <DescriptionsItem label="计划完成时间">
+          {{ orderDetail.planCompleTime }}
+        </DescriptionsItem>
+      </Descriptions>
+      <Divider orientation="left" orientation-margin="0px">
+        处理记录
+      </Divider>
+      <Timeline>
+        <TimelineItem v-for="(item,index) in handleRecords" :key="index">
+            <p style="display: flex;">类型：
+              <component
+                :is="renderDict(item.status,'wy_gdclzt')"
+              /></p>
+            <p>时间：{{item.createTime}}</p>
+            <p>处理人：{{item.handlerName}}</p>
+        </TimelineItem>
+      </Timeline>
+    </div>
+  </BasicModal>
+</template>

apps/web-antd/src/views/property/businessManagement/workOrderPending/workOrders-modal.vue

@@ -0,0 +1,163 @@
+<script setup lang="ts">
+import {computed, ref} from 'vue';
+
+import {useVbenModal} from '@vben/common-ui';
+import {$t} from '@vben/locales';
+import {cloneDeep} from '@vben/utils';
+
+import {useVbenForm} from '#/adapter/form';
+import {
+  workOrdersAdd,
+  workOrdersInfo,
+  workOrdersUpdate
+} from '#/api/property/businessManagement/workOrders';
+import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
+
+import {modalSchema} from './data';
+import {personList} from "#/api/property/resident/person";
+import {renderDictValue} from "#/utils/render";
+import {workOrdersTypeList} from "#/api/property/businessManagement/workOrdersType";
+
+const emit = defineEmits<{ reload: [] }>();
+
+const isUpdate = ref(false);
+const title = computed(() => {
+  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
+});
+
+const [BasicForm, formApi] = useVbenForm({
+  commonConfig: {
+    // 默认占满两列
+    formItemClass: 'col-span-1',
+    // 默认label宽度 px
+    labelWidth: 80,
+    // 通用配置项 会影响到所有表单项
+    componentProps: {
+      class: 'w-full',
+    }
+  },
+  schema: modalSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
+  {
+    initializedGetter: defaultFormValueGetter(formApi),
+    currentGetter: defaultFormValueGetter(formApi),
+  },
+);
+
+const [BasicModal, modalApi] = useVbenModal({
+  // 在这里更改宽度
+  class: 'w-[70%]',
+  fullscreenButton: false,
+  onBeforeClose,
+  onClosed: handleClosed,
+  onConfirm: handleConfirm,
+  onOpenChange: async (isOpen) => {
+    if (!isOpen) {
+      return null;
+    }
+    modalApi.modalLoading(true);
+    await queryPersonData()
+    await queryWorkOrdersType()
+    const {id} = modalApi.getData() as { id?: number | string };
+    isUpdate.value = !!id;
+
+    if (isUpdate.value && id) {
+      const record = await workOrdersInfo(id);
+      record.isTimeOut = record.isTimeOut?.toString()
+      await formApi.setValues(record);
+    }
+    await markInitialized();
+
+    modalApi.modalLoading(false);
+  },
+});
+
+async function handleConfirm() {
+  try {
+    modalApi.lock(true);
+    const {valid} = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
+    const data = cloneDeep(await formApi.getValues());
+    await (isUpdate.value ? workOrdersUpdate(data) : workOrdersAdd(data));
+    resetInitialized();
+    emit('reload');
+    modalApi.close();
+  } catch (error) {
+    console.error(error);
+  } finally {
+    modalApi.lock(false);
+  }
+}
+
+async function handleClosed() {
+  await formApi.resetForm();
+  resetInitialized();
+}
+
+async function queryPersonData() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1,
+  }
+  const res = await personList(params);
+  const options = res.rows.map((user) => ({
+    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') + '-' + user.phone,
+    value: user.id,
+  }));
+  formApi.updateSchema([{
+    componentProps: () => ({
+      options: options,
+      showSearch:true,
+      filterOption: filterOption
+    }),
+    fieldName: 'initiatorName',
+  },
+    {
+      componentProps: () => ({
+        options: options,
+        showSearch:true,
+        filterOption: filterOption
+      }),
+      fieldName: 'handler',
+    }])
+}
+
+async function queryWorkOrdersType() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1
+  }
+  const res = await workOrdersTypeList(params)
+  const options = res.rows.map((item) => ({
+    label: item.orderTypeName,
+    value: item.id,
+  }));
+  formApi.updateSchema([{
+    componentProps: () => ({
+      options: options,
+      filterOption: filterOption,
+      showSearch:true,
+    }),
+    fieldName: 'type',
+  }])
+}
+
+const filterOption = (input: string, option: any) => {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
+
+</script>
+
+<template>
+  <BasicModal :title="title">
+    <BasicForm/>
+  </BasicModal>
+</template>
+

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

@@ -0,0 +1,105 @@
+import type {FormSchemaGetter} from '#/adapter/form';
+import type {VxeGridProps} from '#/adapter/vxe-table';
+import {renderDict} from "#/utils/render";
+import {h} from "vue";
+import {Rate} from "ant-design-vue";
+
+export const querySchema: FormSchemaGetter = () => [
+  {
+    component: 'Input',
+    fieldName: 'orderNo',
+    label: '工单编号',
+  },
+  {
+    component: 'Input',
+    fieldName: 'orderName',
+    label: '工单名称',
+  },
+  // {
+  //   component: 'Select',
+  //   componentProps: {
+  //     options: getDictOptions('wy_gdclzt'),
+  //   },
+  //   fieldName: 'status',
+  //   label: '状态',
+  // },
+];
+
+export const columns: VxeGridProps['columns'] = [
+  {
+    title: '工单编号',
+    field: 'orderNo',
+    width: 200,
+  },
+  {
+    title: '工单名称',
+    field: 'orderName',
+    minWidth: 180,
+  },
+  {
+    title: '工单类型',
+    field: 'typeName',
+    minWidth: 150,
+  },
+  {
+    title: '派单时间',
+    field: 'dispatchTime',
+    width: 100,
+  },
+  {
+    title: '状态',
+    field: 'status',
+    slots: {
+      default: ({row}) => {
+        return renderDict(row.status, 'wy_gdclzt');
+      },
+    },
+    width: 100,
+  },
+  {
+    title: '地址',
+    field: 'location',
+    width: 100,
+  },
+  {
+    title: '计划完成时间',
+    field: 'planCompleTime',
+    width: 100,
+  },
+  {
+    title: '完成时间',
+    field: 'compleTime',
+    width: 100,
+  },
+  {
+    title: '评价',
+    field: 'serviceEvalua',
+    width: 180,
+    slots: {
+      default: ({row}) => {
+        return h(Rate, {
+          value: row.serviceEvalua || 0,
+          disabled: true,
+        });
+      },
+    },
+  },
+  {
+    title: '是否超时',
+    field: 'isTimeOut',
+    width: 100,
+    slots: {
+      default: ({row}) => {
+        return row.isTimeOut ? renderDict(row.isTimeOut, 'wy_sf') : '';
+
+      },
+    },
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: {default: 'action'},
+    title: '操作',
+    width: 120,
+  },
+];

apps/web-antd/src/views/property/businessManagement/workOrderProcessed/index.vue

@@ -1,11 +1,92 @@
 <script setup lang="ts">
+import {Page, useVbenModal, type VbenFormProps} from '@vben/common-ui';
+import {Space} from 'ant-design-vue';
+import {
+  useVbenVxeGrid,
+  type VxeGridProps
+} from '#/adapter/vxe-table';
+import {
+  workOrdersList,
+} from '#/api/property/businessManagement/workOrders';
+import workOrdersDetail from './work-orders-detail.vue';
+import {columns, querySchema} from './data';
 
+const formOptions: VbenFormProps = {
+  commonConfig: {
+    labelWidth: 80,
+    componentProps: {
+      allowClear: true,
+    },
+  },
+  schema: querySchema(),
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+};
+
+const gridOptions: VxeGridProps = {
+  checkboxConfig: {
+    // 高亮
+    highlight: true,
+    // 翻页时保留选中状态
+    reserve: true,
+    // 点击行选中
+    // trigger: 'row',
+  },
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {},
+  proxyConfig: {
+    ajax: {
+      query: async ({page}, formValues = {}) => {
+        return await workOrdersList({
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          status:'4',
+          ...formValues,
+        });
+      },
+    },
+  },
+  rowConfig: {
+    keyField: 'id',
+  },
+  // 表格全局唯一表示 保存列配置需要用到
+  id: 'property-workOrders-index'
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({
+  formOptions,
+  gridOptions,
+});
+
+const [WorkOrdersDetail, detailApi] = useVbenModal({
+  connectedComponent: workOrdersDetail,
+});
+
+function handleInfo(row:any) {
+  detailApi.setData({id:row.id});
+  detailApi.open();
+}
 </script>
 
 <template>
-
+  <Page :auto-content-height="true">
+    <BasicTable table-title="工单已办列表" class="order-work-left-radio">
+      <template #action="{ row }">
+        <Space>
+          <ghost-button
+            v-access:code="['property:workOrders:info']"
+            @click.stop="handleInfo(row)"
+          >
+            {{ $t('pages.common.info') }}
+          </ghost-button>
+        </Space>
+      </template>
+    </BasicTable>
+    <WorkOrdersDetail/>
+  </Page>
 </template>
 
-<style scoped>
-
+<style lang="scss" scoped>
 </style>
+

apps/web-antd/src/views/property/businessManagement/workOrderProcessed/orders-modal.vue

@@ -0,0 +1,138 @@
+<script setup lang="ts">
+import {useVbenModal} from '@vben/common-ui';
+import {cloneDeep} from '@vben/utils';
+import {useVbenForm} from '#/adapter/form';
+import {
+  workOrdersInfo,
+  workOrdersUpdate
+} from '#/api/property/businessManagement/workOrders';
+import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
+import {ordersModalSchema} from './data';
+import {personList} from "#/api/property/resident/person";
+import {renderDictValue} from "#/utils/render";
+import {ref} from "vue";
+import { useUserStore } from '@vben/stores';
+
+const userStore = useUserStore();
+const emit = defineEmits<{ reload: [] }>();
+
+const [BasicForm, formApi] = useVbenForm({
+  commonConfig: {
+    // 默认占满两列
+    formItemClass: 'col-span-1',
+    // 默认label宽度 px
+    labelWidth: 80,
+    // 通用配置项 会影响到所有表单项
+    componentProps: {
+      class: 'w-full',
+    }
+  },
+  schema: ordersModalSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
+  {
+    initializedGetter: defaultFormValueGetter(formApi),
+    currentGetter: defaultFormValueGetter(formApi),
+  },
+);
+
+const record = ref({})
+const title = ref('派单')
+const [BasicModal, modalApi] = useVbenModal({
+  // 在这里更改宽度
+  class: 'w-[550px]',
+  fullscreenButton: false,
+  onBeforeClose,
+  onClosed: handleClosed,
+  onConfirm: handleConfirm,
+  onOpenChange: async (isOpen) => {
+    if (!isOpen) {
+      return null;
+    }
+    modalApi.modalLoading(true);
+    await queryPersonData()
+    const {id} = modalApi.getData() as { id?: number | string };
+    const {mean} = modalApi.getData() as { rob?: number | string };
+    if (id) {
+      record.value = await workOrdersInfo(id);
+      if(mean === 'rob'){
+        title.value = '抢单'
+        record.value.status = '2';
+        record.value.handler = record.value.initiatorPeople;
+      }else{
+        title.value = '派单'
+        record.value.status = '1';
+        record.value.handler = null;
+      }
+      await formApi.setValues(record.value);
+    }
+    await markInitialized();
+
+    modalApi.modalLoading(false);
+  },
+});
+
+async function handleConfirm() {
+  try {
+    modalApi.lock(true);
+    const {valid} = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    const data = cloneDeep(await formApi.getValues());
+    if(title.value === '派单'){
+      record.value.handler = data.handler
+    }else{
+      record.value.handler = userStore.userInfo.userId
+    }
+    await  workOrdersUpdate(record.value)
+    resetInitialized();
+    emit('reload');
+    modalApi.close();
+  } catch (error) {
+    console.error(error);
+  } finally {
+    modalApi.lock(false);
+  }
+}
+
+async function handleClosed() {
+  await formApi.resetForm();
+  resetInitialized();
+}
+
+async function queryPersonData() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1,
+  }
+  const res = await personList(params);
+  const options = res.rows.map((user) => ({
+    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') + '-' + user.phone,
+    value: user.id,
+  }));
+  formApi.updateSchema([
+    {
+      componentProps: () => ({
+        options: options,
+        showSearch:true,
+        filterOption: filterOption
+      }),
+      fieldName: 'handler',
+    }])
+}
+
+const filterOption = (input: string, option: any) => {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
+</script>
+
+<template>
+  <BasicModal :title="title">
+    <BasicForm/>
+  </BasicModal>
+</template>
+

apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue

@@ -0,0 +1,97 @@
+<script setup lang="ts">
+import {computed, ref, shallowRef} from 'vue';
+import {useVbenModal} from '@vben/common-ui';
+import {Descriptions, DescriptionsItem, Timeline, TimelineItem, Rate,Divider} from 'ant-design-vue';
+import dayjs from 'dayjs';
+import duration from 'dayjs/plugin/duration';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import {renderDict} from "#/utils/render";
+import {workOrdersInfo} from "#/api/property/businessManagement/workOrders";
+import type {WorkOrdersVO} from "#/api/property/businessManagement/workOrders/model";
+
+dayjs.extend(duration);
+dayjs.extend(relativeTime);
+
+const [BasicModal, modalApi] = useVbenModal({
+  onOpenChange: handleOpenChange,
+  onClosed() {
+    orderDetail.value = null;
+  },
+});
+
+const orderDetail = shallowRef<null | WorkOrdersVO>(null);
+const handleRecords=ref<any[]>([])
+async function handleOpenChange(open: boolean) {
+  if (!open) {
+    return null;
+  }
+  modalApi.modalLoading(true);
+  const {id} = modalApi.getData() as { id: number | string };
+  orderDetail.value = await workOrdersInfo(id);
+  if(orderDetail.value){
+    handleRecords.value = orderDetail.value.workOrdersRecordVoList.map( (item, index) => ({
+      status: item.status,
+      createTime: item.createTime,
+      handlerName: index === 0 ? item.initiatorPeople : item.handlerName
+    }))
+  }
+  modalApi.modalLoading(false);
+}
+</script>
+
+<template>
+  <BasicModal :footer="false" :fullscreen-button="false" title="工单详情信息" class="w-[70%]">
+    <div v-if="orderDetail">
+      <Descriptions size="small" :column="2" :labelStyle="{width:'120px'}">
+        <DescriptionsItem label="订单号">
+          {{ orderDetail.orderNo }}
+        </DescriptionsItem>
+        <DescriptionsItem label="工单名称">
+          {{ orderDetail.orderName }}
+        </DescriptionsItem>
+        <DescriptionsItem label="工单类型">
+         {{orderDetail.typeName}}
+        </DescriptionsItem>
+        <DescriptionsItem label="发起人">
+          {{ orderDetail.initiatorPeople }}
+        </DescriptionsItem>
+        <DescriptionsItem label="派单/抢单时间">
+          {{ orderDetail.dispatchTime }}
+        </DescriptionsItem>
+        <DescriptionsItem label="处理人">
+          {{ orderDetail.handlerText }}
+        </DescriptionsItem>
+        <DescriptionsItem label="具体位置" :span="2">
+          {{ orderDetail.location }}
+        </DescriptionsItem>
+        <DescriptionsItem label="计划完成时间">
+          {{ orderDetail.planCompleTime }}
+        </DescriptionsItem>
+        <DescriptionsItem label="完成时间">
+          {{ orderDetail.compleTime }}
+        </DescriptionsItem>
+        <DescriptionsItem label="服务评价">
+          <Rate :value="orderDetail.serviceEvalua" disabled/>
+        </DescriptionsItem>
+        <DescriptionsItem label="是否超时">
+          <component
+            :is="orderDetail.isTimeOut ? renderDict(orderDetail.isTimeOut,'wy_sf') : ''"
+          />
+        </DescriptionsItem>
+      </Descriptions>
+      <Divider orientation="left" orientation-margin="0px">
+        处理记录
+      </Divider>
+      <Timeline>
+        <TimelineItem v-for="(item,index) in handleRecords" :key="index">
+            <p style="display: flex;">类型：
+              <component
+                :is="renderDict(item.status,'wy_gdclzt')"
+              /></p>
+            <p>时间：{{item.createTime}}</p>
+            <p>处理人：{{item.handlerName}}</p>
+        </TimelineItem>
+      </Timeline>
+    </div>
+  </BasicModal>
+</template>

apps/web-antd/src/views/property/businessManagement/workOrderProcessed/workOrders-modal.vue

@@ -0,0 +1,163 @@
+<script setup lang="ts">
+import {computed, ref} from 'vue';
+
+import {useVbenModal} from '@vben/common-ui';
+import {$t} from '@vben/locales';
+import {cloneDeep} from '@vben/utils';
+
+import {useVbenForm} from '#/adapter/form';
+import {
+  workOrdersAdd,
+  workOrdersInfo,
+  workOrdersUpdate
+} from '#/api/property/businessManagement/workOrders';
+import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
+
+import {modalSchema} from './data';
+import {personList} from "#/api/property/resident/person";
+import {renderDictValue} from "#/utils/render";
+import {workOrdersTypeList} from "#/api/property/businessManagement/workOrdersType";
+
+const emit = defineEmits<{ reload: [] }>();
+
+const isUpdate = ref(false);
+const title = computed(() => {
+  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
+});
+
+const [BasicForm, formApi] = useVbenForm({
+  commonConfig: {
+    // 默认占满两列
+    formItemClass: 'col-span-1',
+    // 默认label宽度 px
+    labelWidth: 80,
+    // 通用配置项 会影响到所有表单项
+    componentProps: {
+      class: 'w-full',
+    }
+  },
+  schema: modalSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
+  {
+    initializedGetter: defaultFormValueGetter(formApi),
+    currentGetter: defaultFormValueGetter(formApi),
+  },
+);
+
+const [BasicModal, modalApi] = useVbenModal({
+  // 在这里更改宽度
+  class: 'w-[70%]',
+  fullscreenButton: false,
+  onBeforeClose,
+  onClosed: handleClosed,
+  onConfirm: handleConfirm,
+  onOpenChange: async (isOpen) => {
+    if (!isOpen) {
+      return null;
+    }
+    modalApi.modalLoading(true);
+    await queryPersonData()
+    await queryWorkOrdersType()
+    const {id} = modalApi.getData() as { id?: number | string };
+    isUpdate.value = !!id;
+
+    if (isUpdate.value && id) {
+      const record = await workOrdersInfo(id);
+      record.isTimeOut = record.isTimeOut?.toString()
+      await formApi.setValues(record);
+    }
+    await markInitialized();
+
+    modalApi.modalLoading(false);
+  },
+});
+
+async function handleConfirm() {
+  try {
+    modalApi.lock(true);
+    const {valid} = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
+    const data = cloneDeep(await formApi.getValues());
+    await (isUpdate.value ? workOrdersUpdate(data) : workOrdersAdd(data));
+    resetInitialized();
+    emit('reload');
+    modalApi.close();
+  } catch (error) {
+    console.error(error);
+  } finally {
+    modalApi.lock(false);
+  }
+}
+
+async function handleClosed() {
+  await formApi.resetForm();
+  resetInitialized();
+}
+
+async function queryPersonData() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1,
+  }
+  const res = await personList(params);
+  const options = res.rows.map((user) => ({
+    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') + '-' + user.phone,
+    value: user.id,
+  }));
+  formApi.updateSchema([{
+    componentProps: () => ({
+      options: options,
+      showSearch:true,
+      filterOption: filterOption
+    }),
+    fieldName: 'initiatorName',
+  },
+    {
+      componentProps: () => ({
+        options: options,
+        showSearch:true,
+        filterOption: filterOption
+      }),
+      fieldName: 'handler',
+    }])
+}
+
+async function queryWorkOrdersType() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1
+  }
+  const res = await workOrdersTypeList(params)
+  const options = res.rows.map((item) => ({
+    label: item.orderTypeName,
+    value: item.id,
+  }));
+  formApi.updateSchema([{
+    componentProps: () => ({
+      options: options,
+      filterOption: filterOption,
+      showSearch:true,
+    }),
+    fieldName: 'type',
+  }])
+}
+
+const filterOption = (input: string, option: any) => {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
+
+</script>
+
+<template>
+  <BasicModal :title="title">
+    <BasicForm/>
+  </BasicModal>
+</template>
+

apps/web-antd/src/views/property/businessManagement/workOrders/index.vue

@@ -8,12 +8,10 @@ import {
   type VxeGridProps
 } from '#/adapter/vxe-table';
 import {
-  workOrdersExport,
   workOrdersList,
   workOrdersRemove,
 } from '#/api/property/businessManagement/workOrders';
 import type {WorkOrdersForm} from '#/api/property/businessManagement/workOrders/model';
-import {commonDownloadExcel} from '#/utils/file/download';
 import workOrdersModal from './workOrders-modal.vue';
 import workOrdersDetail from './work-orders-detail.vue';
 import ordersModal from './orders-modal.vue';
@@ -130,12 +128,6 @@ function handleMultiDelete() {
   });
 }
 
-function handleDownloadExcel() {
-  commonDownloadExcel(workOrdersExport, '工单处理数据', tableApi.formApi.form.values, {
-    fieldMappingTime: formOptions.fieldMappingTime,
-  });
-}
-
 async function queryOrderType() {
   let params = {
     pageSize: 1000,
@@ -170,12 +162,6 @@ onMounted(async () => {
       </template>
       <template #toolbar-tools>
         <Space>
-          <a-button
-            v-access:code="['property:workOrders:export']"
-            @click="handleDownloadExcel"
-          >
-            {{ $t('pages.common.export') }}
-          </a-button>
           <a-button
             :disabled="!vxeCheckboxChecked(tableApi)"
             danger
@@ -197,11 +183,13 @@ onMounted(async () => {
         <Space>
           <ghost-button
             @click.stop="handleOrders(row,'group')"
+            v-if="row.status!=='1' && row.status!=='2'"
           >
             {{ '派单' }}
           </ghost-button>
           <ghost-button
             @click.stop="handleOrders(row,'rob')"
+            v-if="row.status!=='1' && row.status!=='2'"
           >
             {{ '抢单' }}
           </ghost-button>

apps/web-antd/src/views/property/businessManagement/workOrders/orders-modal.vue

@@ -10,8 +10,10 @@ import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
 import {ordersModalSchema} from './data';
 import {personList} from "#/api/property/resident/person";
 import {renderDictValue} from "#/utils/render";
-import {ref} from "vue";
+import {onMounted, ref} from "vue";
+import { useUserStore } from '@vben/stores';
 
+const userStore = useUserStore();
 const emit = defineEmits<{ reload: [] }>();
 
 const [BasicForm, formApi] = useVbenForm({
@@ -81,7 +83,11 @@ async function handleConfirm() {
       return;
     }
     const data = cloneDeep(await formApi.getValues());
+    if(title.value === '派单'){
       record.value.handler = data.handler
+    }else{
+      record.value.handler = userStore.userInfo.userId
+    }
     await  workOrdersUpdate(record.value)
     resetInitialized();
     emit('reload');
@@ -122,7 +128,6 @@ async function queryPersonData() {
 const filterOption = (input: string, option: any) => {
   return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
 };
-
 </script>
 
 <template>

apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue

@@ -42,7 +42,7 @@ async function handleOpenChange(open: boolean) {
 <template>
   <BasicModal :footer="false" :fullscreen-button="false" title="工单详情信息" class="w-[70%]">
     <div v-if="orderDetail">
-      <Descriptions size="small" :column="2" :labelStyle="{width:'100px'}">
+      <Descriptions size="small" :column="2" :labelStyle="{width:'120px'}">
         <DescriptionsItem label="订单号">
           {{ orderDetail.orderNo }}
         </DescriptionsItem>
@@ -55,7 +55,7 @@ async function handleOpenChange(open: boolean) {
         <DescriptionsItem label="发起人">
           {{ orderDetail.initiatorPeople }}
         </DescriptionsItem>
-        <DescriptionsItem label="派单时间">
+        <DescriptionsItem label="派单/抢单时间">
           {{ orderDetail.dispatchTime }}
         </DescriptionsItem>
         <DescriptionsItem label="处理人">

apps/web-antd/src/views/property/businessManagement/workOrders/workOrders-modal.vue

@@ -67,7 +67,7 @@ const [BasicModal, modalApi] = useVbenModal({
 
     if (isUpdate.value && id) {
       const record = await workOrdersInfo(id);
-      record.isTimeOut=record.isTimeOut.toString()
+      record.isTimeOut = record.isTimeOut?.toString()
       await formApi.setValues(record);
     }
     await markInitialized();

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

@@ -0,0 +1,170 @@
+<script setup lang="ts">
+import { EditOutlined } from '@ant-design/icons-vue';
+import {EchartsUI, type EchartsUIType, useEcharts} from "@vben/plugins/echarts";
+import {onMounted, ref} from "vue";
+import {statisticsByTime} from "#/api/property/reportStatistics";
+
+const orderLineRef = ref<EchartsUIType>();
+const { renderEcharts } = useEcharts(orderLineRef);
+const xAxisData = ref<any[]>([]);
+const seriesData = ref<any[]>([]);
+async function fetchOrderTrend() {
+  const res = await statisticsByTime({ timeUnit: 1 });
+  xAxisData.value = res?.time ?? [];
+  seriesData.value = res?.counts ?? [];
+  renderEcharts({
+    title: { text: '客户续租率趋势' },
+    tooltip: { trigger: 'axis' },
+    xAxis: {
+      type: 'category',
+      data: xAxisData.value,
+      boundaryGap: false,
+    },
+    yAxis: { type: 'value', axisLabel: { formatter: (value) => `${value * 100}%` } },
+    series: [
+      {
+        name: '订单趋势',
+        type: 'line',
+        data: seriesData.value || [],
+        smooth: true,
+      },
+    ],
+  });
+}
+onMounted(async () => {
+  await fetchOrderTrend();
+})
+</script>
+
+<template>
+<div class="panel">
+
+  <div class="bulletin-board">
+    <div class="bulletin-board-title">工单看板</div>
+    <div class="bulletin-board-content">
+      <div>
+        <div>
+          <div>工单总数：</div>
+          <div>56</div>
+          <div style="color: #1890FF">点击前往工单池</div>
+        </div>
+        <div class="icon-edit"><EditOutlined /></div>
+      </div>
+      <div>
+        <div>
+          <div>待派工单数：</div>
+          <div>56</div>
+          <div style="color: #1890FF">点击前往工单待办</div>
+        </div>
+        <div class="icon-edit"><EditOutlined /></div>
+      </div>
+      <div>
+        <div>
+          <div>未办结超时工单：</div>
+          <div>56</div>
+          <div>处理中的工单数：<span style="color: green">5</span></div>
+        </div>
+        <div class="icon-edit"><EditOutlined /></div>
+      </div>
+      <div>
+        <div>
+          <div>当月工单超时率：</div>
+          <div>56</div>
+          <div>超时工单数：<span style="color: red">0</span></div>
+        </div>
+        <div class="icon-edit"><EditOutlined /></div>
+      </div>
+      <div>
+        <div>
+          <div>当月满意度：</div>
+          <div>100%</div>
+          <div>满意度：5</div>
+        </div>
+        <div class="icon-edit"><EditOutlined /></div>
+      </div>
+    </div>
+  </div>
+  <div class="chart">
+    <div class="chart-one">
+      <div>
+        <EchartsUI
+          ref="orderLineRef"
+          height="350px"
+          width="100%"
+          style="background: #fff; border-radius: 8px"
+        />
+      </div>
+      <div style="background-color: red"></div>
+    </div>
+    <div class="chart-two">
+      <div>
+        <EchartsUI
+          ref="orderLineRef"
+          height="350px"
+          width="100%"
+          style="background: #fff; border-radius: 8px"
+        />
+      </div>
+      <div style="background-color: red"></div>
+    </div>
+  </div>
+</div>
+</template>
+
+<style scoped lang="scss">
+.panel{
+  width: 100%;
+  padding: 40px;
+  box-sizing: border-box;
+
+  .bulletin-board{
+
+    .bulletin-board-title{
+      font-size: 25px;
+      font-weight: bold;
+      margin-bottom: 20px;
+    }
+    .bulletin-board-content{
+      display: grid;
+      grid-template-columns: repeat(5, 1fr);
+      gap: 40px;
+
+      > div{
+        height: auto;
+        background-color: #FFFFFF;
+        padding: 18px;
+        border-radius: 10px;
+        display: flex;
+        justify-content: space-between;
+
+        > div:first-child {
+          line-height: 32px;
+
+          div:nth-child(2) {
+            font-size: 20px;
+            font-weight: bold;
+          }
+        }
+        .icon-edit{
+          font-size: 30px;
+        }
+      }
+    }
+  }
+  .chart{
+
+    .chart-one{
+      margin-top:40px;
+      display: grid;
+      grid-template-columns: 2fr 1fr;
+      gap: 40px;
+    }
+    .chart-two{
+      margin-top:40px;
+      display: grid;
+      grid-template-columns: repeat(2, 1fr);
+      gap: 40px;
+    }
+  }
+}
+</style>

apps/web-antd/src/views/property/customerService/contingenPlan/contingenPlan-detail.vue

@@ -0,0 +1,57 @@
+<script setup lang="ts">
+import type {ContingenPlanVO} from '#/api/property/customerService/contingenPlan/model';
+import {shallowRef} from 'vue';
+import {useVbenModal} from '@vben/common-ui';
+import {Descriptions, DescriptionsItem} from 'ant-design-vue';
+import {contingenPlanInfo} from '#/api/property/customerService/contingenPlan';
+import {renderDict} from "#/utils/render";
+
+const [BasicModal, modalApi] = useVbenModal({
+  onOpenChange: handleOpenChange,
+  onClosed() {
+    contingenPlanIDetail.value = null;
+  },
+});
+
+const contingenPlanIDetail = shallowRef<null | ContingenPlanVO>(null);
+
+async function handleOpenChange(open: boolean) {
+  if (!open) {
+    return null;
+  }
+  modalApi.modalLoading(true);
+  const {id} = modalApi.getData() as { id: number | string };
+  const response = await contingenPlanInfo(id);
+  contingenPlanIDetail.value = response;
+  modalApi.modalLoading(false);
+}
+</script>
+
+<template>
+  <BasicModal :footer="false" :fullscreen-button="false" title="详情" class="w-[70%]">
+    <Descriptions v-if="contingenPlanIDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
+      <DescriptionsItem label="预案名称">
+        {{ contingenPlanIDetail.contingenPlanName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预案类型" v-if="contingenPlanIDetail.contingenPlanType!=null">
+        <component
+          :is="renderDict(contingenPlanIDetail.contingenPlanType,'type_contingency_plan')"
+        />
+      </DescriptionsItem>
+      <DescriptionsItem label="发起人">
+        {{ contingenPlanIDetail.initiat }}
+      </DescriptionsItem>
+      <DescriptionsItem label="演练状态" v-if="contingenPlanIDetail.status!=null">
+        <component
+          :is="renderDict(contingenPlanIDetail.status,'pro_exercise_status')"
+        />
+      </DescriptionsItem>
+      <DescriptionsItem label="责任人">
+        {{ contingenPlanIDetail.dutyPersion}}
+      </DescriptionsItem>
+      <DescriptionsItem label="完成时间">
+        {{ contingenPlanIDetail.compleTimes }}
+      </DescriptionsItem>
+    </Descriptions>
+  </BasicModal>
+</template>

apps/web-antd/src/views/property/customerService/contingenPlan/contingenPlan-modal.vue

@@ -0,0 +1,133 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+import { cloneDeep } from '@vben/utils';
+import { useVbenForm } from '#/adapter/form';
+import { contingenPlanAdd, contingenPlanInfo, contingenPlanUpdate } from '#/api/property/customerService/contingenPlan';
+import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
+import {personList} from "#/api/property/resident/person";
+import { modalSchema } from './data';
+import {renderDictValue} from "#/utils/render";
+
+const emit = defineEmits<{ reload: [] }>();
+const isUpdate = ref(false);
+const title = computed(() => {
+  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
+});
+
+const [BasicForm, formApi] = useVbenForm({
+  commonConfig: {
+    // 默认占满两列
+    formItemClass: 'col-span-1',
+    // 默认label宽度 px
+    labelWidth: 80,
+    // 通用配置项 会影响到所有表单项
+    componentProps: {
+      class: 'w-full',
+    }
+  },
+  schema: modalSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
+  {
+    initializedGetter: defaultFormValueGetter(formApi),
+    currentGetter: defaultFormValueGetter(formApi),
+  },
+);
+
+const [BasicModal, modalApi] = useVbenModal({
+  // 在这里更改宽度
+  class: 'w-[60%]',
+  fullscreenButton: false,
+  onBeforeClose,
+  onClosed: handleClosed,
+  onConfirm: handleConfirm,
+  onOpenChange: async (isOpen) => {
+    if (!isOpen) {
+      return null;
+    }
+    modalApi.modalLoading(true);
+    await queryPersonData()
+    const { id } = modalApi.getData() as { id?: number | string };
+    isUpdate.value = !!id;
+
+    if (isUpdate.value && id) {
+      const record = await contingenPlanInfo(id);
+      await formApi.setValues(record);
+    }
+    await markInitialized();
+
+    modalApi.modalLoading(false);
+  },
+});
+
+async function handleConfirm() {
+  try {
+    modalApi.lock(true);
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
+    const data = cloneDeep(await formApi.getValues());
+    await (isUpdate.value ? contingenPlanUpdate(data) : contingenPlanAdd(data));
+    resetInitialized();
+    emit('reload');
+    modalApi.close();
+  } catch (error) {
+    console.error(error);
+  } finally {
+    modalApi.lock(false);
+  }
+}
+
+async function queryPersonData() {
+  let params = {
+    pageSize: 1000,
+    pageNum: 1,
+  }
+  const res = await personList(params);
+  const options = res.rows.map((user) => ({
+    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') + '-' + user.phone,
+    value: user.id,
+  }));
+  formApi.updateSchema([
+    {
+      componentProps: () => ({
+        options: options,
+        showSearch:true,
+        filterOption: filterOption
+      }),
+      fieldName: 'initiat',
+    },
+    {
+      componentProps: () => ({
+        options: options,
+        showSearch:true,
+        filterOption: filterOption
+      }),
+      fieldName: 'dutyPersion',
+    }
+  ])
+}
+
+const filterOption = (input: string, option: any) => {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+};
+
+async function handleClosed() {
+  await formApi.resetForm();
+  resetInitialized();
+}
+</script>
+
+<template>
+  <BasicModal :title="title">
+    <BasicForm />
+  </BasicModal>
+</template>
+

apps/web-antd/src/views/property/customerService/contingenPlan/data.ts

@@ -0,0 +1,158 @@
+import type { FormSchemaGetter } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';
+import { getDictOptions } from '#/utils/dict';
+import { renderDict } from '#/utils/render';
+import {h} from "vue";
+import {Rate} from "ant-design-vue";
+
+export const querySchema: FormSchemaGetter = () => [
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('type_contingency_plan'),
+    },
+    fieldName: 'contingenPlanType',
+    label: '预案类型',
+  },
+  {
+    component: 'Input',
+    fieldName: 'dutyPersion',
+    label: '责任人',
+  },
+  {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('pro_exercise_status'),
+    },
+    fieldName: 'status',
+    label: '演练状态',
+  },
+];
+
+export const columns: VxeGridProps['columns'] = [
+  { type: 'checkbox', width: 60 },
+  {
+    title: '序号',
+    field: 'id',
+    slots: {
+      default: ({rowIndex}) => {
+        return (rowIndex + 1).toString();
+      }
+    }
+  },
+  {
+    title: '预案名称',
+    field: 'contingenPlanName',
+  },
+  {
+    title: '预案类型',
+    field: 'contingenPlanType',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.contingenPlanType, 'type_contingency_plan');
+      },
+    },
+  },
+  {
+    title: '风险等级',
+    field: 'grade',
+    slots: {
+      default: ({ row }) => {
+        return h(Rate, {
+          value: row.grade || 0,
+          disabled: true,
+        });
+      },
+    },
+    minWidth: '150'
+  },
+  {
+    title: '发起人',
+    field: 'initiat',
+  },
+  {
+    title: '演练状态',
+    field: 'status',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.status, 'pro_exercise_status');
+      },
+    },
+  },
+  {
+    title: '责任人',
+    field: 'dutyPersion',
+  },
+  {
+    title: '完成时间',
+    field: 'compleTimes',
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
+    title: '操作',
+    width: 180,
+  },
+];
+
+export const modalSchema: FormSchemaGetter = () => [
+  {
+    label: '主键',
+    fieldName: 'id',
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '预案名称',
+    fieldName: 'contingenPlanName',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '预案类型',
+    fieldName: 'contingenPlanType',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('type_contingency_plan'),
+    },
+    rules: 'selectRequired',
+  },
+  {
+    label: '发起人',
+    fieldName: 'initiat',
+    component: 'ApiSelect',
+    rules: 'selectRequired',
+  },
+  {
+    label: '责任人',
+    fieldName: 'dutyPersion',
+    component: 'ApiSelect',
+    rules: 'selectRequired',
+  },
+  {
+    label: '预案内容',
+    fieldName: 'contingenPlanContent',
+    component: 'RichTextarea',
+    componentProps: {
+      // disabled: false, // 是否只读
+      // height: 400 // 高度 默认400
+    },
+    formItemClass: 'col-span-2'
+  },
+  {
+    label: '风险等级',
+    fieldName: 'grade',
+    component: 'Rate',
+    componentProps: {
+      allowHalf: false,
+      count: 5,
+      tooltips: ['1星', '2星', '3星', '4星', '5星'],
+      defaultValue: 0
+    },
+    rules: 'required',
+  },
+];

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

@@ -0,0 +1,178 @@
+<script setup lang="ts">
+import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
+import { getVxePopupContainer } from '@vben/utils';
+import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import {
+  useVbenVxeGrid,
+  vxeCheckboxChecked,
+  type VxeGridProps
+} from '#/adapter/vxe-table';
+
+import {
+  contingenPlanExport,
+  contingenPlanList,
+  contingenPlanRemove,
+} from '#/api/property/customerService/contingenPlan';
+import type { ContingenPlanForm } from '#/api/property/customerService/contingenPlan/model';
+import { commonDownloadExcel } from '#/utils/file/download';
+
+import contingenPlanModal from './contingenPlan-modal.vue';
+import contingenPlanDetail from './contingenPlan-detail.vue';
+import { columns, querySchema } from './data';
+
+const formOptions: VbenFormProps = {
+  commonConfig: {
+    labelWidth: 80,
+    componentProps: {
+      allowClear: true,
+    },
+  },
+  schema: querySchema(),
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+};
+
+const gridOptions: VxeGridProps = {
+  checkboxConfig: {
+    // 高亮
+    highlight: true,
+    // 翻页时保留选中状态
+    reserve: true,
+  },
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {},
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        return await contingenPlanList({
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          ...formValues,
+        });
+      },
+    },
+  },
+  rowConfig: {
+    keyField: 'id',
+  },
+  // 表格全局唯一表示 保存列配置需要用到
+  id: 'system-contingenPlan-index'
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({
+  formOptions,
+  gridOptions,
+});
+
+const [ContingenPlanModal, modalApi] = useVbenModal({
+  connectedComponent: contingenPlanModal,
+});
+
+const [contingenPlanDetailModal, contingenPlanDetailApi] = useVbenModal({
+  connectedComponent: contingenPlanDetail,
+});
+
+async function handleInfo(row: Required<ContingenPlanForm>) {
+  contingenPlanDetailApi.setData({ id: row.id });
+  contingenPlanDetailApi.open();
+}
+
+function handleAdd() {
+  modalApi.setData({});
+  modalApi.open();
+}
+
+async function handleEdit(row: Required<ContingenPlanForm>) {
+  modalApi.setData({ id: row.id });
+  modalApi.open();
+}
+
+async function handleDelete(row: Required<ContingenPlanForm>) {
+  await contingenPlanRemove(row.id);
+  await tableApi.query();
+}
+
+function handleMultiDelete() {
+  const rows = tableApi.grid.getCheckboxRecords();
+  const ids = rows.map((row: Required<ContingenPlanForm>) => row.id);
+  Modal.confirm({
+    title: '提示',
+    okType: 'danger',
+    content: `确认删除选中的${ids.length}条记录吗？`,
+    onOk: async () => {
+      await contingenPlanRemove(ids);
+      await tableApi.query();
+    },
+  });
+}
+
+function handleDownloadExcel() {
+  commonDownloadExcel(contingenPlanExport, '应急预案管理数据', tableApi.formApi.form.values, {
+    fieldMappingTime: formOptions.fieldMappingTime,
+  });
+}
+</script>
+
+<template>
+  <Page :auto-content-height="true">
+    <BasicTable table-title="应急预案管理列表">
+      <template #toolbar-tools>
+        <Space>
+          <a-button
+            v-access:code="['system:contingenPlan:export']"
+            @click="handleDownloadExcel"
+          >
+            {{ $t('pages.common.export') }}
+          </a-button>
+          <a-button
+            :disabled="!vxeCheckboxChecked(tableApi)"
+            danger
+            type="primary"
+            v-access:code="['system:contingenPlan:remove']"
+            @click="handleMultiDelete">
+            {{ $t('pages.common.delete') }}
+          </a-button>
+          <a-button
+            type="primary"
+            v-access:code="['system:contingenPlan:add']"
+            @click="handleAdd"
+          >
+            {{ $t('pages.common.add') }}
+          </a-button>
+        </Space>
+      </template>
+      <template #action="{ row }">
+        <Space>
+          <ghost-button
+            @click.stop="handleInfo(row)"
+          >
+            {{ $t('pages.common.info') }}
+          </ghost-button>
+          <ghost-button
+            v-access:code="['system:contingenPlan:edit']"
+            @click.stop="handleEdit(row)"
+          >
+            {{ $t('pages.common.edit') }}
+          </ghost-button>
+          <Popconfirm
+            :get-popup-container="getVxePopupContainer"
+            placement="left"
+            title="确认删除？"
+            @confirm="handleDelete(row)"
+          >
+            <ghost-button
+              danger
+              v-access:code="['system:contingenPlan:remove']"
+              @click.stop=""
+            >
+              {{ $t('pages.common.delete') }}
+            </ghost-button>
+          </Popconfirm>
+        </Space>
+      </template>
+    </BasicTable>
+    <ContingenPlanModal @reload="tableApi.query()" />
+    <contingenPlanDetailModal/>
+  </Page>
+</template>