From 6804acd7c0771056bb17ee309ff509257fa29d19 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 17 Sep 2021 17:55:59 +0800 Subject: [PATCH 1/4] commit --- src/components/roleTree/index.vue | 28 ++++++++++++++++++++++++++++ src/sysConfig/index.js | 8 ++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index acfe40b4e..c29ae036a 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -17,6 +17,16 @@ placeholder="请输入姓名" > + + + { + cb(results); + }, 3000 * Math.random()); + }, + createStateFilter(queryString) { + return (state) => { + return (state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0); + }; + }, + handleSelect (item) { + console.log(item); + }, treeClass () { }, 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' From 5bbcd9a34016cfcc420f2593866acecd9c7c91f8 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Sat, 18 Sep 2021 10:08:01 +0800 Subject: [PATCH 2/4] commit --- src/components/roleTree/index.vue | 28 ---------- .../pages/creatProcess/bzzqyj/step5.vue | 55 +++++-------------- 2 files changed, 15 insertions(+), 68 deletions(-) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index c29ae036a..acfe40b4e 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -17,16 +17,6 @@ placeholder="请输入姓名" > - - - { - cb(results); - }, 3000 * Math.random()); - }, - createStateFilter(queryString) { - return (state) => { - return (state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0); - }; - }, - handleSelect (item) { - console.log(item); - }, treeClass () { }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index cd1fe0fc7..6776e5aeb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -389,47 +389,22 @@ export default { if (this.data.length < 1) { this.$message.warning("请输入征求意见搞"); } else { - var a = 0; - var b = 0; - // var c = 0 - for (let s1 = 0; s1 < this.data.length; s1++) { - if (!this.data[s1].chapterNumber) { - a++; + this.isSubmit = true; + var json = this.json; + json.oldinfo = this.oldData; + json.commentText = this.commentText; + json.introduce = true; + 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"); } - 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() { From 212e8acb9bfa78c16bedc468dbd93e5fda2231aa Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sat, 18 Sep 2021 17:00:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=A0=87=E5=87=86=20=20=E5=A6=82=E6=9E=9Clocalstorage=E9=87=8C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89pastlist=E6=97=B6=E5=81=9A=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=88+=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-1.vue | 22 +++++++++++-------- .../pages/creatProcess/xmpg/step1.vue | 22 +++++++++++-------- 2 files changed, 26 insertions(+), 18 deletions(-) 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("请选择一条数据进行添加"); From 40d028166819eaeaa8f12cce9fb96066f66584e1 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 19 Sep 2021 12:19:02 +0800 Subject: [PATCH 4/4] feat: There is no way the --- src/pages/processCenter/pages/components/ProcessFooter.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" >转办