[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 processTransfer = (params) => postAction('/workCenter/transfer', params)
|
||||||
|
|
||||||
|
// 流程中心-统一保存
|
||||||
|
const processSave = (params) => getAction('/workCenter/save', params)
|
||||||
|
|
||||||
// 流程中心-草稿-办理
|
// 流程中心-草稿-办理
|
||||||
const getDataDraft = (params) => getAction('/workCenter/draftHandle', params)
|
const getDataDraft = (params) => getAction('/workCenter/draftHandle', params)
|
||||||
|
|
||||||
@@ -160,6 +163,8 @@ export {
|
|||||||
|
|
||||||
processTransfer,
|
processTransfer,
|
||||||
|
|
||||||
|
processSave,
|
||||||
|
|
||||||
getDataDraft,
|
getDataDraft,
|
||||||
|
|
||||||
getLookData,
|
getLookData,
|
||||||
|
|||||||
@@ -514,6 +514,7 @@ export default {
|
|||||||
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
||||||
} else {
|
} else {
|
||||||
func = marketListReleaseApproval
|
func = marketListReleaseApproval
|
||||||
|
paramObj.saveSource = 3
|
||||||
}
|
}
|
||||||
func(paramObj).then(res => {
|
func(paramObj).then(res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|||||||
+1
@@ -441,6 +441,7 @@ export default {
|
|||||||
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
||||||
} else {
|
} else {
|
||||||
func = newRegulationImportApproval
|
func = newRegulationImportApproval
|
||||||
|
paramObj.saveSource = 3
|
||||||
}
|
}
|
||||||
func(paramObj).then(res => {
|
func(paramObj).then(res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|||||||
+7
-5
@@ -493,15 +493,16 @@ export default {
|
|||||||
// 流程审批信息
|
// 流程审批信息
|
||||||
paramObj.basicTaskInfoDTO = Object.assign({}, approvalInfoForm)
|
paramObj.basicTaskInfoDTO = Object.assign({}, approvalInfoForm)
|
||||||
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
||||||
|
// 业务信息
|
||||||
|
paramObj.businessInfoDTO = baseInfo
|
||||||
|
// 人员信息
|
||||||
|
paramObj.userInfoMap = personnelObj
|
||||||
// 草稿id
|
// 草稿id
|
||||||
if (this.model.infoJsonStr) {
|
if (this.model.infoJsonStr) {
|
||||||
paramObj.draftId = this.model.id
|
paramObj.draftId = this.model.id
|
||||||
}
|
}
|
||||||
// 业务基本信息和人员信息
|
// 草稿JSON
|
||||||
paramObj.infoJsonStr = JSON.stringify({
|
paramObj.infoJsonStr = JSON.stringify(paramObj)
|
||||||
data: baseInfo.formInline,
|
|
||||||
personnelObj: personnelObj
|
|
||||||
})
|
|
||||||
this.loading = true
|
this.loading = true
|
||||||
// 保存到草稿
|
// 保存到草稿
|
||||||
regulatoryComplianceCheckSave(paramObj).then(res => {
|
regulatoryComplianceCheckSave(paramObj).then(res => {
|
||||||
@@ -550,6 +551,7 @@ export default {
|
|||||||
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
||||||
} else {
|
} else {
|
||||||
func = regulatoryComplianceCheckApproval
|
func = regulatoryComplianceCheckApproval
|
||||||
|
paramObj.saveSource = 3
|
||||||
}
|
}
|
||||||
func(paramObj).then(res => {
|
func(paramObj).then(res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|||||||
+1
-1
@@ -128,7 +128,7 @@ export default {
|
|||||||
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
|
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
width: 180,
|
width: 180,
|
||||||
dataIndex: 'correctionCycle',
|
dataIndex: 'correctionCycle_dictText',
|
||||||
scopedSlots: { customRender: 'text' }
|
scopedSlots: { customRender: 'text' }
|
||||||
},
|
},
|
||||||
{ // 整改费用
|
{ // 整改费用
|
||||||
|
|||||||
+1
-1
@@ -208,7 +208,7 @@ export default {
|
|||||||
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
|
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
width: 180,
|
width: 180,
|
||||||
dataIndex: 'correctionCycle',
|
dataIndex: 'correctionCycle_dictText',
|
||||||
scopedSlots: { customRender: 'text' }
|
scopedSlots: { customRender: 'text' }
|
||||||
},
|
},
|
||||||
{ // 整改费用
|
{ // 整改费用
|
||||||
|
|||||||
+12
-1
@@ -518,6 +518,17 @@ export default {
|
|||||||
initData (data) {
|
initData (data) {
|
||||||
// 给表单赋值
|
// 给表单赋值
|
||||||
this.formInline = Object.assign({}, data.standardInfo)
|
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) {
|
if (this.formInline.distributeFlag === YesOrNoEnum.YES.value) {
|
||||||
this.dataSource = JSON.parse(JSON.stringify(data.detailInfoList))
|
this.dataSource = JSON.parse(JSON.stringify(data.detailInfoList))
|
||||||
} else {
|
} else {
|
||||||
@@ -530,7 +541,7 @@ export default {
|
|||||||
getData () {
|
getData () {
|
||||||
// 把数据抛出,在线编辑不知道要不要抛
|
// 把数据抛出,在线编辑不知道要不要抛
|
||||||
const data = {}
|
const data = {}
|
||||||
data.standardInfo = Object.assign({}, this.formInline)
|
data.standardInfo = Object.assign({}, this.formInline, this.personFormInline)
|
||||||
if (this.formInline.distributeFlag === YesOrNoEnum.YES.value) {
|
if (this.formInline.distributeFlag === YesOrNoEnum.YES.value) {
|
||||||
data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
|
data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+1
-1
@@ -143,7 +143,7 @@ export default {
|
|||||||
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
|
title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'),
|
||||||
align: 'center',
|
align: 'center',
|
||||||
width: 180,
|
width: 180,
|
||||||
dataIndex: 'correctionCycle',
|
dataIndex: 'correctionCycle_dictText',
|
||||||
scopedSlots: { customRender: 'text' }
|
scopedSlots: { customRender: 'text' }
|
||||||
},
|
},
|
||||||
{ // 整改费用
|
{ // 整改费用
|
||||||
|
|||||||
Reference in New Issue
Block a user