From 424e4fde07b6a1c171d39d29ec3c574158ecc994 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 16 Mar 2022 09:55:23 +0800 Subject: [PATCH] commit --- .../details/otherStandardDetails/index.vue | 39 ++++++++++++------- .../domesticStandardsAndRegulations/index.vue | 4 +- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 16579d0bd..6dae89bff 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -847,7 +847,6 @@ :height="tableHeight" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" - @select="select" @selection-change="selectAllStand"> { + let a, b + a = item.substring(item.indexOf('(') +1) + b = a.substring(0, a.lastIndexOf(')')) + idList.push(b) + }) + idList = idList.join(',') + this.nodeList2.push(idList) + } this.userType = type this.drawerTitle = title this.modalShowRoleFlag = true @@ -2778,21 +2788,22 @@ export default { if (this.drawerTitle === '查询责任工程师') { this.resolveListForm.dutyEngineer = nameList } - - }, - select(selection, row) { - // 清除 所有勾选项 - this.$refs.multipleTable.clearSelection() - // 当表格数据都没有被勾选的时候 就返回 - // 主要用于将当前勾选的表格状态清除 - if (selection.length === 0) return - this.$refs.multipleTable.toggleRowSelection(row, true) }, + // select(selection, row) { + // // 清除 所有勾选项 + // this.$refs.multipleTable.clearSelection() + // // 当表格数据都没有被勾选的时候 就返回 + // // 主要用于将当前勾选的表格状态清除 + // if (selection.length === 0) return + // this.$refs.multipleTable.toggleRowSelection(row, true) + // }, selectAllStand(alldata) { this.selectedItemList = alldata }, editResolveList() { - if (this.selectedItemList.length > 0) { + if (this.selectedItemList.length < 1) { + this.$message.warning('请选择一条数据') + } else if (this.selectedItemList.length === 1) { this.resolveListForm = JSON.parse(JSON.stringify(this.selectedItemList[0])) this.resolveListForm.termsConditions = this.resolveListForm.termsConditions ? this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' ') : '' // this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):'' @@ -2800,7 +2811,7 @@ export default { this.resolveListForm.zccssrq = this.resolveListForm.zccssrq ? this.resolveListForm.zccssrq.split(',') : '' this.editResolveListShowflag = true } else { - this.$message.warning('请选择一条数据') + this.$message.warning('仅可选择一条数据') } }, saveEditInfo() { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index fcc7c33b0..e91f1e64b 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -5801,7 +5801,9 @@ export default { }, choiceZRRS(type, title, nameId) { this.nodeList2 = [] - if (nameId) { + console.log(typeof (nameId)); + console.log(nameId); + if (nameId) { let nameId1 = nameId.split(',') let idList = [] nameId1.forEach(item => {