功能优化
This commit is contained in:
parent
cd70045bab
commit
2fdca07710
|
|
@ -7,7 +7,7 @@
|
|||
<el-form-item label="部门名称" prop="orgName">
|
||||
<el-input v-model="queryParams.orgName" />
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
|
|
@ -43,13 +43,13 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="申请时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="请假开始时间" align="center" prop="leaveStartDate" :show-overflow-tooltip="true" >
|
||||
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column label="请假结束时间" align="center" prop="leaveEndDate" :show-overflow-tooltip="true" >
|
||||
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column label="请假时长(天)" align="center" prop="leaveDuration" :show-overflow-tooltip="true" width="180"/>
|
||||
|
||||
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
|
||||
<template slot-scope="scope">
|
||||
<!-- <el-button
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
<el-form-item label="所属部门:" prop="orgName">
|
||||
<el-input v-model="form.orgName" :readonly="true" />
|
||||
<!-- <el-select v-model="form.orgId" disabled style="width: 100%;">
|
||||
<el-option
|
||||
<el-option
|
||||
v-for="item in orgList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
<el-col :span="12">
|
||||
<el-form-item label="请假类型:" prop="leaveType">
|
||||
<el-select v-model="form.leaveType" disabled style="width: 100%;">
|
||||
<el-option
|
||||
<el-option
|
||||
v-for="item in leaveTypeList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
|
|
@ -118,12 +118,12 @@
|
|||
<el-col :span="12">
|
||||
<el-form-item label="请假开始时间:" prop="leaveStartDate">
|
||||
<el-input v-model="form.leaveStartDate" :readonly="true"/>
|
||||
</el-form-item>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="请假结束时间:" prop="leaveEndDate">
|
||||
<el-input v-model="form.leaveEndDate" :readonly="true"/>
|
||||
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -140,10 +140,10 @@
|
|||
<el-input type="textarea" v-model="form.leaveReason" maxlength="100" :readonly="true"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
|
||||
|
||||
<el-button @click="cancel">关 闭</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
|
@ -212,8 +212,9 @@ export default {
|
|||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
leaveType:"假",
|
||||
type:"请假",
|
||||
userName: undefined,
|
||||
orgName: undefined,
|
||||
orgName: undefined,
|
||||
},
|
||||
personOptions:[],
|
||||
typeList:[{value:'1',label:'固定班制'},{value:'2',label:'自由工时'}],
|
||||
|
|
@ -286,6 +287,7 @@ export default {
|
|||
leaveEndInterval:'1',
|
||||
leaveDuration:undefined,
|
||||
leaveReason:undefined,
|
||||
type:"请假",
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
|
|
@ -300,7 +302,7 @@ export default {
|
|||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
||||
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.groupId)
|
||||
|
|
@ -318,15 +320,15 @@ export default {
|
|||
this.title = "请假单";
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
/** 提交按钮 */
|
||||
submitForm: function() {
|
||||
console.log(this.form)
|
||||
// this.$refs["form"].validate(valid => {
|
||||
// if (valid) {
|
||||
// let arr=[0,0,0,0,0,0,0]
|
||||
// this.form.attDays.forEach(item=>{arr[item]=1})
|
||||
|
||||
// this.form.attDays.forEach(item=>{arr[item]=1})
|
||||
|
||||
// let arr2 = []
|
||||
// this.form.checkList.forEach(item=>{
|
||||
// let obj={
|
||||
|
|
@ -334,7 +336,7 @@ export default {
|
|||
// userId:item.split('|')[0]
|
||||
// }
|
||||
// arr2.push(obj)
|
||||
// })
|
||||
// })
|
||||
// this.form.checkOrgList=arr2;
|
||||
// console.log(this.form)
|
||||
// if (this.form.groupId != undefined) {
|
||||
|
|
@ -356,7 +358,7 @@ export default {
|
|||
// }
|
||||
// });
|
||||
},
|
||||
|
||||
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.queryParams.exportType="查询";
|
||||
|
|
@ -394,4 +396,4 @@ export default {
|
|||
|
||||
}
|
||||
};
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue