fix:考勤组排班制保存、编辑
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
This commit is contained in:
@@ -213,7 +213,7 @@ async function showHoliday() {
|
||||
<span>{{ '第' + (index + 1) + '天' }}</span>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'shiftId'">
|
||||
{{record.shiftId}}
|
||||
{{record.shiftValue}}
|
||||
</template>
|
||||
</template>
|
||||
</Table>
|
||||
|
@@ -111,7 +111,6 @@ const [BasicModal, modalApi] = useVbenModal({
|
||||
settingData.cycleData=record.scheduleCycleList
|
||||
settingData.cycleData.forEach(item => {
|
||||
if(item.shiftId){
|
||||
item.scheduleId=item.shiftId
|
||||
const shift = record.attendanceList.find(i => item.shiftId == i.id);
|
||||
let str = ''
|
||||
if (shift.isRest) {
|
||||
@@ -135,7 +134,7 @@ const [BasicModal, modalApi] = useVbenModal({
|
||||
shiftId: null,
|
||||
})
|
||||
})
|
||||
settingData.cycleData = [{scheduleId: ''}, {scheduleId: ''}];
|
||||
settingData.cycleData = [{shiftId: ''}, {shiftId: ''}];
|
||||
}
|
||||
await markInitialized();
|
||||
modalApi.modalLoading(false);
|
||||
@@ -154,7 +153,7 @@ async function handleConfirm() {
|
||||
if (data.attendanceType == 1) {
|
||||
let hasError = true;
|
||||
settingData.cycleData.some((item, index) => {
|
||||
if (!item.scheduleId) {
|
||||
if (!item.shiftId) {
|
||||
hasError = false
|
||||
message.warning('请选择周期天数对应班次。');
|
||||
return;
|
||||
@@ -252,7 +251,7 @@ function handleShiftList(list: any[]) {
|
||||
function addCycleHandle() {
|
||||
if (settingData.cycleData.length < 31) {
|
||||
settingData.cycleData.push({
|
||||
scheduleId: '',
|
||||
shiftId: '',
|
||||
})
|
||||
} else {
|
||||
message.warning('周期天数最多31天。');
|
||||
@@ -492,7 +491,7 @@ function getUnCheckInData(val: any) {
|
||||
<Select
|
||||
ref="select"
|
||||
style="width: 100%"
|
||||
v-model:value="record.scheduleId"
|
||||
v-model:value="record.shiftId"
|
||||
placeholder="请选择班次"
|
||||
>
|
||||
<SelectOption v-for="item in shiftList" :value="item.id">
|
||||
|
Reference in New Issue
Block a user