|
@@ -41,14 +41,14 @@ export const tableColumns: BasicColumn[] = [
|
|
return `${formatToDate(record.startDate)}~${formatToDate(record.endDate)}`;
|
|
return `${formatToDate(record.startDate)}~${formatToDate(record.endDate)}`;
|
|
},
|
|
},
|
|
},
|
|
},
|
|
- {
|
|
|
|
- title: '非考勤周期',
|
|
|
|
- dataIndex: 'notCycleIsInOut',
|
|
|
|
- width: 100,
|
|
|
|
- customRender: ({ record }) => {
|
|
|
|
- return record.notCycleIsInOut === 1 ? '允许进出' : '不允许进出';
|
|
|
|
- },
|
|
|
|
- },
|
|
|
|
|
|
+ // {
|
|
|
|
+ // title: '非考勤周期',
|
|
|
|
+ // dataIndex: 'notCycleIsInOut',
|
|
|
|
+ // width: 100,
|
|
|
|
+ // customRender: ({ record }) => {
|
|
|
|
+ // return record.notCycleIsInOut === 1 ? '允许进出' : '不允许进出';
|
|
|
|
+ // },
|
|
|
|
+ // },
|
|
{
|
|
{
|
|
title: '状态',
|
|
title: '状态',
|
|
dataIndex: 'status',
|
|
dataIndex: 'status',
|
|
@@ -157,6 +157,7 @@ export const formSchema: FormSchema[] = [
|
|
{ label: '不允许进出', value: 0 },
|
|
{ label: '不允许进出', value: 0 },
|
|
],
|
|
],
|
|
},
|
|
},
|
|
|
|
+ ifShow: false,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
label: '考勤人员',
|
|
label: '考勤人员',
|
|
@@ -312,27 +313,27 @@ export const formSubSchema = (roleId: string | number, dataType: string) => {
|
|
},
|
|
},
|
|
});
|
|
});
|
|
|
|
|
|
- formSchema.push({
|
|
|
|
- label: `${
|
|
|
|
- roleId === roleList[0].value ? '考勤' : dataType === 'holidays' ? '返校' : '上学'
|
|
|
|
- }时间是否允许进出`,
|
|
|
|
- field: `isAllowInOutSchoolTime`,
|
|
|
|
- component: 'RadioButtonGroup',
|
|
|
|
- required: true,
|
|
|
|
- colProps: { span: 24 },
|
|
|
|
- defaultValue: 1,
|
|
|
|
- componentProps: {
|
|
|
|
- options: [
|
|
|
|
- { label: '是', value: 1 },
|
|
|
|
- { label: '否', value: 0 },
|
|
|
|
- ],
|
|
|
|
- },
|
|
|
|
- ifShow: ({ values }) => {
|
|
|
|
- return roleId === roleList[1].value && dataType === 'holidays'
|
|
|
|
- ? values.isAllowInOutSchool === 0 && values.holidaysLastDayInOut === 1
|
|
|
|
- : values.isAllowInOutSchool === 1 && values.isAttendance === 1;
|
|
|
|
- },
|
|
|
|
- });
|
|
|
|
|
|
+ // formSchema.push({
|
|
|
|
+ // label: `${
|
|
|
|
+ // roleId === roleList[0].value ? '考勤' : dataType === 'holidays' ? '返校' : '上学'
|
|
|
|
+ // }时间是否允许进出`,
|
|
|
|
+ // field: `isAllowInOutSchoolTime`,
|
|
|
|
+ // component: 'RadioButtonGroup',
|
|
|
|
+ // required: true,
|
|
|
|
+ // colProps: { span: 24 },
|
|
|
|
+ // defaultValue: 1,
|
|
|
|
+ // componentProps: {
|
|
|
|
+ // options: [
|
|
|
|
+ // { label: '是', value: 1 },
|
|
|
|
+ // { label: '否', value: 0 },
|
|
|
|
+ // ],
|
|
|
|
+ // },
|
|
|
|
+ // ifShow: ({ values }) => {
|
|
|
|
+ // return roleId === roleList[1].value && dataType === 'holidays'
|
|
|
|
+ // ? values.isAllowInOutSchool === 0 && values.holidaysLastDayInOut === 1
|
|
|
|
+ // : values.isAllowInOutSchool === 1 && values.isAttendance === 1;
|
|
|
|
+ // },
|
|
|
|
+ // });
|
|
|
|
|
|
if (roleId === roleList[1].value && dataType === 'holidays') {
|
|
if (roleId === roleList[1].value && dataType === 'holidays') {
|
|
formSchema.push({
|
|
formSchema.push({
|