[update] 流程发起传saveSource,解决强制撤回没有草稿的问题,法规符合性流程字段修改
This commit is contained in:
@@ -93,6 +93,9 @@ const compulsoryWithdrawal = (params) => postAction('/workCenter/forcedWithdrawa
|
||||
// 流程中心统一转办
|
||||
const processTransfer = (params) => postAction('/workCenter/transfer', params)
|
||||
|
||||
// 流程中心-统一保存
|
||||
const processSave = (params) => getAction('/workCenter/save', params)
|
||||
|
||||
// 流程中心-草稿-办理
|
||||
const getDataDraft = (params) => getAction('/workCenter/draftHandle', params)
|
||||
|
||||
@@ -160,6 +163,8 @@ export {
|
||||
|
||||
processTransfer,
|
||||
|
||||
processSave,
|
||||
|
||||
getDataDraft,
|
||||
|
||||
getLookData,
|
||||
|
||||
@@ -514,6 +514,7 @@ export default {
|
||||
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
||||
} else {
|
||||
func = marketListReleaseApproval
|
||||
paramObj.saveSource = 3
|
||||
}
|
||||
func(paramObj).then(res => {
|
||||
if (res.success) {
|
||||
|
||||
+1
@@ -441,6 +441,7 @@ export default {
|
||||
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
||||
} else {
|
||||
func = newRegulationImportApproval
|
||||
paramObj.saveSource = 3
|
||||
}
|
||||
func(paramObj).then(res => {
|
||||
if (res.success) {
|
||||
|
||||
+7
-5
@@ -493,15 +493,16 @@ export default {
|
||||
// 流程审批信息
|
||||
paramObj.basicTaskInfoDTO = Object.assign({}, approvalInfoForm)
|
||||
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
||||
// 业务信息
|
||||
paramObj.businessInfoDTO = baseInfo
|
||||
// 人员信息
|
||||
paramObj.userInfoMap = personnelObj
|
||||
// 草稿id
|
||||
if (this.model.infoJsonStr) {
|
||||
paramObj.draftId = this.model.id
|
||||
}
|
||||
// 业务基本信息和人员信息
|
||||
paramObj.infoJsonStr = JSON.stringify({
|
||||
data: baseInfo.formInline,
|
||||
personnelObj: personnelObj
|
||||
})
|
||||
// 草稿JSON
|
||||
paramObj.infoJsonStr = JSON.stringify(paramObj)
|
||||
this.loading = true
|
||||
// 保存到草稿
|
||||
regulatoryComplianceCheckSave(paramObj).then(res => {
|
||||
@@ -550,6 +551,7 @@ export default {
|
||||
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
||||
} else {
|
||||
func = regulatoryComplianceCheckApproval
|
||||
paramObj.saveSource = 3
|
||||
}
|
||||
func(paramObj).then(res => {
|
||||
if (res.success) {
|
||||
|
||||
+1
-1
@@ -128,7 +128,7 @@ export default {
|
||||
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
|
||||
align: 'center',
|
||||
width: 180,
|
||||
dataIndex: 'correctionCycle',
|
||||
dataIndex: 'correctionCycle_dictText',
|
||||
scopedSlots: { customRender: 'text' }
|
||||
},
|
||||
{ // 整改费用
|
||||
|
||||
+1
-1
@@ -208,7 +208,7 @@ export default {
|
||||
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
|
||||
align: 'center',
|
||||
width: 180,
|
||||
dataIndex: 'correctionCycle',
|
||||
dataIndex: 'correctionCycle_dictText',
|
||||
scopedSlots: { customRender: 'text' }
|
||||
},
|
||||
{ // 整改费用
|
||||
|
||||
+12
-1
@@ -518,6 +518,17 @@ export default {
|
||||
initData (data) {
|
||||
// 给表单赋值
|
||||
this.formInline = Object.assign({}, data.standardInfo)
|
||||
const personFormInline = {}
|
||||
// 会签人员
|
||||
personFormInline.countersignUser = data.standardInfo.countersignUser
|
||||
personFormInline.countersignUser_dictText = data.standardInfo.countersignUser_dictText
|
||||
// 审核人员
|
||||
personFormInline.manager = data.standardInfo.manager
|
||||
personFormInline.manager_dictText = data.standardInfo.manager_dictText
|
||||
// 批准人员
|
||||
personFormInline.seniorManager = data.standardInfo.seniorManager
|
||||
personFormInline.seniorManager_dictText = data.standardInfo.seniorManager_dictText
|
||||
this.personFormInline = Object.assign({}, personFormInline)
|
||||
if (this.formInline.distributeFlag === YesOrNoEnum.YES.value) {
|
||||
this.dataSource = JSON.parse(JSON.stringify(data.detailInfoList))
|
||||
} else {
|
||||
@@ -530,7 +541,7 @@ export default {
|
||||
getData () {
|
||||
// 把数据抛出,在线编辑不知道要不要抛
|
||||
const data = {}
|
||||
data.standardInfo = Object.assign({}, this.formInline)
|
||||
data.standardInfo = Object.assign({}, this.formInline, this.personFormInline)
|
||||
if (this.formInline.distributeFlag === YesOrNoEnum.YES.value) {
|
||||
data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
|
||||
} else {
|
||||
|
||||
+1
-1
@@ -143,7 +143,7 @@ export default {
|
||||
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
|
||||
align: 'center',
|
||||
width: 180,
|
||||
dataIndex: 'correctionCycle',
|
||||
dataIndex: 'correctionCycle_dictText',
|
||||
scopedSlots: { customRender: 'text' }
|
||||
},
|
||||
{ // 整改费用
|
||||
|
||||
Reference in New Issue
Block a user