diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 139d7920a..ad3d8ac6a 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -467,6 +467,7 @@ @@ -477,6 +478,7 @@ @@ -2396,6 +2398,9 @@ export default { this.standItemSearch.parts = '' this.standItemSearch.nameOrRequest = '' this.standItemSearch.fileType = '' + this.standItemSearch.itemsName='' + this.standItemSearch.ZCCSSRQ='' + this.standItemSearch.XCXSSRQ='' this.selectSarStandItems() }, inputChange() { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index b3e076e97..43822317f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -328,11 +328,13 @@ handleSave() { this.saveLoading = true; let _formData = new FormData(); + let json = this.form + json.data = this.data _formData.append("id", this.bpnId || ""); _formData.append("prcType", "3"); _formData.append("taskIds", this.taskIds); _formData.append("json", JSON.stringify({ - form: this.json, + form: json, commentText: this.commentText })); saveTaskForPub(_formData).then(res => { @@ -400,7 +402,7 @@ this.form.endTime = data.endTime || data.form.endTime this.form.cname = data.cname || data.form.cname this.json = data - this.data = data.info || data.data || [] + this.data = data.info || data.data || data.form.data|| [] }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index e08b93f6e..cc5a6fc4f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -1,450 +1,505 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 6f79d2566..b559eec49 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -1,446 +1,477 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 61b4a50d7..dfadeae1d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -355,19 +355,34 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname - var arr = [] - data.summaryList.forEach( item => { - if (item.state != '3') { - arr.push(item) - } - }) - this.json = data - this.data = arr + if (data.oldinfo === undefined) { + this.form.cid = data.cid; + this.form.endTime = data.endTime; + this.form.cname = data.cname; + var arr = []; + data.summaryList.forEach(item => { + if (item.state != "3") { + arr.push(item); + } + }); + this.json = data; + this.data = arr; + this.oldData = data.oldinfo; + } else { + this.form.cid = data.oldinfo.cid; + this.form.endTime = data.oldinfo.endTime; + this.form.cname = data.oldinfo.cname; + var arr = []; + data.oldinfo.data.forEach(item => { + if (item.state != "3") { + arr.push(item); + } + }); + this.json = data; + this.data = arr; + this.oldData = data.oldinfo; + } - this.oldData = data.oldinfo }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 1144cfc97..8cc1a33ff 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -355,18 +355,33 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname - var arr = [] - data.summaryList.forEach( item => { - if (item.state != '3') { - arr.push(item) - } - }) - this.json = data - this.data = arr - this.oldData = data.oldinfo + if (data.oldinfo === undefined) { + this.form.cid = data.cid; + this.form.endTime = data.endTime; + this.form.cname = data.cname; + var arr = []; + data.summaryList.forEach(item => { + if (item.state != "3") { + arr.push(item); + } + }); + this.json = data; + this.data = arr; + this.oldData = data.oldinfo; + } else { + this.form.cid = data.oldinfo.cid; + this.form.endTime = data.oldinfo.endTime; + this.form.cname = data.oldinfo.cname; + var arr = []; + data.oldinfo.data.forEach(item => { + if (item.state != "3") { + arr.push(item); + } + }); + this.json = data; + this.data = arr; + this.oldData = data.oldinfo; + } }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 72dfadb99..4703b35e0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -1,440 +1,470 @@ diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 1155aea99..d3cd25a02 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -4,10 +4,10 @@ * @date: 2018-09-04 17:47:46 */ // 服务器地址 -// const devIp = '192.168.1.159' +const devIp = '10.96.10.171' +const devInterfacePORT = '9999' +// const devIp = '10.5.103.101' // const devInterfacePORT = '9999' -const devIp = '62.234.136.153' -const devInterfacePORT = '8038' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' @@ -31,7 +31,7 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 const prodIp = '62.234.136.153' -const prodInterfacePORT = '8038' +const prodInterfacePORT = '8033' // 判断环境