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>
|
<span>{{ '第' + (index + 1) + '天' }}</span>
|
||||||
</template>
|
</template>
|
||||||
<template v-if="column.dataIndex === 'shiftId'">
|
<template v-if="column.dataIndex === 'shiftId'">
|
||||||
{{record.shiftId}}
|
{{record.shiftValue}}
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</Table>
|
||||||
|
@@ -111,7 +111,6 @@ const [BasicModal, modalApi] = useVbenModal({
|
|||||||
settingData.cycleData=record.scheduleCycleList
|
settingData.cycleData=record.scheduleCycleList
|
||||||
settingData.cycleData.forEach(item => {
|
settingData.cycleData.forEach(item => {
|
||||||
if(item.shiftId){
|
if(item.shiftId){
|
||||||
item.scheduleId=item.shiftId
|
|
||||||
const shift = record.attendanceList.find(i => item.shiftId == i.id);
|
const shift = record.attendanceList.find(i => item.shiftId == i.id);
|
||||||
let str = ''
|
let str = ''
|
||||||
if (shift.isRest) {
|
if (shift.isRest) {
|
||||||
@@ -135,7 +134,7 @@ const [BasicModal, modalApi] = useVbenModal({
|
|||||||
shiftId: null,
|
shiftId: null,
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
settingData.cycleData = [{scheduleId: ''}, {scheduleId: ''}];
|
settingData.cycleData = [{shiftId: ''}, {shiftId: ''}];
|
||||||
}
|
}
|
||||||
await markInitialized();
|
await markInitialized();
|
||||||
modalApi.modalLoading(false);
|
modalApi.modalLoading(false);
|
||||||
@@ -154,7 +153,7 @@ async function handleConfirm() {
|
|||||||
if (data.attendanceType == 1) {
|
if (data.attendanceType == 1) {
|
||||||
let hasError = true;
|
let hasError = true;
|
||||||
settingData.cycleData.some((item, index) => {
|
settingData.cycleData.some((item, index) => {
|
||||||
if (!item.scheduleId) {
|
if (!item.shiftId) {
|
||||||
hasError = false
|
hasError = false
|
||||||
message.warning('请选择周期天数对应班次。');
|
message.warning('请选择周期天数对应班次。');
|
||||||
return;
|
return;
|
||||||
@@ -252,7 +251,7 @@ function handleShiftList(list: any[]) {
|
|||||||
function addCycleHandle() {
|
function addCycleHandle() {
|
||||||
if (settingData.cycleData.length < 31) {
|
if (settingData.cycleData.length < 31) {
|
||||||
settingData.cycleData.push({
|
settingData.cycleData.push({
|
||||||
scheduleId: '',
|
shiftId: '',
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
message.warning('周期天数最多31天。');
|
message.warning('周期天数最多31天。');
|
||||||
@@ -492,7 +491,7 @@ function getUnCheckInData(val: any) {
|
|||||||
<Select
|
<Select
|
||||||
ref="select"
|
ref="select"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
v-model:value="record.scheduleId"
|
v-model:value="record.shiftId"
|
||||||
placeholder="请选择班次"
|
placeholder="请选择班次"
|
||||||
>
|
>
|
||||||
<SelectOption v-for="item in shiftList" :value="item.id">
|
<SelectOption v-for="item in shiftList" :value="item.id">
|
||||||
|
Reference in New Issue
Block a user