diff --git a/src/views/process/requestReport/index.vue b/src/views/process/requestReport/index.vue index 81d90a0..e948403 100644 --- a/src/views/process/requestReport/index.vue +++ b/src/views/process/requestReport/index.vue @@ -33,6 +33,18 @@ /> + + + + + 搜索 重置 @@ -78,7 +90,7 @@ @@ -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: {}, diff --git a/src/views/process/workReport/index.vue b/src/views/process/workReport/index.vue index 859a40a..1a24e1c 100644 --- a/src/views/process/workReport/index.vue +++ b/src/views/process/workReport/index.vue @@ -97,14 +97,16 @@ - - - - 搜索 - - - + + + + + + + + + 搜索 @@ -124,7 +126,7 @@ @@ -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;