diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 3cf4e70c8..8ed146e64 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -44,7 +44,7 @@ class="common-button-primary" icon="el-icon-s-promotion" @click="handleTransfer" - :loading="transferLoading" + :loading="submitLoading" v-if="showTransfer" >转办 { + if (res.success) { + this.$message.success("提交成功"); + this.$router.push("/processCenter"); } - if (!this.data[s1].chapterName) { - b++; - } - // if (!this.data[s1].commentText) { - // c++ - // } - } - if (a > 0) { - this.$message.warning("请输入章节编号"); - } else if (b > 0) { - this.$message.warning("请输入章节名称"); - } - // else if (c > 0) { - // this.$message.warning('请输入意见内容') - // } - else { - this.isSubmit = true; - var json = this.json; - json.oldinfo = this.oldData; - json.commentText = this.commentText; - json.introduce = true; - console.log(json); - this.$http.post("lawss/activiti/completeTask", { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success("提交成功"); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } + this.isSubmit = false; + }); } }, getData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index baee348f1..725a1c0f1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -729,17 +729,21 @@ export default { this.standModel = false; } else { if (this.standList.length >= 1) { - this.pastProject.forEach(item => { - this.standList.map(items => { - if( item.productLine === items.productLine){ - items.distributePersonId = item.distributePersonId - items.distributePerson = item.distributePerson - } + if (this.pastProject === null){ + this.dataList = this.standList; + }else { + this.pastProject.forEach(item => { + this.standList.map(items => { + if( item.productLine === items.productLine){ + items.distributePersonId = item.distributePersonId + items.distributePerson = item.distributePerson + } + }) }) - }) - this.dataList = this.standList; - this.roleForm.directorUser = this.dataList[0].uname; + this.dataList = this.standList + } this.listForm.dataList = this.standList; + this.roleForm.directorUser = this.dataList[0].uname; this.standModel = false; } else { this.$message.warning("请选择一条数据进行添加"); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 35783abf5..339b51f78 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -704,17 +704,21 @@ export default { this.standModel = false; } else { if (this.standList.length >= 1) { - this.pastProject.forEach(item => { - this.standList.map(items => { - if( item.productLine === items.productLine){ - items.distributePersonId = item.distributePersonId - items.distributePerson = item.distributePerson - } + if (this.pastProject === null){ + this.dataList = this.standList; + }else { + this.pastProject.forEach(item => { + this.standList.map(items => { + if( item.productLine === items.productLine){ + items.distributePersonId = item.distributePersonId + items.distributePerson = item.distributePerson + } + }) }) - }) - this.dataList = this.standList; - this.roleForm.directorUser = this.dataList[0].uname; + this.dataList = this.standList + } this.listForm.dataList = this.standList; + this.roleForm.directorUser = this.dataList[0].uname; this.standModel = false; } else { this.$message.warning("请选择一条数据进行添加"); diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 7cb8e2ea1..d324fb6a3 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -4,10 +4,10 @@ * @date: 2018-09-04 17:47:46 */ // 服务器地址 -const devIp = '62.234.136.153' -const devInterfacePORT = '8033' -// const devIp = '10.5.103.101' -// const devInterfacePORT = '9999' +// const devIp = '62.234.136.153' +// const devInterfacePORT = '8033' +const devIp = '192.168.10.247' +const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload'