From 60a715ab3bc2bbf759eeab94304cbcaae4f9d5d3 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 25 Aug 2020 16:33:11 +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 --- src/api/api_result.js | 14 ++ .../modules/result/record/lzresultrecord.vue | 1 - .../result/record/lzresultrecordapp.vue | 1 - .../record/recorddetail-add-or-update.vue | 2 +- .../modules/result/record/recorddetail.vue | 33 ++- .../result/record/upload-add-or-update.vue | 220 ++++++++++++++++++ 6 files changed, 261 insertions(+), 10 deletions(-) create mode 100644 src/views/modules/result/record/upload-add-or-update.vue diff --git a/src/api/api_result.js b/src/api/api_result.js index b98daf2..d6689fb 100644 --- a/src/api/api_result.js +++ b/src/api/api_result.js @@ -40,3 +40,17 @@ export const getResultComment = params => { export const recordIdsSubmit = params => { return http({url: '/lz_management/user/lzresultrecord/recordIdsSubmit', method: 'post', params}) } + +// 获取侧边菜单栏 +export const getUploadFileList = params => { + return http({url: '/lz_management/user/lzresultrecord/getUploadFileList', method: 'get', params}) +} + +// 获取侧边菜单栏 +export const deleteFile = params => { + return http({url: '/lz_management/user/lzresultrecord/deleteFile', method: 'get', params}) +} + +export const downZip = params => { + return http({url: '/lz_management/file/downZip?ids=' + params, method: 'get'}) +} diff --git a/src/views/modules/result/record/lzresultrecord.vue b/src/views/modules/result/record/lzresultrecord.vue index 335a174..b222ea5 100644 --- a/src/views/modules/result/record/lzresultrecord.vue +++ b/src/views/modules/result/record/lzresultrecord.vue @@ -121,7 +121,6 @@ export default { formaterDate (val) { var date = new Date(val) var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 - var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() return date.getFullYear() + '-' + month }, getStatusStr (status) { diff --git a/src/views/modules/result/record/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue index f2db1c5..a33bd75 100644 --- a/src/views/modules/result/record/lzresultrecordapp.vue +++ b/src/views/modules/result/record/lzresultrecordapp.vue @@ -92,7 +92,6 @@ v-loading="dataListLoading" border fit highlight-current-row @selection-change="selectionChangeHandle" :cell-style="cellStyle" - style="width: 100%;" > diff --git a/src/views/modules/result/record/recorddetail-add-or-update.vue b/src/views/modules/result/record/recorddetail-add-or-update.vue index d309ce0..c57b51f 100644 --- a/src/views/modules/result/record/recorddetail-add-or-update.vue +++ b/src/views/modules/result/record/recorddetail-add-or-update.vue @@ -19,7 +19,7 @@
- + diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue index 700ad77..e4acceb 100644 --- a/src/views/modules/result/record/recorddetail.vue +++ b/src/views/modules/result/record/recorddetail.vue @@ -21,7 +21,8 @@ 二级部门:{{ department2 }} 三级部门:{{ department3 }} 直属上级:{{ superStaff }} - + +
@@ -36,9 +37,6 @@

- - -

确认得分

@@ -46,6 +44,15 @@

+ +
+

+
+ +
+

+
+
@@ -107,6 +114,7 @@ + @@ -115,6 +123,7 @@ import {getStaffResultDetail, commitApproval} from '@/api/api_result' import AddOrUpdate from './recorddetail-add-or-update' import ApprovalAddOrUpdate from './approval-add-or-update.vue' +import UploadAddOrUpdate from './upload-add-or-update.vue' export default { created () { @@ -157,14 +166,16 @@ export default { superStaff: '吴林', addOrUpdateVisible: false, approvalVisible: false, + uploadVisible: false, loading: false, auth: [], - recordType: 0 + recordType: 0, } }, components: { AddOrUpdate, - ApprovalAddOrUpdate + ApprovalAddOrUpdate, + UploadAddOrUpdate }, activated () { if (this.$route.query.id > 0) { @@ -224,6 +235,14 @@ export default { }, 500) }) }, + uploadDownFile (val) { + this.uploadVisible = true + this.$nextTick(() => { + setTimeout(() => { + this.$refs.uploadAddOrUpdate.init(this.recordResultId, this.auth, val) + }, 500) + }) + }, commitApprovalYes (msg = '确定要提交审批吗?') { this.$confirm(msg, '提示', { confirmButtonText: '确定', @@ -412,7 +431,7 @@ export default { .bottom{ float: right; color: blue; - width: 80px; + width: 120px; height: 30px; text-align: left; .des{ diff --git a/src/views/modules/result/record/upload-add-or-update.vue b/src/views/modules/result/record/upload-add-or-update.vue new file mode 100644 index 0000000..37ab82c --- /dev/null +++ b/src/views/modules/result/record/upload-add-or-update.vue @@ -0,0 +1,220 @@ + + + + +