|
|
@@ -13,38 +13,38 @@
|
|
|
<el-form-item label="手机号">
|
|
|
<el-input v-model="form.employeePhone" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="请假类型" prop="type">
|
|
|
- <el-select v-model="form.type" filterable allow-create default-first-option placeholder="请选择"
|
|
|
+ <el-form-item label="请假类型" prop="leaveType">
|
|
|
+ <el-select v-model="form.leaveType" filterable allow-create default-first-option placeholder="请选择"
|
|
|
style="width: 100%;">
|
|
|
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_OA_LEAVE_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value"/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="开始日期" prop="startData">
|
|
|
- <el-date-picker value-format="yyyy-MM-dd" v-model="form.startData" type="date" placeholder="选择日期"
|
|
|
+ <el-form-item label="开始日期" prop="startDate">
|
|
|
+ <el-date-picker value-format="yyyy-MM-dd" v-model="form.startDate" type="date" placeholder="选择日期"
|
|
|
style="width: 100%;" @change="upDay">
|
|
|
</el-date-picker>
|
|
|
- <el-radio-group v-model="form.concreteDay1" @change="upDay">
|
|
|
+ <el-radio-group v-model="form.startTime" @change="upDay">
|
|
|
<el-radio label="am">上午</el-radio>
|
|
|
<el-radio label="pm">下午</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item label="开始时段" prop="concreteDay1">
|
|
|
- <el-radio-group v-model="form.concreteDay1">
|
|
|
+ <!-- <el-form-item label="开始时段" prop="startTime">
|
|
|
+ <el-radio-group v-model="form.startTime">
|
|
|
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
|
|
|
:label="parseInt(dict.value)">{{ dict.label }}</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item> -->
|
|
|
- <el-form-item label="结束日期" prop="endData">
|
|
|
- <el-date-picker value-format="yyyy-MM-dd" v-model="form.endData" type="date" placeholder="选择日期"
|
|
|
+ <el-form-item label="结束日期" prop="endDate">
|
|
|
+ <el-date-picker value-format="yyyy-MM-dd" v-model="form.endDate" type="date" placeholder="选择日期"
|
|
|
style="width: 100%;" @change="upDay">
|
|
|
</el-date-picker>
|
|
|
- <el-radio-group v-model="form.concreteDay2" @change="upDay">
|
|
|
+ <el-radio-group v-model="form.endTime" @change="upDay">
|
|
|
<el-radio label="am">上午</el-radio>
|
|
|
<el-radio label="pm">下午</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item label="结束时段" prop="concreteDay2">
|
|
|
- <el-radio-group v-model="form.concreteDay2">
|
|
|
+ <!-- <el-form-item label="结束时段" prop="endTime">
|
|
|
+ <el-radio-group v-model="form.endTime">
|
|
|
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
|
|
|
:label="parseInt(dict.value)">{{ dict.label }}</el-radio>
|
|
|
</el-radio-group>
|
|
|
@@ -171,11 +171,11 @@ export default {
|
|
|
employeePhone: undefined,
|
|
|
|
|
|
|
|
|
- type: undefined,
|
|
|
- startData: undefined,
|
|
|
- concreteDay1: 'am',
|
|
|
- entData: undefined,
|
|
|
- concreteDay2: 'am',
|
|
|
+ leaveType: undefined,
|
|
|
+ startDate: undefined,
|
|
|
+ startTime: 'am',
|
|
|
+ endDate: undefined,
|
|
|
+ endTime: 'am',
|
|
|
day: undefined,
|
|
|
reason: undefined,
|
|
|
fileIdList: undefined,
|
|
|
@@ -183,13 +183,13 @@ export default {
|
|
|
peopleList: '',
|
|
|
},
|
|
|
rules: {
|
|
|
- type: [
|
|
|
+ leaveType: [
|
|
|
{ required: true, message: '请选择请假类型', trigger: 'change' },
|
|
|
],
|
|
|
- startData: [
|
|
|
+ startDate: [
|
|
|
{ required: true, message: '请选择日期', trigger: 'change' }
|
|
|
],
|
|
|
- endData: [
|
|
|
+ endDate: [
|
|
|
{ required: true, message: '请选择日期', trigger: 'change' }
|
|
|
],
|
|
|
reason: [
|
|
|
@@ -258,17 +258,17 @@ export default {
|
|
|
return str;
|
|
|
},
|
|
|
upDay() {
|
|
|
- if (this.form.startData && this.form.endData) {
|
|
|
+ if (this.form.startDate && this.form.endDate) {
|
|
|
let leaveDays = this.calLeaveDays();
|
|
|
if (leaveDays < 0) {
|
|
|
- this.form.startData = "";
|
|
|
- this.form.endData = "";
|
|
|
+ this.form.startDate = "";
|
|
|
+ this.form.endDate = "";
|
|
|
this.form.day = "";
|
|
|
this.$message.warning("起始日期小于结束日期，请重新选择！");
|
|
|
return;
|
|
|
} else if (leaveDays == 0) {
|
|
|
- this.form.startData = "";
|
|
|
- this.form.endData = "";
|
|
|
+ this.form.startDate = "";
|
|
|
+ this.form.endDate = "";
|
|
|
this.form.day = "";
|
|
|
this.$message.warning("工作日天数为0，请重新选择！");
|
|
|
return;
|
|
|
@@ -281,16 +281,16 @@ export default {
|
|
|
calLeaveDays() {
|
|
|
var start_date = new Date();
|
|
|
var end_date = new Date();
|
|
|
- if (this.form.concreteDay1 == 'am') {
|
|
|
- start_date = new Date(this.form.startData + " 00:00:00");
|
|
|
+ if (this.form.startTime == 'am') {
|
|
|
+ start_date = new Date(this.form.startDate + " 00:00:00");
|
|
|
} else {
|
|
|
- start_date = new Date(this.form.startData + " 12:00:00");
|
|
|
+ start_date = new Date(this.form.startDate + " 12:00:00");
|
|
|
}
|
|
|
|
|
|
- if (this.form.concreteDay2 == 'am') {
|
|
|
- end_date = new Date(this.form.endData + " 12:00:00");
|
|
|
+ if (this.form.endTime == 'am') {
|
|
|
+ end_date = new Date(this.form.endDate + " 12:00:00");
|
|
|
} else {
|
|
|
- end_date = new Date(this.form.endData + " 24:00:00");
|
|
|
+ end_date = new Date(this.form.endDate + " 24:00:00");
|
|
|
}
|
|
|
console.log(start_date);
|
|
|
console.log(end_date);
|
