From fad5dfed295ff5899f4aecdb8df3a3b0c6c951e4 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Mon, 21 Sep 2020 20:59:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/record/approval-add-or-update.vue | 4 +- .../modules/result/record/lzresultrecord.vue | 2 +- .../result/record/lzresultrecordapp.vue | 44 ++++++++++++------- .../modules/result/record/recorddetail.vue | 27 ++++++++---- 4 files changed, 48 insertions(+), 29 deletions(-) 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 21414a2..56ca723 100644 --- a/src/views/modules/result/record/approval-add-or-update.vue +++ b/src/views/modules/result/record/approval-add-or-update.vue @@ -24,7 +24,7 @@ 通过 - 待提交 + 通过 驳回 @@ -62,7 +62,6 @@ export default { this.auth = auth this.visible = true this.status = status - this.$nextTick(async () => { this.$refs['dataForm'].resetFields() if (this.resultCommentEditor === null) { @@ -73,6 +72,7 @@ export default { this.resultCommentEditor.customConfig.debug = true this.resultCommentEditor.create() } + this.resultCommentEditor.txt.html('

') const data = await getResultComment(this.recordResultId) if (data && data.code === 0) { this.resultCommitId = data.resultComment.id diff --git a/src/views/modules/result/record/lzresultrecord.vue b/src/views/modules/result/record/lzresultrecord.vue index 36020e4..c5cae7d 100644 --- a/src/views/modules/result/record/lzresultrecord.vue +++ b/src/views/modules/result/record/lzresultrecord.vue @@ -182,7 +182,7 @@ export default { {value: '0', label: '新建'}, {value: '1', label: '审批中'}, {value: '2', label: '拒绝'}, - {value: '3', label: '侍提交'}, + {value: '3', label: '审批中'}, {value: '4', label: '审批通过'} ], departmentList1: [], diff --git a/src/views/modules/result/record/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue index 7a2a4e7..96eba4e 100644 --- a/src/views/modules/result/record/lzresultrecordapp.vue +++ b/src/views/modules/result/record/lzresultrecordapp.vue @@ -35,7 +35,6 @@ - @@ -71,19 +70,29 @@ - 查询 + 查询 + + + + + + + + + + + 提交 - -
- 批量提交 -
- - - + + - - - - - - @@ -173,7 +176,7 @@ export default { } else if (status === 2) { return '己审批' } else if (status === 3) { - return '侍提交' + return '审批中' } else if (status === 4) { return '审批通过' } else if (status === 5) { @@ -192,6 +195,13 @@ export default { }, data () { return { + batchOpts: [{ + id: 1, + opt: '批量提交' + }, { + id: 2, + opt: '批量终止' + }], Datalist: [{ Month: 1, title: '近一个月' @@ -223,7 +233,7 @@ export default { {value: '0', label: '新建'}, {value: '1', label: '审批中'}, {value: '2', label: '拒绝'}, - {value: '3', label: '侍提交'}, + {value: '3', label: '审批中'}, {value: '4', label: '审批通过'} ], departmentList1: [], diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue index d8efd47..5e4e9b2 100644 --- a/src/views/modules/result/record/recorddetail.vue +++ b/src/views/modules/result/record/recorddetail.vue @@ -31,7 +31,7 @@
- 提交审批 + 提交审批
@@ -39,14 +39,25 @@
- 确认得分 + 确认得分
-
+
+ +
+ +
+ +
+ +
+ +
+
@@ -59,9 +70,6 @@

-
-

-
@@ -140,7 +148,7 @@ import UploadAddOrUpdate from './upload-add-or-update.vue' export default { created () { console.log(window.innerHeight) - this.clientHeight = window.innerHeight - 343 + this.clientHeight = window.innerHeight - 50 console.log(this.clientHeight) this.stepList.forEach(item => item.name = item.name.slice(-2)) }, @@ -214,6 +222,7 @@ export default { 'recordType': this.recordType }).then(data => { if (data && data.code === 0) { + this.clientHeight = window.innerHeight - 50 this.tableData = data.list this.yeJiCheckNum = data.yeJiCheckNum this.wenHuaJiaZhiGuanNum = data.wenHuaJiaZhiGuanNum @@ -271,7 +280,7 @@ export default { }, 500) }) }, - commitApprovalYes (msg = '确定要提交审批吗?') { + commitApprovalYes (msg = '确定要提交审批吗?', status) { this.$confirm(msg, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -279,7 +288,7 @@ export default { }).then(() => { commitApproval({ 'recordResultId': this.recordResultId, - 'status': 2 + 'status': status }).then(data => { if (data) { if (data.code === 0) {