[update] 企标流程保存统一改成传dataList或data和personnelObj
This commit is contained in:
lideqin
+2
-2
@@ -328,7 +328,7 @@ export default {
|
||||
prcObj.commitText = this.model.handleText
|
||||
prcObj.commitFile = this.model.handleFile
|
||||
this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile'))
|
||||
this.model.dataList = JSON.parse(this.model.infoJsonStr)
|
||||
this.model.dataList = JSON.parse(this.model.infoJsonStr).dataList
|
||||
}
|
||||
// 初始化业务基本信息
|
||||
this.$refs.baseInfoRef.initData(this.model.dataList)
|
||||
@@ -385,7 +385,7 @@ export default {
|
||||
return
|
||||
}
|
||||
// 该流程中业务基本信息只有表格
|
||||
paramObj.infoJsonStr = JSON.stringify(ruleForm.dataSource)
|
||||
paramObj.infoJsonStr = JSON.stringify({dataList: ruleForm.dataSource})
|
||||
} else {
|
||||
// 需要外层信息至少填了一项
|
||||
const form = { ...processInfoForm, ...approvalInfoForm, ...personnelObj }
|
||||
|
||||
@@ -271,10 +271,10 @@ export default {
|
||||
prcObj.commitText = this.model.handleText
|
||||
prcObj.commitFile = this.model.handleFile
|
||||
this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile'))
|
||||
this.model.data = JSON.parse(this.model.infoJsonStr)
|
||||
this.model.data = JSON.parse(this.model.infoJsonStr).data
|
||||
// 如果是节点1的保存回显人员信息
|
||||
if (this.currentNode === 1) {
|
||||
this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr))
|
||||
this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj)
|
||||
}
|
||||
}
|
||||
if (this.$refs.baseInfoRef) {
|
||||
@@ -340,8 +340,8 @@ export default {
|
||||
}
|
||||
// 业务基本信息和人员信息
|
||||
paramObj.infoJsonStr = JSON.stringify({
|
||||
...baseInfo.formInline,
|
||||
...personnelObj
|
||||
data: baseInfo.formInline,
|
||||
personnelObj: personnelObj
|
||||
})
|
||||
// paramObj.common = { ...processInfoForm, ...approvalInfoForm }
|
||||
// paramObj.common.taskId = this.$route.query.taskId || null
|
||||
|
||||
@@ -272,10 +272,10 @@ export default {
|
||||
prcObj.commitText = this.model.handleText
|
||||
prcObj.commitFile = this.model.handleFile
|
||||
this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile'))
|
||||
this.model.data = JSON.parse(this.model.infoJsonStr)
|
||||
this.model.data = JSON.parse(this.model.infoJsonStr).data
|
||||
// 如果是节点1的保存回显人员信息
|
||||
if (this.currentNode === 1) {
|
||||
this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr))
|
||||
this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj)
|
||||
}
|
||||
}
|
||||
// 初始化业务基本信息中组件内容
|
||||
@@ -347,8 +347,8 @@ export default {
|
||||
baseInfoObj.list = baseInfo.dataSource
|
||||
}
|
||||
paramObj.infoJsonStr = JSON.stringify({
|
||||
...baseInfoObj,
|
||||
...personnelObj
|
||||
data: baseInfoObj,
|
||||
personnelObj: personnelObj
|
||||
})
|
||||
} else {
|
||||
const param = { ...processInfoForm, ...approvalInfoForm, ...personnelObj }
|
||||
|
||||
@@ -567,7 +567,7 @@ export default {
|
||||
prcObj.commitFile = this.model.handleFile
|
||||
this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile'))
|
||||
console.log(JSON.parse(this.model.infoJsonStr))
|
||||
this.model.dataList = JSON.parse(this.model.infoJsonStr).arr || JSON.parse(this.model.infoJsonStr).dataList
|
||||
this.model.dataList = JSON.parse(this.model.infoJsonStr).dataList
|
||||
}
|
||||
// 初始化业务基本信息的申请类型和项目类别,分开赋值是因为项目类别会没有下拉数据无法回显
|
||||
const baseInfoForm = {}
|
||||
@@ -825,7 +825,7 @@ export default {
|
||||
// 业务基本信息和人员信息
|
||||
console.log(this.userFormModel)
|
||||
paramObj.infoJsonStr = JSON.stringify({
|
||||
arr: arr.map(item => {
|
||||
dataList: arr.map(item => {
|
||||
return { ...item, ...this.userFormModel }
|
||||
}),
|
||||
personnelObj: personnelObj
|
||||
|
||||
@@ -319,7 +319,7 @@ export default {
|
||||
prcObj.commitText = this.model.handleText
|
||||
prcObj.commitFile = this.model.handleFile
|
||||
this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile'))
|
||||
this.model.data = JSON.parse(this.model.infoJsonStr).baseInfo
|
||||
this.model.data = JSON.parse(this.model.infoJsonStr).data
|
||||
// 如果是节点1的保存回显人员信息
|
||||
if (this.currentNode === 1 || this.currentNode === 2) {
|
||||
this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj)
|
||||
@@ -398,7 +398,7 @@ export default {
|
||||
// 业务基本信息和人员信息
|
||||
paramObj.infoJsonStr = JSON.stringify({
|
||||
personnelObj: personnelObj,
|
||||
baseInfo: baseInfo.formInline
|
||||
data: baseInfo.formInline
|
||||
})
|
||||
// paramObj.common = { ...processInfoForm, ...approvalInfoForm }
|
||||
// paramObj.common.taskId = this.$route.query.taskId || null
|
||||
|
||||
@@ -273,10 +273,10 @@ export default {
|
||||
prcObj.commitText = this.model.handleText
|
||||
prcObj.commitFile = this.model.handleFile
|
||||
this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile'))
|
||||
this.model.data = JSON.parse(this.model.infoJsonStr)
|
||||
this.model.data = JSON.parse(this.model.infoJsonStr).data
|
||||
// 如果是节点1的保存回显人员信息
|
||||
if (this.currentNode === 1) {
|
||||
this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr))
|
||||
this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj)
|
||||
}
|
||||
}
|
||||
if (this.$refs.baseInfoRef) {
|
||||
@@ -342,8 +342,8 @@ export default {
|
||||
}
|
||||
// 业务基本信息和人员信息
|
||||
paramObj.infoJsonStr = JSON.stringify({
|
||||
...baseInfo.formInline,
|
||||
...personnelObj
|
||||
data: baseInfo.formInline,
|
||||
personnelObj: personnelObj
|
||||
})
|
||||
// paramObj.common = { ...processInfoForm, ...approvalInfoForm }
|
||||
// paramObj.common.taskId = this.$route.query.taskId || null
|
||||
|
||||
@@ -271,10 +271,10 @@ export default {
|
||||
prcObj.commitText = this.model.handleText
|
||||
prcObj.commitFile = this.model.handleFile
|
||||
this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile'))
|
||||
this.model.data = JSON.parse(this.model.infoJsonStr)
|
||||
this.model.data = JSON.parse(this.model.infoJsonStr).data
|
||||
// 如果是节点1的保存回显人员信息
|
||||
if (this.currentNode === 1) {
|
||||
this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr))
|
||||
this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj)
|
||||
}
|
||||
}
|
||||
if (this.$refs.baseInfoRef) {
|
||||
@@ -340,8 +340,8 @@ export default {
|
||||
}
|
||||
// 业务基本信息和人员信息
|
||||
paramObj.infoJsonStr = JSON.stringify({
|
||||
...baseInfo.formInline,
|
||||
...personnelObj
|
||||
data: baseInfo.formInline,
|
||||
personnelObj: personnelObj
|
||||
})
|
||||
// paramObj.common = { ...processInfoForm, ...approvalInfoForm }
|
||||
// paramObj.common.taskId = this.$route.query.taskId || null
|
||||
|
||||
Reference in New Issue
Block a user