From 8a265d3114d85031d9fc151b25051b2f54d2be82 Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 26 Aug 2020 14:22:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/common/dingtalklogin.vue | 2 +- src/views/modules/result/record/lzresultrecordapp.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue index 87975cf..7f354f5 100644 --- a/src/views/modules/result/record/lzresultrecordapp.vue +++ b/src/views/modules/result/record/lzresultrecordapp.vue @@ -89,7 +89,7 @@ From 02a59e9885f9703a73852f855c29df86b7ff417a Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 26 Aug 2020 16:03:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=89=8D=E5=B1=95=E7=A4=BA=E6=89=B9=E9=87=8F=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/result/record/lzresultrecordapp.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/modules/result/record/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue index 3dc7a4d..ad851fa 100644 --- a/src/views/modules/result/record/lzresultrecordapp.vue +++ b/src/views/modules/result/record/lzresultrecordapp.vue @@ -77,7 +77,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) }, From be11d455870b8341f4e463a9226c971ca319b3e7 Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 26 Aug 2020 16:31:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BE=85=E6=8F=90=E4=BA=A4=EF=BC=8C?= =?UTF-8?q?=E5=92=8C=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=8D=95=E7=AA=97?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E5=90=8E=E7=BB=99=E5=87=BA?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/result/record/approval-add-or-update.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) } From fbb07cdb8154dc2720b462bba03e2466901bd186 Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 26 Aug 2020 16:55:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=95=8C=E9=9D=A2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/result/record/recorddetail.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue index 5492176..e8a147c 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,