diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 77380b703..783410f60 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -214,7 +214,6 @@ export default { form: { cid: "", // 编号 endTime: "", // 结束日期 - cname: "", // 名称 fjList: [], fjListId: '', responUserList: "", @@ -370,19 +369,18 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText2 = data.commentText2 || '' - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname - this.form.fjList = data.fjList - // this.form.fjListId = data.fjListId - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.fjListId || data.form.fjListId - } + this.form.cid = data.form ? data.form.cid : data.cid + this.form.endTime = data.form ? data.form.endTime : data.endTime + this.form.fjList = data.form ? data.form.fjList : data.fjList + this.form.textType = data.form ? data.form.textType : data.textType + this.form.modelList = data.form ? data.form.modelList : data.modelList + this.form.responUserListName = data.form ? data.form.responUserListName : (data.responUserListName ? data.responUserListName : '') + this.form.responUserList = data.form ? data.form.responUserList : (data.responUserList ? data.responUserList : '') + // if (data.fjListId === '' || data.form.fjListId === '') { + // this.form.fjListId = '' + // } else { + // this.form.fjListId = data.form ? data.form.fjListId :data.fjListId + // } this.json = data }).catch(e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 4807528be..be51968b5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -684,22 +684,16 @@ this.submitShow = true } this.commentText3 = data.commentText3 || '' - this.form.fjList = data.fjList || data.form.fjList || [] - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.fjListId || data.form.fjListId - } - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - // this.form.modelNameList = data.modelNameList || data.form.modelNameList - this.form.cid = data.cid || data.form.cid - this.form.endTime = data.endTime || data.form.endTime + this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) + this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) + this.form.textType = data.form ? data.form.textType : data.textType + this.form.cid = data.form ? data.form.cid : data.cid + this.form.endTime = data.form ? data.form.endTime : data.endTime this.todoId = res.id this.json = data this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey this.getItemList(data.standId,data.textType) - this.data = data.info || data.data || data.form.data || [] + this.data = data.form ? data.form.data : (data.data ? data.data : (data.info ? data.info : [])) }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 925b4e94c..bdaffffaf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -455,22 +455,13 @@ }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime - this.form.cname = data.cname || data.form.cname this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.commentText41 = data.commentText41 || '' this.form.bzfgId = data.startUser this.form.bzfgName = data.startUserName - // this.form.bzfgId = data.bzfgId || '' - // this.form.bzfgName = data.bzfgName || '' this.json = data this.data = data.info || data.data }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index 7df690f5f..b21ee8ad0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -439,18 +439,11 @@ }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.commentText42 = data.commentText42 || '' this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime - this.form.cname = data.cname || data.form.cname this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.form.bzfgId = data.bzfgId || '' this.json = data this.data = data.info || data.data diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 67653a124..7153ae16c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -648,19 +648,12 @@ export default { this.acceptShow = false this.submitShow = true } - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.commentText4 = data.commentText4 || '' + this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime - this.form.cname = data.cname || data.form.cname this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.form.spId = data.spId || '' this.form.spName = data.spName || '' this.json = data diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 6c7fa3f31..d4ddea515 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -561,27 +561,11 @@ }).then(res => { let data = JSON.parse(res.mesg); this.commentText5 = data.commentText5 || '' - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } - this.form.cid = data.cid || data.form.cid; - this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList - // this.oldData = JSON.parse(JSON.stringify(data.summaryList)) - // console.log(data); - // data.summaryList.forEach(item => { - // if (item.state) { - // } else { - // item.state = "1"; - // } - // item.type = false; - // }); + this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) + this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) + this.form.textType = data.form ? data.form.textType : data.textType + this.form.cid = data.form ? data.form.cid : data.cid + this.form.endTime = data.form ? data.form.endTime : data.endTime data.info.forEach(item => { if (item.state) { } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 6c2fe7e66..8877bd708 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -486,16 +486,12 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.commentText6 = data.commentText6 || '' + this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] data.info.forEach(item => { @@ -504,9 +500,6 @@ export default { } }) this.json = data - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.data = arr }).catch(e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 50a609066..d5e82be16 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -483,16 +483,12 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.commentText7 = data.commentText7 || '' + this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] data.info.forEach(item => { @@ -500,9 +496,6 @@ export default { arr.push(item) } }) - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.json = data this.data = arr }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 61f20b5ca..a48982069 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -487,16 +487,12 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.commentText8 = data.commentText8 || '' + this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] data.info.forEach(item => { @@ -505,9 +501,6 @@ export default { } }) this.json = data - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.data = arr }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index d36978661..5c1bd115f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -486,16 +486,12 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.commentText9 = data.commentText9 || '' + this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] data.info.forEach(item => { @@ -504,9 +500,6 @@ export default { } }) this.json = data - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.data = arr }).catch(e => { });