查询排班详请

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

@@ -89,6 +89,10 @@ export interface ArrangementForm extends BaseEntity {
    * 排班人员详情
    */
   userGroupList: any[];
+  /**
+   * 排班id
+   */
+  scheduleId: string | number;
 }
 
 export interface ArrangementQuery extends PageQuery {

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

@@ -0,0 +1,61 @@
+import type { AttendanceAreaVO, AttendanceAreaForm, AttendanceAreaQuery } 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 attendanceAreaList(params?: AttendanceAreaQuery) {
+  return requestClient.get<PageResult<AttendanceAreaVO>>('/property/attendanceArea/list', { params });
+}
+
+/**
+ * 导出区域区域管理列表
+ * @param params
+ * @returns 区域区域管理列表
+ */
+export function attendanceAreaExport(params?: AttendanceAreaQuery) {
+  return commonExport('/property/attendanceArea/export', params ?? {});
+}
+
+/**
+ * 查询区域区域管理详情
+ * @param id id
+ * @returns 区域区域管理详情
+ */
+export function attendanceAreaInfo(id: ID) {
+  return requestClient.get<AttendanceAreaVO>(`/property/attendanceArea/${id}`);
+}
+
+/**
+ * 新增区域区域管理
+ * @param data
+ * @returns void
+ */
+export function attendanceAreaAdd(data: AttendanceAreaForm) {
+  return requestClient.postWithMsg<void>('/property/attendanceArea', data);
+}
+
+/**
+ * 更新区域区域管理
+ * @param data
+ * @returns void
+ */
+export function attendanceAreaUpdate(data: AttendanceAreaForm) {
+  return requestClient.putWithMsg<void>('/property/attendanceArea', data);
+}
+
+/**
+ * 删除区域区域管理
+ * @param id id
+ * @returns void
+ */
+export function attendanceAreaRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/property/attendanceArea/${id}`);
+}

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

@@ -0,0 +1,69 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface AttendanceAreaVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 摄像机id
+   */
+  deviceManageId: string | number;
+
+  /**
+   * 区域
+   */
+  area: string;
+
+  /**
+   * 备注
+   */
+  reamark: string;
+
+}
+
+export interface AttendanceAreaForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 摄像机id
+   */
+  deviceManageId?: string | number;
+
+  /**
+   * 区域
+   */
+  area?: string;
+
+  /**
+   * 备注
+   */
+  reamark?: string;
+
+}
+
+export interface AttendanceAreaQuery extends PageQuery {
+  /**
+   * 摄像机id
+   */
+  deviceManageId?: string | number;
+
+  /**
+   * 区域
+   */
+  area?: string;
+
+  /**
+   * 备注
+   */
+  reamark?: string;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}

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

@@ -0,0 +1,101 @@
+<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 { attendanceAreaAdd, attendanceAreaInfo, attendanceAreaUpdate } from '#/api/property/attendanceManagement/attendanceArea';
+import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
+
+import { modalSchema } from './data';
+
+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-2',
+    // 默认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-[550px]',
+  fullscreenButton: false,
+  onBeforeClose,
+  onClosed: handleClosed,
+  onConfirm: handleConfirm,
+  onOpenChange: async (isOpen) => {
+    if (!isOpen) {
+      return null;
+    }
+    modalApi.modalLoading(true);
+
+    const { id } = modalApi.getData() as { id?: number | string };
+    isUpdate.value = !!id;
+
+    if (isUpdate.value && id) {
+      const record = await attendanceAreaInfo(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 ? attendanceAreaUpdate(data) : attendanceAreaAdd(data));
+    resetInitialized();
+    emit('reload');
+    modalApi.close();
+  } catch (error) {
+    console.error(error);
+  } finally {
+    modalApi.lock(false);
+  }
+}
+
+async function handleClosed() {
+  await formApi.resetForm();
+  resetInitialized();
+}
+</script>
+
+<template>
+  <BasicModal :title="title">
+    <BasicForm />
+  </BasicModal>
+</template>
+

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

@@ -0,0 +1,68 @@
+import type { FormSchemaGetter } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';
+
+
+export const querySchema: FormSchemaGetter = () => [
+  {
+    component: 'Input',
+    fieldName: 'area',
+    label: '区域',
+  }
+];
+
+// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
+// export const columns: () => VxeGridProps['columns'] = () => [
+export const columns: VxeGridProps['columns'] = [
+  { type: 'checkbox', width: 60 },
+  {
+    title: '区域',
+    field: 'area',
+    width: 'auto',
+  },
+  {
+    title: '摄像机id',
+    field: 'deviceManageId',
+    minWidth: 300,
+  },
+
+  {
+    title: '备注',
+    field: 'reamark',
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
+    title: '操作',
+    width: 180,
+  },
+];
+
+export const modalSchema: FormSchemaGetter = () => [
+  {
+    label: '主键id',
+    fieldName: 'id',
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '区域',
+    fieldName: 'area',
+    component: 'Input',
+  },
+  {
+    label: '摄像机id',
+    fieldName: 'deviceManageId',
+    component: 'Select',
+    componentProps: {
+    },
+  },
+  {
+    label: '备注',
+    fieldName: 'reamark',
+    component: 'Input',
+  },
+];

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

@@ -0,0 +1,182 @@
+<script setup lang="ts">
+import type { Recordable } from '@vben/types';
+
+import { ref } from 'vue';
+
+import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
+import { getVxePopupContainer } from '@vben/utils';
+
+import { Modal, Popconfirm, Space } from 'ant-design-vue';
+import dayjs from 'dayjs';
+
+import {   
+  useVbenVxeGrid,
+  vxeCheckboxChecked,
+  type VxeGridProps 
+} from '#/adapter/vxe-table';
+
+import {
+  attendanceAreaExport,
+  attendanceAreaList,
+  attendanceAreaRemove,
+} from '#/api/property/attendanceManagement/attendanceArea';
+import type { AttendanceAreaForm } from '#/api/property/attendanceManagement/attendanceArea/model';
+import { commonDownloadExcel } from '#/utils/file/download';
+
+import attendanceAreaModal from './attendanceArea-modal.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',
+  // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到
+  // 不需要直接删除
+  // fieldMappingTime: [
+  //  [
+  //    'createTime',
+  //    ['params[beginTime]', 'params[endTime]'],
+  //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
+  //  ],
+  // ],
+};
+
+const gridOptions: VxeGridProps = {
+  checkboxConfig: {
+    // 高亮
+    highlight: true,
+    // 翻页时保留选中状态
+    reserve: true,
+    // 点击行选中
+    // trigger: 'row',
+  },
+  // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
+  // columns: columns(),
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {},
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        return await attendanceAreaList({
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          ...formValues,
+        });
+      },
+    },
+  },
+  rowConfig: {
+    keyField: 'id',
+  },
+  // 表格全局唯一表示 保存列配置需要用到
+  id: 'property-attendanceArea-index'
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({
+  formOptions,
+  gridOptions,
+});
+
+const [AttendanceAreaModal, modalApi] = useVbenModal({
+  connectedComponent: attendanceAreaModal,
+});
+
+function handleAdd() {
+  modalApi.setData({});
+  modalApi.open();
+}
+
+async function handleEdit(row: Required<AttendanceAreaForm>) {
+  modalApi.setData({ id: row.id });
+  modalApi.open();
+}
+
+async function handleDelete(row: Required<AttendanceAreaForm>) {
+  await attendanceAreaRemove(row.id);
+  await tableApi.query();
+}
+
+function handleMultiDelete() {
+  const rows = tableApi.grid.getCheckboxRecords();
+  const ids = rows.map((row: Required<AttendanceAreaForm>) => row.id);
+  Modal.confirm({
+    title: '提示',
+    okType: 'danger',
+    content: `确认删除选中的${ids.length}条记录吗？`,
+    onOk: async () => {
+      await attendanceAreaRemove(ids);
+      await tableApi.query();
+    },
+  });
+}
+
+function handleDownloadExcel() {
+  commonDownloadExcel(attendanceAreaExport, '区域区域管理数据', 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="['property:attendanceArea:export']"
+            @click="handleDownloadExcel"
+          >
+            {{ $t('pages.common.export') }}
+          </a-button>
+          <a-button
+            :disabled="!vxeCheckboxChecked(tableApi)"
+            danger
+            type="primary" 
+            v-access:code="['property:attendanceArea:remove']" 
+            @click="handleMultiDelete">
+            {{ $t('pages.common.delete') }}
+          </a-button>
+          <a-button
+            type="primary"
+            v-access:code="['property:attendanceArea:add']"
+            @click="handleAdd"
+          >
+            {{ $t('pages.common.add') }}
+          </a-button>
+        </Space>
+      </template>
+      <template #action="{ row }">
+        <Space>
+          <ghost-button
+            v-access:code="['property:attendanceArea: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="['property:attendanceArea:remove']"
+              @click.stop=""
+            >
+              {{ $t('pages.common.delete') }}
+            </ghost-button>
+          </Popconfirm>
+        </Space>
+      </template>
+    </BasicTable>
+    <AttendanceAreaModal @reload="tableApi.query()" />
+  </Page>
+</template>

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

@@ -180,8 +180,8 @@ const getListData2 = (
     if (found) {
       return found.list;
     }
-  }
 
+  }
   // 如果没有找到数据，返回空数组
   return [];
 };

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

@@ -82,13 +82,13 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     title: '人员',
-    field: 'employeeName',
+    field: 'sysUser.userName',
     width: 120,
     // width: 'auto',
   },
   {
     title: '单位',
-    field: 'deptName',
+    field: 'sysUser.deptName',
     width: 'auto',
   },
   // {

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

@@ -83,12 +83,12 @@ function handleAdd() {
 }
 
 async function handleEdit(row: Required<ArrangementForm>) {
-  modalApi.setData({ id: row.id });
+  modalApi.setData({ id: row.scheduleId });
   modalApi.open();
 }
 
 async function handleDelete(row: Required<ArrangementForm>) {
-  await arrangementRemove(row.id);
+  await arrangementRemove(row.scheduleId);
   await tableApi.query();
 }
 </script>
@@ -129,12 +129,6 @@ async function handleDelete(row: Required<ArrangementForm>) {
           <BasicTable>
             <template #action="{ row }">
               <Space>
-                <ghost-button
-                  v-access:code="['property:arrangement:edit']"
-                  @click.stop="handleEdit(row)"
-                >
-                  {{ $t('pages.common.edit') }}
-                </ghost-button>
                 <Popconfirm
                   :get-popup-container="getVxePopupContainer"
                   placement="left"

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

@@ -238,7 +238,6 @@ async function handleConfirm() {
     await formRef.value.validate(); // 先校验
     const data = formModal;
     console.log(tableData);
-    
     data.userGroupList = tableData.flatMap((item) =>
       item.users.map((user) => ({
         deptId: item.dept.unitId,