diff --git a/src/api/filesTransfer/audit.js b/src/api/filesTransfer/audit.js new file mode 100644 index 0000000..48e3a59 --- /dev/null +++ b/src/api/filesTransfer/audit.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 档案移交审核列表 +export function getTransferAuditListApi(params) { + return request({ + url: '/smartArchives/transferApply/getTransferAuditList', + method: 'GET', + params: params, + }) +} \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index f4c3ca9..2ba8b5f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -179,16 +179,31 @@ export const dynamicRoutes = [ }, /* 档案移交申请详情 */ { - path: '/archivesManagement/filesTransfer/apply/detail-data', + path: '/archivesManagement/filesTransfer/apply/apply-detail-data', component: Layout, hidden: true, permissions: ['transfer:apply:query'], children: [ { path: 'index', - component: () => import('@/views/filesTransfer/apply/detail-data'), + component: () => import('@/views/filesTransfer/detail-data'), name: 'DetailData', - meta: { title: '档案移交申请详情', activeMenu: '/archivesManagement/filesTransfer/apply', noCache: true } + meta: { title: '申请详情', activeMenu: '/archivesManagement/filesTransfer/apply', noCache: true } + } + ] + }, + /* 档案移交审核详情 */ + { + path: '/archivesManagement/filesTransfer/audit/audit-detail-data', + component: Layout, + hidden: true, + permissions: ['transfer:apply:query'], + children: [ + { + path: 'index2', + component: () => import('@/views/filesTransfer/detail-data'), + name: 'DetailData2', + meta: { title: '审核详情', activeMenu: '/archivesManagement/filesTransfer/audit', noCache: true } } ] } diff --git a/src/views/filesTransfer/apply/detail-data.vue b/src/views/filesTransfer/apply/detail-data.vue index 406a3b4..2f703eb 100644 --- a/src/views/filesTransfer/apply/detail-data.vue +++ b/src/views/filesTransfer/apply/detail-data.vue @@ -75,8 +75,30 @@
- 同意 - 驳回 + 同意 + 驳回 +
+ + +
+
+
+ 审批意见 +
+
+
+
+ 审核人: + {{ auditUserName || '--' }} +
+
+ 审核日期: + {{ auditDate || '--' }} +
+
+ 审核意见: + {{ auditOpinion || '--' }} +
@@ -99,7 +121,11 @@ export default { projectName: '', receivingOrg: '', approvalComment: '', // 审批意见 - fileList: [] + fileList: [], + // 审批信息展示 + auditUserName: '', + auditDate: '', + auditOpinion: '' } }, computed: { @@ -121,6 +147,9 @@ export default { }, showApprovalActions() { return this.status === 'approving' + }, + showApprovalActions2() { + return this.status === 'approved' || this.status === 'rejected' } }, mounted() { @@ -147,6 +176,10 @@ export default { const res2 = await getTransferApplyApi({ id: this.id }); this.projectName = res2?.data?.proName || '/'; this.receivingOrg = res2?.data?.deptName || '/'; + // 审批信息 + this.auditUserName = res2?.data?.auditUserName || '--'; + this.auditDate = res2?.data?.transfertTime || '--'; + this.auditOpinion = res2?.data?.auditOpinion || '--'; if (Array.isArray(res.data) && res.data.length > 0) { res.data.map(item => { const newFile = { @@ -327,6 +360,22 @@ export default { } .approval-form { + .audit-info { + padding: 4px 0 0 6px; + } + .audit-row { + margin-bottom: 10px; + font-size: 14px; + color: #333; + } + .audit-label { + display: inline-block; + min-width: 80px; + color: #666; + } + .audit-value { + color: #333; + } .form-item { margin-bottom: 20px; diff --git a/src/views/filesTransfer/audit/config.js b/src/views/filesTransfer/audit/config.js new file mode 100644 index 0000000..ed597c9 --- /dev/null +++ b/src/views/filesTransfer/audit/config.js @@ -0,0 +1,33 @@ +export const formLabel = [ + { + isShow: false, // 是否展示label + f_type: 'ipt', + f_label: '单项工程名称', + f_model: 'proName', + f_max: 32, + }, + { + isShow: false, // 是否展示label + f_type: 'sel', + f_label: '项目类型', + f_model: 'proType', + f_selList: [], + f_dict: 'pro_type', + }, + { + isShow: false, // 是否展示label + f_type: 'sel', + f_label: '电压等级', + f_model: 'voltageLevel', + f_selList: [], + f_dict: 'voltage_level', + }, +] + +export const columnsList = [ + { t_props: 'proName', t_label: '项目名称' }, + { t_props: 'singleProName', t_label: '单项工程名称' }, + { t_props: 'createUserName', t_label: '申请人' }, + { t_props: 'createTime', t_label: '申请时间' }, + { t_slot: 'auditStatus', t_label: '审批状态' }, +] \ No newline at end of file diff --git a/src/views/filesTransfer/audit/index.vue b/src/views/filesTransfer/audit/index.vue new file mode 100644 index 0000000..7b213b7 --- /dev/null +++ b/src/views/filesTransfer/audit/index.vue @@ -0,0 +1,119 @@ + + + diff --git a/src/views/filesTransfer/detail-data.vue b/src/views/filesTransfer/detail-data.vue new file mode 100644 index 0000000..5dc31cd --- /dev/null +++ b/src/views/filesTransfer/detail-data.vue @@ -0,0 +1,460 @@ + + + + + \ No newline at end of file