From 8cc33716985da1541c0b83555ec41c19a88c15ac Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 11 Jul 2024 15:16:05 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E7=82=B9=E5=87=BB=E5=AE=A1=E6=89=B9?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/PersonnelInfo.vue | 2 +-
src/components/ProcessDetailList.vue | 52 +++++++++++++++----
.../NewRegulationIntroductionProcess.vue | 44 ++++++++++++++--
3 files changed, 82 insertions(+), 16 deletions(-)
diff --git a/src/components/PersonnelInfo.vue b/src/components/PersonnelInfo.vue
index 3130d8f..ab6cc3e 100644
--- a/src/components/PersonnelInfo.vue
+++ b/src/components/PersonnelInfo.vue
@@ -270,7 +270,7 @@ export default {
font-size: 10px;
width: 20px;
height: 20px;
- background: #FAE6E5;
+ background: rgba(0, 100, 250, 0.08);
border-radius: 10px 10px 10px 10px;
opacity: 1;
line-height: 20px;
diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue
index 0c92783..f97fe61 100644
--- a/src/components/ProcessDetailList.vue
+++ b/src/components/ProcessDetailList.vue
@@ -46,15 +46,14 @@
:scroll="{x: '100%', y: yScrollHeight}"
@change="handleTableChange">
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
@@ -173,7 +172,8 @@ export default {
{
dataIndex: 'taskName',
title: this.$t('workCenter.processDetail.taskNode'),
- width: 150
+ width: 150,
+ scopedSlots: { customRender: 'taskNode' }
},
// 任务受理人
{
@@ -372,6 +372,38 @@ export default {
}
// 其余可预览文件仍使用KKFile进行预览
kkFilePreview(fileFullUrl)
+ },
+ // 跳转流程基本信息页面
+ handleLookDetail (record) {
+ let path = ''
+ // 跳转到对应流程页面
+ switch (record.prcType + '') {
+ // 新法规导入流程
+ case '1':
+ path = '/workCenter/NewRegulationIntroductionProcess'
+ break
+ // 标准解读流程
+ case '2':
+ path = '/workCenter/StandardInterpretationProcess'
+ break
+ // 法规符合性排查流程
+ case '3':
+ path = '/workCenter/RegulatoryComplianceCheckProcess'
+ break
+ // 市场清单发布流程
+ case '4':
+ path = '/workCenter/MarketListReleaseProcess'
+ break
+ }
+ const query = {}
+ query.taskName = record.taskName
+ query.snapshotId = record.snapshotId // 快照id
+ query.nodeId = record.nodeId // 节点的id
+ this.$router.push({
+ path: path,
+ query: query,
+ isLook: 1
+ })
}
}
}
diff --git a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue
index 3114192..89674c6 100644
--- a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue
+++ b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue
@@ -39,7 +39,7 @@
:colon="formItemColon">
@@ -54,7 +54,7 @@
@@ -79,11 +79,15 @@
-
+
@@ -135,7 +139,8 @@ import {
newRegulationImportReject,
newRegulationImportSave,
getDataDraft,
- processTransfer
+ processTransfer,
+ getLookData
} from '../../../api/workCenter'
export default {
@@ -199,6 +204,14 @@ export default {
// 有草稿id，说明是从流程中心-草稿来的，需要初始化数据
this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId })
}
+ if (this.$route.query.isLook + '' === '1') {
+ // 是查看
+ this.isLook = true
+ // 人员信息全部不可选
+ this.initPersonInfoData(false)
+ // 查询数据
+ this.getProcessData('look', { snapshotId: this.$route.query.snapshotId })
+ }
if (this.$route.query.taskName) {
// 说明是已发起流程
this.currentNodeName = this.$route.query.taskName
@@ -268,7 +281,8 @@ export default {
},
formInline: {},
approvalInfoForm: this.$form.createForm(this), // 审批信息表单
- personnelInfoData: []
+ personnelInfoData: [],
+ isLook: false
}
},
methods: {
@@ -280,6 +294,9 @@ export default {
if (type === 'todo') {
func = newRegulationImportGetDataById
params = param.taskId
+ } else if (type === 'look') {
+ func = getLookData
+ params = param
} else {
func = getDataDraft
params = param
@@ -470,9 +487,26 @@ export default {
this.approvalInfoForm.validateFields((err, values) => {
if (!err) {
this.loading = true
+ // 保存快照需要的JSON start
+ const jasonObj = {}
+ // 流程信息表单
+ const processInfoForm = this.processInfoForm.getFieldsValue()
+ // 流程审批信息
+ const approvalInfoForm = this.approvalInfoForm.getFieldsValue()
+ // 业务基本信息
+ const baseInfo = this.$refs.baseInfoRef.getData()
+ // 流程信息
+ jasonObj.basicProcessInfoDTO = Object.assign({}, processInfoForm)
+ // 流程审批信息
+ jasonObj.basicTaskInfoDTO = Object.assign({}, approvalInfoForm)
+ // 业务信息
+ jasonObj.businessInfoDTO = baseInfo
+ // 保存快照需要的JSON end
const param = {}
param.basicTaskInfoDTO = Object.assign({}, values)
param.basicTaskInfoDTO.taskId = this.$route.query.taskId
+ // 草稿JSON
+ param.infoJsonStr = JSON.stringify(jasonObj)
newRegulationImportAgree(param).then(res => {
if (res.success) {
this.$message.success(res.message)