diff --git a/src/views/hrm/clock_record.vue b/src/views/hrm/clock_record.vue index 07eecc09..6f88beef 100644 --- a/src/views/hrm/clock_record.vue +++ b/src/views/hrm/clock_record.vue @@ -172,6 +172,12 @@ export default { exportList(){ let that = this; this.dLoading = true; + if(this.query.employee__belong_dept && this.query.year && this.query.month){ + }else{ + this.$message.warning("请选择部门和月份后导出") + this.dLoading = false; + } + let days = new Date(this.query.year, this.query.month , 0).getDate(); let weekList = ['姓名','星期'],daysList=['姓名','日期'],titleData = []; for(var i = 1;i<= days;i++){ diff --git a/src/views/opm/opl.vue b/src/views/opm/opl.vue index d0667fbd..2ae2f3ba 100644 --- a/src/views/opm/opl.vue +++ b/src/views/opm/opl.vue @@ -22,19 +22,22 @@ {{ - operationObj.dept_ter_.name + operationObj.dept_ter_.name }} {{ - operationObj.dept_bus_.name + operationObj.dept_bus_.name }} {{ - operationObj.coordinator_.name + operationObj.coordinator_.name }} + + {{ item.name }}({{item.code}})/ + @@ -55,12 +58,13 @@ -