考勤bar图显示bug以及五大申请流程开完完成
This commit is contained in:
@@ -161,7 +161,8 @@
|
||||
<el-button @click="calcWork"
|
||||
element-loading-text="正在计算,请稍等"
|
||||
v-loading.fullscreen.lock="fullscreenLoading"
|
||||
>计算</el-button>
|
||||
>计算
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
@@ -231,7 +232,7 @@
|
||||
</div>
|
||||
|
||||
<!-- 月度工作情况表格 -->
|
||||
<h2>{{ date.getMonth()+1 }} 月度工作签到情况</h2>
|
||||
<h2>{{ date.getMonth() + 1 }} 月度工作签到情况</h2>
|
||||
|
||||
|
||||
<el-descriptions class="margin-top" title="报告详情" :column="3" :size="size" border>
|
||||
@@ -389,7 +390,7 @@ export default {
|
||||
calcResultAttendances: [],
|
||||
calcResultProject: {},
|
||||
projects: [],
|
||||
fullscreenLoading:false,
|
||||
fullscreenLoading: false,
|
||||
|
||||
}
|
||||
},
|
||||
@@ -470,7 +471,7 @@ export default {
|
||||
projectId: 0,
|
||||
userId: this.selectUser.userId,
|
||||
attendanceDay: this.selectIndex,
|
||||
selectTime:this.queryParams.selectTime
|
||||
selectTime: this.queryParams.selectTime
|
||||
}
|
||||
addOaAttendance(this.form).then(res => {
|
||||
this.getList()
|
||||
@@ -481,7 +482,7 @@ export default {
|
||||
this.form = {
|
||||
projectId: 0,
|
||||
attendanceDay: this.selectIndex,
|
||||
selectTime:this.queryParams.selectTime
|
||||
selectTime: this.queryParams.selectTime
|
||||
}
|
||||
// 集体赋予状态
|
||||
addBatchOaAttendance(this.form).then(res => {
|
||||
@@ -496,7 +497,7 @@ export default {
|
||||
projectId: 1,
|
||||
userId: this.selectUser.userId,
|
||||
attendanceDay: this.selectIndex,
|
||||
selectTime:this.queryParams.selectTime
|
||||
selectTime: this.queryParams.selectTime
|
||||
}
|
||||
addOaAttendance(this.form).then(res => {
|
||||
this.getList()
|
||||
@@ -507,7 +508,7 @@ export default {
|
||||
this.form = {
|
||||
projectId: 1,
|
||||
attendanceDay: this.selectIndex,
|
||||
selectTime:this.queryParams.selectTime
|
||||
selectTime: this.queryParams.selectTime
|
||||
}
|
||||
// 集体赋予状态
|
||||
addBatchOaAttendance(this.form).then(res => {
|
||||
@@ -609,7 +610,7 @@ export default {
|
||||
attendanceDay: this.selectIndex,
|
||||
dayLength: this.timeFlag === 0 ? this.form.dayLength : undefined,
|
||||
hour: this.timeFlag === 1 ? this.form.hour : undefined,
|
||||
selectTime:this.queryParams.selectTime
|
||||
selectTime: this.queryParams.selectTime
|
||||
}
|
||||
addOaAttendance(this.form).then(res => {
|
||||
this.selectUser = this.selectArrayIndex >= this.userList.length - 1 ? this.selectUser : this.userList[this.selectArrayIndex + 1]
|
||||
@@ -624,7 +625,7 @@ export default {
|
||||
attendanceDay: this.selectIndex,
|
||||
dayLength: this.timeFlag === 0 ? this.form.dayLength : undefined,
|
||||
hour: this.timeFlag === 1 ? this.form.hour : undefined,
|
||||
selectTime:this.queryParams.selectTime
|
||||
selectTime: this.queryParams.selectTime
|
||||
}
|
||||
// 集体赋予状态
|
||||
addBatchOaAttendance(this.form).then(res => {
|
||||
|
||||
Reference in New Issue
Block a user