diff --git a/src/views/common/dingtalklogin.vue b/src/views/common/dingtalklogin.vue index 6d70c0d..f80a655 100644 --- a/src/views/common/dingtalklogin.vue +++ b/src/views/common/dingtalklogin.vue @@ -48,7 +48,7 @@ export default { this.dingtalkLogin() this.checkDingTalkLogin() } else { - this.dataForm.verify = '请在钉钉打开' + this.dataForm.verify = '验证中' console.log(this.$route.query) this.req.code = this.$route.query.code apiDingtalkJump(this.req).then(res => { diff --git a/src/views/modules/result/record/approval-add-or-update.vue b/src/views/modules/result/record/approval-add-or-update.vue index fb0e14d..31222c4 100644 --- a/src/views/modules/result/record/approval-add-or-update.vue +++ b/src/views/modules/result/record/approval-add-or-update.vue @@ -21,7 +21,7 @@ 通过 - 侍提交 + 待提交 驳回 @@ -103,6 +103,7 @@ export default { }).then(data => { if (data && data.code === 0) { this.$emit('refreshDataList', this.recordResultId) + this.alertInfo('更新成功') } else { this.alertInfo(data.msg) } diff --git a/src/views/modules/result/record/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue index 1d9127e..fd34839 100644 --- a/src/views/modules/result/record/lzresultrecordapp.vue +++ b/src/views/modules/result/record/lzresultrecordapp.vue @@ -77,7 +77,7 @@
- 批量提交 + 批量提交
@@ -89,7 +89,7 @@ @@ -231,7 +231,8 @@ export default { addOrUpdateVisible: false, recordIdsSelect: [], tabValue: '1,2,5', - isChangeDepartmentrtment: 0 + isChangeDepartmentrtment: 0, + isHiden: false } }, computed: {}, @@ -307,6 +308,11 @@ export default { }) }, tabChange (row) { + if(row.name === '3') { + this.isHiden = true + } else { + this.isHiden = false + } this.dataForm.status = row.name this.getDataList(row.name) }, diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue index 3e56a53..264505a 100644 --- a/src/views/modules/result/record/recorddetail.vue +++ b/src/views/modules/result/record/recorddetail.vue @@ -162,12 +162,12 @@ export default { wenHuaJiaZhiGuanNum: 2, lastResultNum: 2, commentNum: 1, - checkMonth: '2020-03-21', - staffName: '瞿贻晓', - department1: '业务中台', - department2: '金融业务组', - department3: '技术部门', - superStaff: '吴林', + checkMonth: '', + staffName: '', + department1: '', + department2: '', + department3: '', + superStaff: '', addOrUpdateVisible: false, approvalVisible: false, uploadVisible: false,