zzyuan
/
gz-att-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
hayu 2024-11-19 18:59:30 +08:00
parent bf95e96325 b5c94fda07
commit 3b528ea24f
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/process/evection/index.vue
View File

@ -124,7 +124,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属部门:" prop="orgId"> <el-form-item label="所属部门:" prop="orgId">
<el-select v-model="form.orgId" @change="changDept"> <el-select v-model="form.orgId" @change="changDept" style="width: 100%;">
<el-option <el-option
v-for="item in orgList" v-for="item in orgList"
:key="item.id" :key="item.id"
@ -161,7 +161,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item prop="leaveStartInterval" label-width="0px"> <el-form-item prop="leaveStartInterval" label-width="0px">
<el-select v-model="form.leaveStartInterval" style="width: 80%;margin-left: 10px;" <el-select v-model="form.leaveStartInterval" style="width: 80%;margin-left: 30px;"
@change="handleDateChange"> @change="handleDateChange">
<el-option <el-option
v-for="item in timeStatusList" v-for="item in timeStatusList"
@ -183,7 +183,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item prop="leaveEndInterval" label-width="0px"> <el-form-item prop="leaveEndInterval" label-width="0px">
<el-select v-model="form.leaveEndInterval" style="width: 80%;margin-left: 10px;" <el-select v-model="form.leaveEndInterval" style="width: 80%;margin-left: 30px;"
@change="handleDateChange"> @change="handleDateChange">
<el-option <el-option
v-for="item in timeStatusList" v-for="item in timeStatusList"
@ -226,7 +226,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代理主持工作人员：" prop="hostUserId"> <el-form-item label="代理主持工作人员：" prop="hostUserId">
<el-select v-model="form.hostUserId" multiple placeholder="请选择人员姓名" filterable clearable> <el-select v-model="form.hostUserId" multiple placeholder="请选择人员姓名" filterable clearable style="width: 100%;">
<el-option <el-option
v-for="item in userList" v-for="item in userList"
:key="item.userId" :key="item.userId"
@ -352,7 +352,7 @@ export default {
{required: true, message: "是否请示领导同意不能为空", trigger: "blur"} {required: true, message: "是否请示领导同意不能为空", trigger: "blur"}
], ],
hostUserId: [ hostUserId: [
{required: true, message: "代理主持工作人员同意不能为空", trigger: "blur"} {required: true, message: "代理主持工作人员不能为空", trigger: "blur"}
] ]
}, },
// 开始日期选择限制 // 开始日期选择限制
@ -404,6 +404,7 @@ export default {
}, },
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
console.log("111")
this.loading = true; this.loading = true;
listEvection(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listEvection(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.tableList = response.rows; this.tableList = response.rows;

10
src/views/process/leaveReporting/index.vue
View File

@ -124,7 +124,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属部门:" prop="orgId"> <el-form-item label="所属部门:" prop="orgId">
<el-select v-model="form.orgId" @change="changDept"> <el-select v-model="form.orgId" @change="changDept" style="width: 100%;">
<el-option <el-option
v-for="item in orgList" v-for="item in orgList"
:key="item.id" :key="item.id"
@ -137,7 +137,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="休假类型:" prop="type"> <el-form-item label="休假类型:" prop="type">
<el-select v-model="form.type" @change="changType" filterable > <el-select v-model="form.type" @change="changType" filterable style="width: 100%;">
<el-option <el-option
v-for="item in typeList" v-for="item in typeList"
:key="item.id" :key="item.id"
@ -161,7 +161,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item prop="leaveStartInterval" label-width="0px"> <el-form-item prop="leaveStartInterval" label-width="0px">
<el-select v-model="form.leaveStartInterval" style="width: 80%;margin-left: 10px;" <el-select v-model="form.leaveStartInterval" style="width: 80%;margin-left: 30px;"
@change="handleDateChange"> @change="handleDateChange">
<el-option <el-option
v-for="item in timeStatusList" v-for="item in timeStatusList"
@ -183,7 +183,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item prop="leaveEndInterval" label-width="0px"> <el-form-item prop="leaveEndInterval" label-width="0px">
<el-select v-model="form.leaveEndInterval" style="width: 80%;margin-left: 10px;" <el-select v-model="form.leaveEndInterval" style="width: 80%;margin-left: 30px;"
@change="handleDateChange"> @change="handleDateChange">
<el-option <el-option
v-for="item in timeStatusList" v-for="item in timeStatusList"
@ -226,7 +226,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代理主持工作人员：" prop="hostUserId"> <el-form-item label="代理主持工作人员：" prop="hostUserId">
<el-select v-model="form.hostUserId" multiple placeholder="请选择人员姓名" filterable clearable> <el-select v-model="form.hostUserId" multiple placeholder="请选择人员姓名" filterable clearable style="width: 100%;">
<el-option <el-option
v-for="item in userList" v-for="item in userList"
:key="item.userId" :key="item.userId"