1、bug修复

2、添加巡检明细接口
2025-07-28 17:16:27 +08:00
parent ba538a2227
commit fe78f7ad25
9 changed files with 458 additions and 85 deletions
--- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
@@ -45,7 +45,28 @@ async function handleOpenChange(open: boolean) {
  }
  modalApi.modalLoading(true);
  const {id,attendanceType} = modalApi.getData() as { id?: number | string,attendanceType?:string };
-  groupDetail.value = await groupInfo(id,attendanceType);
+  const res = await groupInfo(id,attendanceType);
+  groupDetail.value=res;
+  if(res.attendanceType==0){
+    unCheckInData.value=res.clockDateList.filter(item=>item.mustNoCheck==0)
+    checkInData.value=res.clockDateList.filter(item=>item.mustNoCheck==1)
+    weekdayData.value=res.weekList
+    weekdayData.value.forEach(item => {
+      if(item.shiftId){
+        const shift = res.attendanceList.find(i => item.shiftId == i.id);
+        let str = ''
+        if (shift.isRest) {
+          str = `${shift.name}：${shift.startTime}~${shift.restStartTime} ${shift.restEndTime}~${shift.endTime}`;
+        } else {
+          str = `${shift.name}：${shift.startTime}~${shift.endTime}`;
+        }
+        item.shiftValue=str
+      }
+    })
+    groupDetail.value.isAutomatic=true
+  }else {
+    cycleData.value=res;
+  }
  modalApi.modalLoading(false);
 }

@@ -94,6 +115,15 @@ async function showHoliday() {
              size="small"
              :pagination="false"
            >
+              <template #bodyCell="{ column, record, index }">
+                <template v-if="column.dataIndex === 'dayOfWeek'">
+                 <component :is="renderDict(record.dayOfWeek,'wy_kqgzr')"></component>
+                </template>
+                <template v-if="column.dataIndex === 'shiftId'">
+                  <span v-if="record.shiftId">{{record.shiftValue }}</span>
+                  <span v-else>休息</span>
+                </template>
+              </template>
            </Table>
            <Checkbox
              class="item-padding-top"
@@ -112,14 +142,15 @@ async function showHoliday() {
              size="small"
              :pagination="false"
            >
-              <template #bodyCell="{ column, record, index }">
+              <template #bodyCell="{ column, record }">
                <template v-if="column.dataIndex === 'dateTime'">
                  <span v-if="record.dateType == 0">{{
-                    record.startDate
-                  }}</span>
+                      dayjs(record.startDate).format('YYYY-MM-DD')
+                    }}</span>
                  <span v-else>{{
-                    record.startDate + '~' + record.endDate
-                  }}</span>
+                      dayjs(record.startDate).format('YYYY-MM-DD')
+                      + '~' + dayjs(record.endDate).format('YYYY-MM-DD')
+                    }}</span>
                </template>
              </template>
            </Table>
