[update] 企标计划立项、变更流程
This commit is contained in:
@@ -581,7 +581,7 @@ export default {
|
|||||||
this.model = res.result
|
this.model = res.result
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
// 初始化流程信息
|
// 初始化流程信息
|
||||||
this.processInfoForm.setFieldsValue(pick(this.model.commonVO, 'prcName', 'dueTime', 'prcMes'))
|
this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
|
||||||
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
|
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
|
||||||
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
|
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
|
||||||
})
|
})
|
||||||
@@ -592,7 +592,7 @@ export default {
|
|||||||
if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) {
|
if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) {
|
||||||
this.personnelInfoData = approvalPersonalInfo.map(item => {
|
this.personnelInfoData = approvalPersonalInfo.map(item => {
|
||||||
if (item.fieldName) {
|
if (item.fieldName) {
|
||||||
return { ...item, user: this.model.flowUserInfoVO[item.fieldName], userList: this.model.flowUserInfoVO[item.fieldName + '_dictText'], canChoose: false }
|
return { ...item, user: this.model.flowUser [item.fieldName], userList: this.model.flowUser [item.fieldName + '_dictText'], canChoose: false }
|
||||||
} else {
|
} else {
|
||||||
return item
|
return item
|
||||||
}
|
}
|
||||||
@@ -601,7 +601,7 @@ export default {
|
|||||||
this.personnelInfoData = changePersonalInfo.map(item => {
|
this.personnelInfoData = changePersonalInfo.map(item => {
|
||||||
console.log(item)
|
console.log(item)
|
||||||
if (item.fieldName) {
|
if (item.fieldName) {
|
||||||
return { ...item, user: this.model.flowUserInfoVO[item.fieldName], userList: this.model.flowUserInfoVO[item.fieldName + '_dictText'], canChoose: false }
|
return { ...item, user: this.model.flowUser [item.fieldName], userList: this.model.flowUser [item.fieldName + '_dictText'], canChoose: false }
|
||||||
} else {
|
} else {
|
||||||
return item
|
return item
|
||||||
}
|
}
|
||||||
@@ -747,9 +747,9 @@ export default {
|
|||||||
}
|
}
|
||||||
this.loading = true
|
this.loading = true
|
||||||
const param = {} // 传给后端的参数
|
const param = {} // 传给后端的参数
|
||||||
param.commonVO = { ...processInfoForm, ...approvalInfoForm } // 流程信息和流程审批信息
|
param.common = { ...processInfoForm, ...approvalInfoForm } // 流程信息和流程审批信息
|
||||||
param.dataList = arr // 业务基础信息数组
|
param.dataList = arr // 业务基础信息数组
|
||||||
param.flowUserInfoVO = personnelObj // 人员信息
|
param.flowUser = personnelObj // 人员信息
|
||||||
// 保存到草稿
|
// 保存到草稿
|
||||||
enterprisePlanApprovalSave(param).then(res => {
|
enterprisePlanApprovalSave(param).then(res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
@@ -862,9 +862,9 @@ export default {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
const param = {} // 需要传给后端的数据
|
const param = {} // 需要传给后端的数据
|
||||||
param.commonVO = { ...values, ...approvalValues } // 流程信息和流程审批信息
|
param.common = { ...values, ...approvalValues } // 流程信息和流程审批信息
|
||||||
param.dataList = arr
|
param.dataList = arr
|
||||||
param.flowUserInfoVO = personnelObj
|
param.flowUser = personnelObj
|
||||||
let func
|
let func
|
||||||
if (this.$route.query.taskId) {
|
if (this.$route.query.taskId) {
|
||||||
// 有taskId说明是驳回的提交
|
// 有taskId说明是驳回的提交
|
||||||
@@ -941,8 +941,8 @@ export default {
|
|||||||
if (!err) {
|
if (!err) {
|
||||||
this.loading = true
|
this.loading = true
|
||||||
const param = {}
|
const param = {}
|
||||||
param.commonVO = Object.assign({}, values)
|
param.common = Object.assign({}, values)
|
||||||
param.commonVO.taskId = this.$route.query.taskId
|
param.common.taskId = this.$route.query.taskId
|
||||||
enterprisePlanApprovalAgree(param).then(res => {
|
enterprisePlanApprovalAgree(param).then(res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.$message.success(res.message)
|
this.$message.success(res.message)
|
||||||
@@ -967,8 +967,8 @@ export default {
|
|||||||
if (!err) {
|
if (!err) {
|
||||||
this.loading = true
|
this.loading = true
|
||||||
const param = {}
|
const param = {}
|
||||||
param.commonVO = Object.assign({}, values)
|
param.common = Object.assign({}, values)
|
||||||
param.commonVO.taskId = this.$route.query.taskId
|
param.common.taskId = this.$route.query.taskId
|
||||||
enterprisePlanApprovalReject(param).then(res => {
|
enterprisePlanApprovalReject(param).then(res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.$message.success(res.message)
|
this.$message.success(res.message)
|
||||||
|
|||||||
Reference in New Issue
Block a user