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

功能优化

This commit is contained in:
hayu 2024-12-04 18:48:30 +08:00
parent 1a8882edce
commit c3cf1a15f1
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/process/requestReport/index.vue
View File

@ -33,6 +33,18 @@
/>
</el-select>
</el-form-item>
<el-form-item label="审批状态" prop="examineStatus">
<el-select
v-model="queryParams.examineStatus"
placeholder="审批状态" style="width: 95%">
<el-option
v-for="item in examineStatusList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</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>
@ -78,7 +90,7 @@
<el-table-column label="审批状态" align="center" prop="examineStatus" width="100">
<template slot-scope="scope">
<span v-if="scope.row.examineStatus === '0'">待审核</span>
<span v-else-if="scope.row.examineStatus === '1'">已审核</span>
<span v-else-if="scope.row.examineStatus === '1'">已通过</span>
<span v-else ></span>
<!-- 可以添加更多的条件来处理其他可能的状态 -->
</template>
@ -476,13 +488,14 @@ export default {
pageSize: 10,
leaveType:"外出办事",
leaveDate: undefined,
examineStatus: undefined
examineStatus: ''
},
personOptions:[],
typeList: [{id: '病假', name: '病假'}, {id: '年休假', name: '年休假'}, {id: '探亲假', name: '探亲假'},
{id: '事假', name: '事假'}, {id: '产假', name: '产假'}, {id: '婚假', name: '婚假'}, {id: '丧假', name: '丧假'}],
leaveTypeList: [{id: '', name: '请选择'}, {id: '轮休', name: '轮休'}, {id: '临时外出', name: '临时外出'},
{id: '出差', name: '出差'}, {id: '休假', name: '休假'}],
examineStatusList: [{id: '', name: '全部'}, {id: '0', name: '待审批'}, {id: '1', name: '已通过'}],
attDayList:[{id:0,label:'周一'},{id:1,label:'周二'},{id:2,label:'周三'},{id:3,label:'周四'},{id:4,label:'周五'},{id:5,label:'周六'},{id:6,label:'周日'}],
// 表单参数
form: {},

26
src/views/process/workReport/index.vue
View File

@ -97,14 +97,16 @@
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="65%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-row>
<el-form-item label="姓名：">
<el-input v-model="form.userName" style="width: 200px;" maxlength="50"></el-input>
<el-button type="primary" style="margin-left: 10px" icon="el-icon-search" size="mini" @click="handleQuerys">搜索</el-button>
</el-form-item>
<el-form-item>
<el-row type="flex" align="middle">
<el-form-item label="姓名：" :label-width="'80px'">
<el-input v-model="form.userName" style="width: 200px;" maxlength="50"></el-input>
</el-form-item>
<el-form-item label="审批状态" prop="examineStatus" v-if="this.title === '轮休人员' || this.title === '临时外出人员'" :label-width="'80px'">
<el-select v-model="form.examineStatus" placeholder="审批状态" style="width: 200px;">
<el-option v-for="item in examineStatusList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-button type="primary" style="margin-left: 10px; margin-top: -20px;" icon="el-icon-search" size="mini" @click="handleQuerys">搜索</el-button>
</el-row>
</el-form>
<el-table v-loading="loading" :data="tableDialogList" @selection-change="handleSelectionChange" @row-click="handleRowClick">
@ -124,7 +126,7 @@
<el-table-column label="审批状态" align="center" prop="examineStatus" width="100" v-if="tableDialogList.some(row => row.type === '轮休' || row.type === '外出办事')">
<template slot-scope="scope">
<span v-if="scope.row.examineStatus === '0'">待审核</span>
<span v-else-if="scope.row.examineStatus === '1'">已审核</span>
<span v-else-if="scope.row.examineStatus === '1'">已通过</span>
<!-- 可以添加更多的条件来处理其他可能的状态 -->
</template>
</el-table-column>
@ -383,10 +385,12 @@ export default {
},
personOptions:[],
typeList:[{value:'1',label:'固定班制'},{value:'2',label:'自由工时'}],
examineStatusList: [{id: '', name: '全部'}, {id: '0', name: '待审批'}, {id: '1', name: '已通过'}],
attDayList:[{id:0,label:'周一'},{id:1,label:'周二'},{id:2,label:'周三'},{id:3,label:'周四'},{id:4,label:'周五'},{id:5,label:'周六'},{id:6,label:'周日'}],
// 表单参数
form: {
userName: ''
userName: '',
examineStatus:''
},
// 表单校验
rules: {
@ -573,6 +577,7 @@ export default {
handleClick(type,row) {
this.tableDialogList=[];
this.form.userName = '';
this.form.examineStatus='';
// 处理点击事件
this.open = true;
if (type==='轮休'){
@ -600,7 +605,8 @@ export default {
handleQuerys() {
const queryData = {
...this.searchConditions, // 拷贝存储的条件
userName: this.form.userName // 添加用户输入的搜索条件
userName: this.form.userName, // 添加用户输入的搜索条件
examineStatus:this.form.examineStatus
};
getDetailsList(queryData).then(response => {
this.tableDialogList = response.rows;