@@ -132,13 +163,14 @@ async function showHoliday() {
              size="small"
              :pagination="false"
            >
-              <template #bodyCell="{ column, record, index }">
+              <template #bodyCell="{ column, record }">
                <template v-if="column.dataIndex === 'dateTime'">
                  <span v-if="record.dateType == 0">{{
-                    record.startDate
+                    dayjs(record.startDate).format('YYYY-MM-DD')
                  }}</span>
                  <span v-else>{{
-                    record.startDate + '~' + record.endDate
+                      dayjs(record.startDate).format('YYYY-MM-DD')
+                       + '~' + dayjs(record.endDate).format('YYYY-MM-DD')
                  }}</span>
                </template>
              </template>
@@ -169,9 +201,7 @@ async function showHoliday() {
                <span>{{ '第' + (index + 1) + '天' }}</span>
              </template>
              <template v-if="column.dataIndex === 'shiftId'">
-                <!--                    {{item.name+'\xa0'}}-->
-                <!--                    <span v-if="item.isRest">{{item.startTime+'~'+item.restStartTime+'\xa0'+item.restEndTime+'~'+item.endTime}}</span>-->
-                <!--                    <span v-else>{{item.startTime+'~'+item.endTime}}</span>-->
+                {{record.shiftId}}
              </template>
            </template>
          </Table>
--- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/data.ts
+++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/data.ts
@@ -82,6 +82,10 @@ export const modalSchema: FormSchemaGetter = () => [
      buttonStyle: 'solid',
      options: getDictOptions('wy_kqlx'),
    },
+    dependencies:{
+      disabled: (formValue) => formValue.id,
+      triggerFields: ['id'],
+    },
    rules: 'selectRequired',
    defaultValue: '0',
  },
@@ -168,17 +172,17 @@ export const modalSchema: FormSchemaGetter = () => [
 export const weekdayColumns: TableColumnsType = [
  {
    title: '工作日',
-    key: 'label',
+    key: 'dayOfWeek',
    width: 120,
    align: 'center',
-    dataIndex: 'label'
+    dataIndex: 'dayOfWeek'
  },
  {
    title: '班次',
-    key: 'shiftValue',
+    key: 'shiftId',
    minWidth: 180,
    align: 'center',
-    dataIndex: 'shiftValue'
+    dataIndex: 'shiftId'
  },
  {
    title: '操作',
@@ -320,17 +324,17 @@ export const clockInModalSchema: FormSchemaGetter = () => [
 export const infoWeekdayColumns: TableColumnsType = [
  {
    title: '工作日',
-    key: 'label',
+    key: 'dayOfWeek',
    width: 120,
    align: 'center',
-    dataIndex: 'label'
+    dataIndex: 'dayOfWeek'
  },
  {
    title: '班次',
-    key: 'shiftValue',
+    key: 'shiftId',
    minWidth: 180,
    align: 'center',
-    dataIndex: 'shiftValue'
+    dataIndex: 'shiftId'
  },
 ]

--- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
@@ -28,6 +28,8 @@ import checkInDate from './check-in-date.vue'
 import {h} from 'vue';
 import {PlusOutlined, MinusOutlined} from '@ant-design/icons-vue';
 import type {ShiftVO} from "#/api/property/attendanceManagement/shiftSetting/model";
+import {renderDict} from "#/utils/render";
+import dayjs from "dayjs";

 const emit = defineEmits<{ reload: [] }>();
 const isUpdate = ref(false);
@@ -88,6 +90,26 @@ const [BasicModal, modalApi] = useVbenModal({
    isUpdate.value = !!id;
    if (isUpdate.value && id) {
      const record = await groupInfo(id, attendanceType);
+      record.attendanceType = record.attendanceType.toString()
+      if (record.attendanceType == '0') {
+        settingData.unCheckInData = record.clockDateList.filter(item => item.mustNoCheck == 0)
+        settingData.checkInData = record.clockDateList.filter(item => item.mustNoCheck == 1)
+        settingData.weekdayData = record.weekList
+        settingData.weekdayData.forEach(item => {
+          if(item.shiftId){
+            const shift = record.attendanceList.find(i => item.shiftId == i.id);
+            let str = ''
+            if (shift.isRest) {
+              str = `${shift.name}：${shift.startTime}~${shift.restStartTime} ${shift.restEndTime}~${shift.endTime}`;
+            } else {
+              str = `${shift.name}：${shift.startTime}~${shift.endTime}`;
+            }
+            item.shiftValue=str
+          }
+        })
+      } else {
+
+      }
      await formApi.setValues(record);
    } else {
      getDictOptions('wy_kqgzr').forEach(item => {
@@ -119,7 +141,7 @@ async function handleConfirm() {
      let hasError = true;
      settingData.cycleData.some((item, index) => {
        if (!item.scheduleId) {
-          hasError=false
+          hasError = false
          message.warning('请选择周期天数对应班次。');
          return;
        }
@@ -331,6 +353,13 @@ function getUnCheckInData(val: any) {
                 :data-source="settingData.weekdayData"
                 size="small" :pagination="false">
            <template #bodyCell="{ column, record,index }">
+              <template v-if="column.dataIndex==='dayOfWeek'">
+                <component :is="renderDict(record.dayOfWeek,'wy_kqgzr')"></component>
+              </template>
+              <template v-if="column.dataIndex==='shiftId'">
+                <span v-if="record.shiftId">{{ record.shiftValue }}</span>
+                <span v-else>休息</span>
+              </template>
              <template v-if="column.dataIndex==='action'">
                <Button type="link" size="small" @click="changeShiftHandle(3,index)">更改班次
                </Button>
@@ -364,8 +393,13 @@ function getUnCheckInData(val: any) {
                </Button>
              </template>
              <template v-if="column.dataIndex==='dateTime'">
-                <span v-if="record.dateType==0">{{ record.startDate }}</span>
-                <span v-else>{{ record.startDate + '~' + record.endDate }}</span>
+               <span v-if="record.dateType == 0">{{
+                   dayjs(record.startDate).format('YYYY-MM-DD')
+                 }}</span>
+                <span v-else>{{
+                    dayjs(record.startDate).format('YYYY-MM-DD')
+                    + '~' + dayjs(record.endDate).format('YYYY-MM-DD')
+                  }}</span>
              </template>
            </template>
          </Table>
@@ -383,8 +417,13 @@ function getUnCheckInData(val: any) {
            </template>
            <template #bodyCell="{ column,record,index }">
              <template v-if="column.dataIndex==='dateTime'">
-                <span v-if="record.dateType==0">{{ record.startDate }}</span>
-                <span v-else>{{ record.startDate + '~' + record.endDate }}</span>
+                 <span v-if="record.dateType == 0">{{
+                     dayjs(record.startDate).format('YYYY-MM-DD')
+                   }}</span>
+                <span v-else>{{
+                    dayjs(record.startDate).format('YYYY-MM-DD')
+                    + '~' + dayjs(record.endDate).format('YYYY-MM-DD')
+                  }}</span>
              </template>
              <template v-if="column.dataIndex==='action'">
                <Button size="small" type="primary" shape="circle"