From 76d4cf782e118fae34a6f04784c71f80a0f98337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 13 Aug 2021 21:34:18 +0800 Subject: [PATCH] commit --- .../processCenter/pages/creatProcess/bzqdfb/step1-1.vue | 2 +- .../processCenter/pages/creatProcess/bzqdfb/step1-3.vue | 2 +- .../processCenter/pages/creatProcess/bzqdfb/step1.vue | 6 +++++- .../processCenter/pages/creatProcess/bzqdfb/step3.vue | 2 +- .../processCenter/pages/creatProcess/wfhxzg/step1.vue | 4 ++-- .../processCenter/pages/creatProcess/xmpg/step1-1.vue | 2 +- .../processCenter/pages/creatProcess/xmpg/step1.vue | 2 +- .../processCenter/pages/creatProcess/xmpg2/step1.vue | 9 +++++++-- .../processCenter/pages/creatProcess/xmpg2/step5.vue | 1 + .../accessStandardsAndRegulations/pages/addEdit.vue | 4 ++-- .../accessStandardsAndRegulations/pages/otherAddEit.vue | 4 ++-- .../pages/projectAddEit.vue | 4 ++-- .../localProductsOrProjectLibrary/pages/details.vue | 7 ++++++- 13 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index b5a354cbf..f914cb989 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1035,7 +1035,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index 7551a83f2..29e3b1b73 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -595,7 +595,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index bb41705bd..d9fbcfd23 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -994,6 +994,8 @@ export default { }, // 点击批量删除事件 deleteList() { + console.log(this.selectList); + console.log(this.dataList); if (this.selectList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { @@ -1007,10 +1009,12 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); + console.log(index); if (index > -1) { this.dataList.splice(index, 1); + console.log(this.dataList); } exits.push(item); }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 3fc280f48..04d2e535d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -598,7 +598,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index d3f760def..dce75e757 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -394,7 +394,7 @@ export default { this.deleteDataList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); @@ -430,7 +430,7 @@ export default { this.selectedList.map(item => { let addList; addList = this.dataList.findIndex(items => { - return items.id == item.id + return items.id === item.id }) if(addList > -1){ // this.$refs.accessTypeSelect.clearSelection() diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 454d4c8bc..c38ec4a01 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -631,7 +631,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.productLine = item; + return items.productLine === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 1d9ea32d5..3f3b33a3b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -605,7 +605,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.productLine = item; + return items.productLine === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 296f65bc7..93412800f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -450,8 +450,13 @@ export default { }, { _this: this }, res => { - this.ProjectDatas = res.data.Maintenance.records; - this.total = res.data.Maintenance.total; + if(res.data === null){ + this.ProjectDatas = '' + this.total = 0 + }else{ + this.ProjectDatas = res.data.Maintenance.records; + this.total = res.data.Maintenance.total; + } }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index d53cb2820..80c2f261d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -421,6 +421,7 @@ export default { //标准表格选择框改变 selectStandChange(data) { this.selectList = data; + console.log(this.selectList); }, getTree() { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 0b3225713..c591e0cb6 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1124,7 +1124,7 @@ export default { this.selectedAccInfoSearchList.map(item => { let addList; addList = this.sarAccessInfoList.findIndex(items => { - return items.id == item.id + return items.id === item.id }) if(addList > -1){ // this.$refs.accessTypeSelect.clearSelection() @@ -1211,7 +1211,7 @@ export default { this.sarAccessInfoListArry.map(item => { let index index = this.sarAccessInfoList.findIndex(items => { - return items.id = item + return items.id === item }) if (index > -1) { this.sarAccessInfoList.splice(index, 1) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index ce62849a4..a3ced34d9 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1093,7 +1093,7 @@ export default { let addList; addList = this.sarAccessInfoList.findIndex(items => { - return items.id == item.id + return items.id === item.id }) if(addList > -1){ // this.$refs.accessTypeSelect.clearSelection() @@ -1183,7 +1183,7 @@ export default { this.sarAccessInfoListArry.map(item => { let index index = this.sarAccessInfoList.findIndex(items => { - return items.id = item + return items.id === item }) if (index > -1) { this.sarAccessInfoList.splice(index, 1) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 31fa260f8..ac931a8aa 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1092,7 +1092,7 @@ export default { this.selectedAccInfoSearchList.map(item => { let addList; addList = this.sarAccessInfoList.findIndex(items => { - return items.id == item.id + return items.id === item.id }) if(addList > -1){ // this.$refs.accessTypeSelect.clearSelection() @@ -1182,7 +1182,7 @@ export default { this.sarAccessInfoListArry.map(item => { let index index = this.sarAccessInfoList.findIndex(items => { - return items.id = item + return items.id === item }) if (index > -1) { this.sarAccessInfoList.splice(index, 1) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 03148760b..3b1616db0 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -631,7 +631,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); @@ -743,6 +743,11 @@ export default { }, { _this: this }, res => { + if(res.data === null){ + this.standardData = '' + this.totalDo ='' + this.standModel = true; + } this.standardData = res.data.records this.totalDo = res.data.total this.standModel = true;