From 9a8bf90afbfbb6371162ee315fd25c0c18122b7a Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 17 Aug 2021 16:09:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8E=BB=E9=99=A4=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step4.vue | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index ca068a8c6..2cbe932a9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -37,27 +37,6 @@ clearable > - - - - - - - - - - - - - - - - - - - - -

Date: Tue, 17 Aug 2021 16:09:38 +0800 Subject: [PATCH 2/4] commit --- src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 421f5c544..4eb490482 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -349,7 +349,7 @@ export default { let aa = { key: item.standId, id: item.id, - standId: item.itemsNum, + standId: item.id, itemsNum: item.itemsNum, itemsName: item.itemsName, workPeople: "请选择责任人" From 8d22b39cebc52a6da63a04806af712ba86e6a8f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 17 Aug 2021 16:12:58 +0800 Subject: [PATCH 3/4] commit --- .../pages/creatProcess/xmpg2/step1-1.vue | 1 + .../pages/creatProcess/xmpg2/step1.vue | 1 + .../pages/creatProcess/xmpg2/step4.vue | 2 +- .../pages/details.vue | 124 +++++++++++------- 4 files changed, 77 insertions(+), 51 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 8359b012e..690d3e50f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -480,6 +480,7 @@ export default { this.projectId = this.selectedList[0].id; this.listForm.projectNumber = this.selectedList[0].projectNumber; this.listForm.projectName = this.selectedList[0].projectName; + this.listForm.productLine = this.selectedList[0].productLine; this.getStandData(); this.projectModel = false; } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index f5c6021b1..65545af80 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -478,6 +478,7 @@ export default { this.projectId = this.selectedList[0].id; this.listForm.projectNumber = this.selectedList[0].projectNumber; this.listForm.projectName = this.selectedList[0].projectName; + this.listForm.productLine = this.selectedList[0].productLine; this.getStandData(); this.projectModel = false; } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index cefaecdc1..583ed86e1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -335,7 +335,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -394,6 +393,7 @@ export default { this.isSubmit = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + console.log(json); this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index c56b05480..879ff25bd 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -76,10 +76,14 @@ width="260px" > - - { - if (res.ok) { - // this.$message.success(res.message) - this.getDataList() - } - }, e => { - }); - } - this.standList = [] - this.standList1 = [] - _this.standModel = false; - } + okStand(){ + if(this.standList.length > 0){ + this.standList.forEach(item => { + let addIndex + addIndex = this.dataList.findIndex(items => { + return items.standId === item.id + }) + if(addIndex > -1){ + this.$message.warning('请勿重复添加数据') + }else{ + this.dataList.push(item) + } + }) + }else{ + this.$message.warning('请至少选择一条数据进行添加') + } }, + // okStand() { + // let _this = this; + // if (this.standList.length < 1) { + // _this.$message.warning("请选择标准"); + // } else { + // for (let i = 0; i < this.dataList.length; i++) { + // let newStand = false; + // for (let j = 0; j < this.standList.length; j++) { + // if (this.standList[j].id == this.dataList[i].standId) { + // newStand = true; + // this.standList.splice(j, 1) + // j-- + // } + // } + // if (newStand) { + // _this.$message.warning("请勿重复添加数据"); + // } else { + // // _this.dataList.push(item); + // } + // } + // this.standardData = [] + // _this.standModel = false; + // for (var i = 0; i < this.standList.length; i++) { + // this.standList1.push({ + // standId: this.standList[i].id, + // projectId: this.localProEO.id + // }) + // } + // if (this.standList1 != '') { + // this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, { + // _this: this + // }, res => { + // if (res.ok) { + // // this.$message.success(res.message) + // this.getDataList() + // } + // }, e => { + // }); + // } + // this.standList = [] + // this.standList1 = [] + // _this.standModel = false; + // } + // }, //获取标准 getStandrd(data){ this.detailedId = data.id @@ -763,6 +779,14 @@ export default { this.standModel = true; } this.standardData = res.data.records + this.standardData.forEach(item => { + if(item.zccssrqgj === '-'){ + item.zccssrqgj = '' + } + if(item.xcxssrqgj === '-'){ + item.xcxssrq = '' + } + }) this.totalDo = res.data.total this.standModel = true; }) From 9b9b60e44938d8895cb5c2147ef6261b8c540688 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 17 Aug 2021 16:16:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B3=95=E8=A7=84--=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E5=A4=9A=E9=80=89(?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 41 +++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 0ba85c2fa..36da9467c 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -671,20 +671,37 @@