|
@@ -59,50 +59,6 @@
|
|
|
:value="dict.value"
|
|
|
/>
|
|
|
</el-select>
|
|
|
- <!-- <el-radio-group v-model="form1.leaveTpye">
|
|
|
- <el-radio
|
|
|
- :disabled="showTable !== undefined"
|
|
|
- label="0"
|
|
|
- size="large"
|
|
|
- >事假</el-radio
|
|
|
- >
|
|
|
- <el-radio
|
|
|
- :disabled="showTable !== undefined"
|
|
|
- label="1"
|
|
|
- size="large"
|
|
|
- >病假</el-radio
|
|
|
- >
|
|
|
- <el-radio
|
|
|
- :disabled="showTable !== undefined"
|
|
|
- label="2"
|
|
|
- size="large"
|
|
|
- >年休假</el-radio
|
|
|
- >
|
|
|
- <el-radio
|
|
|
- :disabled="showTable !== undefined"
|
|
|
- label="3"
|
|
|
- size="large"
|
|
|
- >探亲假</el-radio
|
|
|
- >
|
|
|
- <el-radio
|
|
|
- :disabled="showTable !== undefined"
|
|
|
- label="4"
|
|
|
- size="large"
|
|
|
- >婚假</el-radio
|
|
|
- >
|
|
|
- <el-radio
|
|
|
- :disabled="showTable !== undefined"
|
|
|
- label="5"
|
|
|
- size="large"
|
|
|
- >丧假</el-radio
|
|
|
- >
|
|
|
- <el-radio
|
|
|
- :disabled="showTable !== undefined"
|
|
|
- label="6"
|
|
|
- size="large"
|
|
|
- >产假</el-radio
|
|
|
- >
|
|
|
- </el-radio-group> -->
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="leaveTime" label="请(休)假起止日期:">
|
|
|
<el-col :span="24">
|
|
@@ -317,6 +273,7 @@ import {
|
|
|
getReturnWorkNode,
|
|
|
WorkProgressBar,
|
|
|
NodeReturnWork,
|
|
|
+ getLeaveDays,
|
|
|
} from "@/api/clocking/leave";
|
|
|
import {
|
|
|
generNextStepNode,
|
|
@@ -376,20 +333,6 @@ export default {
|
|
|
workid: null,
|
|
|
reviewMsg: null,
|
|
|
},
|
|
|
- leaveInfo: [
|
|
|
- {
|
|
|
- lable: "事假",
|
|
|
- value: "0",
|
|
|
- },
|
|
|
- {
|
|
|
- lable: "年假",
|
|
|
- value: "1",
|
|
|
- },
|
|
|
- {
|
|
|
- lable: "病假",
|
|
|
- value: "2",
|
|
|
- },
|
|
|
- ],
|
|
|
flowDatas: {
|
|
|
FK_Flow: null,
|
|
|
toNodeId: "",
|
|
@@ -407,7 +350,6 @@ export default {
|
|
|
leaveClear: false,
|
|
|
workId: null,
|
|
|
value2: "",
|
|
|
- // name: "",
|
|
|
input: "",
|
|
|
form1: {
|
|
|
leaveTime: null,
|
|
@@ -538,11 +480,16 @@ export default {
|
|
|
|
|
|
methods: {
|
|
|
changeDate(val) {
|
|
|
- var d1 = new Date(val[0]);
|
|
|
- var d2 = new Date(val[1]);
|
|
|
- var diff = d2 - d1;
|
|
|
- var days = diff / (1000 * 60 * 60 * 24);
|
|
|
- this.form1.leaveNumber = Math.floor(days) + 1;
|
|
|
+ console.log("56", val);
|
|
|
+ getLeaveDays({ startDate: val[0], endDate: val[1] }).then((res) => {
|
|
|
+ console.log("res", res);
|
|
|
+ this.form1.leaveNumber = res.data;
|
|
|
+ });
|
|
|
+ // var d1 = new Date(val[0]);
|
|
|
+ // var d2 = new Date(val[1]);
|
|
|
+ // var diff = d2 - d1;
|
|
|
+ // var days = diff / (1000 * 60 * 60 * 24);
|
|
|
+ // this.form1.leaveNumber = Math.floor(days) + 1;
|
|
|
},
|
|
|
closeLeaveDialog() {
|
|
|
this.$emit("closeViewLeave");
|
|
@@ -643,7 +590,6 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
this.flowDatas.token = getJToken();
|
|
|
this.flowDatas.WorkID = this.workId;
|
|
|
this.flowDatas.FK_Flow = "009";
|
|
@@ -667,11 +613,9 @@ export default {
|
|
|
this.form1.leaveReason = data.leaveReason;
|
|
|
this.form1.leaveTpye = data.leaveTpye;
|
|
|
this.form1.leaveTime = [data.leaveStartTime, data.leaveEndTime];
|
|
|
-
|
|
|
if (this.leaveTrue == false) {
|
|
|
this.generNextStepAllNode();
|
|
|
}
|
|
|
-
|
|
|
this.WorkProgressBar();
|
|
|
},
|
|
|
async generNextStepAllNode() {
|
|
@@ -713,9 +657,7 @@ export default {
|
|
|
this.form.leaveReason = this.form1.leaveReason;
|
|
|
this.form.leaveTpye = Number(this.form1.leaveTpye);
|
|
|
this.form.leaveStartTime = this.form1.leaveTime[0];
|
|
|
-
|
|
|
this.form.leaveEndTime = this.form1.leaveTime[1];
|
|
|
-
|
|
|
if (this.Fzr) {
|
|
|
this.flowDatas.token = getJToken();
|
|
|
this.flowDatas.WorkID = this.workId;
|