From f72f64b36b9243d79eae7d18bcd9cf2701800c8f Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 15 Jul 2024 11:21:42 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=96=B0=E6=B3=95=E8=A7=84=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5=E6=B5=81=E7=A8=8B=E3=80=81=E6=B3=95=E8=A7=84=E7=AC=A6?=
=?UTF-8?q?=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B=E3=80=81?=
=?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/workCenter.js | 5 ++++
.../MarketListReleaseProcess.vue | 1 +
.../NewRegulationIntroductionProcess.vue | 30 +++++++++++++++++--
.../modules/BaseInfoForm.vue | 10 +++++--
.../RegulatoryComplianceCheckProcess.vue | 2 +-
5 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/api/workCenter.js b/src/api/workCenter.js
index 0318a91..fe2d709 100644
--- a/src/api/workCenter.js
+++ b/src/api/workCenter.js
@@ -95,6 +95,9 @@ const getDataDraft = (params) => getAction('/workCenter/draftHandle', params)
// 流程中心-查看-获取数据
const getLookData = (params) => getAction('/workCenter/snapshotHandle', params)
+// 流程中心-加签
+const processAddSign = (params) => postAction('/workCenter/delegateTask', params)
+
// 在线编辑-生成空白模板
const generateEmptyFileTemplate = (params) => getAction('/onlyOffice/saveEditFile', params)
// 在线编辑-通过在线编辑的文件id获取文件信息
@@ -155,6 +158,8 @@ export {
getLookData,
+ processAddSign,
+
generateEmptyFileTemplate,
queryFileInfoByEditId,
getOnlineFileIdByFileId,
diff --git a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
index 08f6871..f88a2c2 100644
--- a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
+++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
@@ -268,6 +268,7 @@ export default {
currentNodeName: '',
currentNodeId: MarketListReleaseNodes.initiated.value, // 当前节点id
model: {},
+ draftModel: null, // 草稿Json转化的对象
processInfoForm: this.$form.createForm(this),
labelCol: {
xs: { span: 24 },
diff --git a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue
index 6b2578c..d697518 100644
--- a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue
+++ b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue
@@ -107,6 +107,8 @@
{{ $t('submit') }}
+
+ {{ $t('countersign') }}
{{ $t('turnTo') }}
@@ -120,6 +122,8 @@
+
+
@@ -140,7 +144,7 @@ import {
newRegulationImportSave,
getDataDraft,
processTransfer,
- getLookData
+ getLookData, processAddSign
} from '../../../api/workCenter'
export default {
@@ -230,7 +234,7 @@ export default {
currentNodeName: '',
currentNodeId: NewRegulationsImportNodes.initiated.value, // 当前节点id
model: {},
- draftModel: {}, // 草稿Json转化的对象
+ draftModel: null, // 草稿Json转化的对象
processInfoForm: this.$form.createForm(this),
labelCol: {
xs: { span: 24 },
@@ -451,6 +455,28 @@ export default {
})
})
},
+ // 加签
+ handleAddSign () {
+ if (this.loading) return
+ // 点击显示选人组件
+ this.$refs.addSignUserSelect.open()
+ },
+ // 加签选完人的回调
+ addSignUserSelectChange (userIds) {
+ this.loading = true
+ const param = {}
+ param.userId = userIds
+ param.taskId = this.$route.query.taskId
+ processAddSign(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ } else {
+ this.$message.warning(res.message)
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ },
// 转办
handleTurnTo () {
if (this.loading) return
diff --git a/src/views/workCenter/newRegulationIntroductionProcess/modules/BaseInfoForm.vue b/src/views/workCenter/newRegulationIntroductionProcess/modules/BaseInfoForm.vue
index 34f13ee..5def73c 100644
--- a/src/views/workCenter/newRegulationIntroductionProcess/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/newRegulationIntroductionProcess/modules/BaseInfoForm.vue
@@ -246,9 +246,13 @@ export default {
// 拿到外面传进来的businessInfoDTO
initData (data) {
// 给表单赋值
- data.applicableMarket = data.applicableMarket.split(',').map(item => {
- return { value: item }
- })
+ if (data.applicableMarket) {
+ data.applicableMarket = data.applicableMarket.split(',').map(item => {
+ return { value: item }
+ })
+ } else {
+ data.applicableMarket = []
+ }
this.formInline = Object.assign({}, data)
this.isGetDataAfter = true
},
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue
index 7e0c1b5..b242e7a 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue
@@ -300,7 +300,7 @@ export default {
currentNodeName: '',
currentNodeId: RegulatoryComplianceCheckNodes.initiated.value, // 当前节点id
model: {},
- draftModel: {}, // 草稿Json转化的对象
+ draftModel: null, // 草稿Json转化的对象
processInfoForm: this.$form.createForm(this),
labelCol: {
xs: { span: 24 },