From 55e7ccce8529fa5c704710c0e746d98be5e355e8 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, 30 Nov 2021 09:38:13 +0800 Subject: [PATCH 01/11] commit --- src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index c8efc8d8c..8408f31f0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -601,7 +601,7 @@ export default { }, //流程提交事件 handleSubmit() { - let fileFlag + let fileFlag = true this.dataList.forEach(item => { if(!item.fileType){ fileFlag = false diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 3c0aa652a..559c3da5d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -618,7 +618,7 @@ export default { }, //流程提交事件 handleSubmit() { - let fileFlag + let fileFlag = true this.dataList.forEach(item => { if(!item.fileType){ fileFlag = false From c31ce50bf3d3f68f1717028a1ae0ca75d92acbf5 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, 30 Nov 2021 09:59:30 +0800 Subject: [PATCH 02/11] commit --- src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index a66f721c1..90edd8a9d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -404,8 +404,6 @@ export default { this.listForm.children = dataListChildren; this.listForm.dataList = this.dataList; const json = JSON.stringify(this.listForm); - console.log(json); - return; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, From a2c4aa930951db59308699d170ebcaeddf0fab47 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, 30 Nov 2021 10:33:26 +0800 Subject: [PATCH 03/11] commit --- .../pages/creatProcess/xmpg2/step5.vue | 147 +++++++++--------- 1 file changed, 77 insertions(+), 70 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 90edd8a9d..ff2a30683 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -421,7 +421,6 @@ export default { }, //批量分发按钮 choiceZRRS(row, type, index) { - console.log(row); this.selectedId = row.id || row.standId; this.type = type; if (type === 1) { @@ -429,13 +428,20 @@ export default { this.nodeList = []; this.zrIndex = index; this.zrType = type; - this.nodeList.push(row); + if (row.workPeopleId) { + this.nodeList = row.workPeopleId.split(","); + }else{ + this.nodeList.push(row); + } this.modalshowflag = true; } else if (type === 2) { // 批量 if (this.selectList.length > 0) { this.zrType = type; this.nodeList = []; + if (row.workPeopleId) { + this.nodeList = row.workPeopleId.split(","); + } this.modalshowflag = true; this.drawerTitle = "批量选择责任人"; } else { @@ -461,6 +467,75 @@ export default { } }, + checkedRole(data) { + console.log(data); + var idList = ""; + var nameList = ""; + data.forEach(item => { + if (nameList.length > 0) { + nameList += ","; + idList += ","; + } + idList += item.id; + nameList += item.name; + }); + //单选操作 + if (this.type === 1) { + this.dataList.forEach(item => { + if(item.standId === this.selectedId){ + item.workPeople = nameList || '请选择责任人' + item.workPeopleId = idList; + } + if (item.children) { + item.children.forEach(items => { + if (items.id === this.selectedId) { + items.workPeople = nameList; + items.workPeopleId = idList; + // this.$set(items,'workPeople',data[0].name) + //this.$set(items,'workPeopleId',data[0].id) + } + }); + } + }); + this.dataList = JSON.parse(JSON.stringify(this.dataList)); + } else if (this.type === 2) { + this.selectList.forEach(item => { + this.dataList.map(items => { + if (item.standId === items.standId) { + items.workPeople = nameList || '请选择责任人' + items.workPeopleId = idList; + // this.$message.warning('您只能针对条款进行分发') + } + if (items.children) { + items.children.map(childrenItem => { + if (childrenItem.id === item.id) { + childrenItem.workPeople = nameList; + childrenItem.workPeopleId = idList; + } + }); + } + }); + }); + this.dataList = JSON.parse(JSON.stringify(this.dataList)); + } else if (this.type === 3) { + // console.log("529",this.workPeopleList) + for (let i = 0; i < this.workPeopleList.children.length; i++) { + + this.workPeopleList.children[i].workPeople = data[0].name; + this.workPeopleList.children[i].workPeopleId = data[0].id; + // console.log(row.children[i].id) + // console.log(row.children[i].workPeople) + } + + // items.children.map(childrenItem => { + // + // childrenItem.workPeople = data[0].name; + // childrenItem.workPeopleId = data[0].id; + // }) + + } + this.modalshowflag = false; + }, setChildren(children, type) { // 编辑多个子层级 children.map(j => { @@ -541,74 +616,6 @@ export default { this.roleRow = this.$refs.tree.getCheckedNodes()[0]; } }, - checkedRole(data) { - var idList = ""; - var nameList = ""; - data.forEach(item => { - if (nameList.length > 0) { - nameList += ","; - idList += ","; - } - idList += item.id; - nameList += item.name; - }); - //单选操作 - if (this.type === 1) { - this.dataList.forEach(item => { - if(item.standId === this.selectedId){ - item.workPeople = nameList; - item.workPeopleId = idList; - } - if (item.children) { - item.children.forEach(items => { - if (items.id === this.selectedId) { - items.workPeople = nameList; - items.workPeopleId = idList; - // this.$set(items,'workPeople',data[0].name) - //this.$set(items,'workPeopleId',data[0].id) - } - }); - } - }); - this.dataList = JSON.parse(JSON.stringify(this.dataList)); - } else if (this.type === 2) { - this.selectList.forEach(item => { - this.dataList.map(items => { - if (item.standId === items.standId) { - items.workPeople = nameList; - items.workPeopleId = idList; - // this.$message.warning('您只能针对条款进行分发') - } - if (items.children) { - items.children.map(childrenItem => { - if (childrenItem.id === item.id) { - childrenItem.workPeople = nameList; - childrenItem.workPeopleId = idList; - } - }); - } - }); - }); - this.dataList = JSON.parse(JSON.stringify(this.dataList)); - } else if (this.type === 3) { - // console.log("529",this.workPeopleList) - for (let i = 0; i < this.workPeopleList.children.length; i++) { - - this.workPeopleList.children[i].workPeople = data[0].name; - this.workPeopleList.children[i].workPeopleId = data[0].id; - // console.log(row.children[i].id) - // console.log(row.children[i].workPeople) - } - - // items.children.map(childrenItem => { - // - // childrenItem.workPeople = data[0].name; - // childrenItem.workPeopleId = data[0].id; - // }) - - } - this.modalshowflag = false; - }, cancleUserInfo() { this.modalshowflag = false; } From 652ad0bc3d0404a4013f117ea151d0f2d1edbb09 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 30 Nov 2021 10:39:47 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/unqualProcess.js | 6 +- .../pages/rectificationDatabase.vue | 283 ++++++++---------- 2 files changed, 137 insertions(+), 152 deletions(-) diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index 61866c15e..c51fad700 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -63,12 +63,13 @@ export function meetingByMonth(params) { //未符合项模块新增 export function addUn( - closeState, standSerialNumber, standName, + closeState,standId, standSerialNumber, standName, itemsNum, itemsName, productType, productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime) { const data = { closeState, + standId, standSerialNumber, //标准号 standName, //标准名称 itemsNum, //条款号 @@ -92,12 +93,13 @@ export function addUn( //未符合项模块编辑 export function editUn( - closeState, standSerialNumber, standName, + closeState, standId, standSerialNumber, standName, itemsNum, itemsName, productType, productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) { const data = { closeState, + standId, standSerialNumber, //标准号 standName, //标准名称 itemsNum, //条款号 diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index a2096a542..5e800966d 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -116,6 +116,7 @@ prop="standName" fixed="left" width="180" + show-overflow-tooltip label="标准名称"> - {{ scope.row.xcxssrqgj.slice(0, 10) }} + Date: Tue, 30 Nov 2021 15:05:09 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=83=BD=E5=B8=A6=E5=85=A5=E6=8F=90=E4=BA=A4=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=92=8C=E6=94=BF=E7=AD=96=E4=BA=86=EF=BC=88=E8=83=BD=E6=9F=A5?= =?UTF-8?q?=E8=83=BD=E6=8F=90=EF=BC=8C=E7=BC=96=E8=BE=91=E5=B7=AE=E7=82=B9?= =?UTF-8?q?=E6=84=8F=E6=80=9D=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B9=9F=E4=B8=8D=E5=A4=AA=E5=85=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/projectAddEit.vue | 161 +++++++++++++----- 1 file changed, 123 insertions(+), 38 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 30f61579a..caaf87e51 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -211,7 +211,7 @@ width="180px" label="标准号"> @@ -327,7 +328,7 @@ align="center" label="标准号"> - {{ scope.row.zccssrqgj.slice(0, 10) }} + - {{ scope.row.xcxssrqgj.slice(0, 10) }} + { - this.sarAccessInfoSearchList = res.data.list + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){ + StandardsInfoPage(this.sarAccessInfoSearch).then(res => { + this.sarAccessInfoSearchList = res.data.list - //为空转换 - for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) { - //适用车型为空 - if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){ - this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null + //为空转换 + for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) { + //适用车型为空 + if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){ + this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null + } + //适用认证为空 + if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){ + this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null + } } - //适用认证为空 - if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){ - this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null - } - } - this.sarAccessInfoSearchList.forEach(item => { - if (item.standYear === null) { - item.standNumber = item.standSortShow + ' ' + item.standNumber - } else { - item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear - } - this.addWord(item) + this.sarAccessInfoSearchList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + this.addWord(item) + }) + this.changeText(this.sarAccessInfoSearchList) + this.drawerTotal = res.data.count + }, e => { }) - this.changeText(this.sarAccessInfoSearchList) - this.drawerTotal = res.data.count - }, e => { - }) + }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){ + this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, { + _this: this, + }, res => { + console.log('1640',res) + this.sarAccessInfoSearchList = res.data.list + }, e => { + }) + }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){ + this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, { + _this: this, + }, res => { + console.log('1648',res) + this.sarAccessInfoSearchList = res.data.list + }, e => { + }) + } }, // 查询按钮 selectLawsStands() { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { this.sarAccessInfoSearch.standType = 'INLAND' this.pageInfo() - } else { + } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') { this.sarAccessInfoSearch.standType = 'FOREIGN' this.pageInfo() + }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') { + this.sarAccessInfoSearch.standType = 'LAWS' + this.pageInfo() + }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') { + this.sarAccessInfoSearch.standType = 'BUSINESS' + this.pageInfo() } }, /** 高级查询查询按钮*/ @@ -1608,7 +1693,7 @@ export default { }, // 数据搜索table判断checked状态 selectable(row) { - return row.isRelateAccess === '1' + return row.isRelateAccess === '1' || row.isRelateAccess === undefined }, // 数据搜索 table select事件 sarAccessInfoSearchSelect(val) { From e7c41ca5a8309a99f3f3afb656ae7cbee3f9510d Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 30 Nov 2021 15:15:16 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=83=BD=E5=B8=A6=E5=85=A5=E6=8F=90=E4=BA=A4=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=92=8C=E6=94=BF=E7=AD=96=E4=BA=86=EF=BC=88=E8=83=BD=E6=9F=A5?= =?UTF-8?q?=E8=83=BD=E6=8F=90=EF=BC=8C=E7=BC=96=E8=BE=91=E5=B7=AE=E7=82=B9?= =?UTF-8?q?=E6=84=8F=E6=80=9D=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B9=9F=E4=B8=8D=E5=A4=AA=E5=85=A8=EF=BC=8C=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E6=9F=A5=E8=AF=A2=E4=B9=9F=E4=B8=8D=E8=A1=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/otherAddEit.vue | 193 +++++++++++++----- 1 file changed, 139 insertions(+), 54 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 02abd1b61..9e06b7c04 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -166,7 +166,7 @@ align="center" label="标准号"> @@ -269,7 +270,7 @@ fixed="left" label="标准号"> - {{ scope.row.zccssrqgj.slice(0,10) }} + - {{ scope.row.xcxssrqgj.slice(0,10) }} + { - this.sarAccessInfoSearchList = res.data.list - this.sarAccessInfoSearchList.forEach(item => { - if (item.standYear === null) { - item.standNumber = item.standSortShow + ' ' + item.standNumber - } else { - item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear - } - if (item.attrInfoMap === null) { - this.$set(item, 'zccssrqgj', '') - this.$set(item, 'xcxssrqgj', '') - this.$set(item, 'ssrq', '') - this.$set(item, 'sycpx', '') - this.$set(item, 'typeApplicable', '') - this.$set(item, 'nylx', '') - this.$set(item, 'zrbm', '') - this.$set(item, 'cycvppsbm', '') - this.$set(item, 'cycvppscn', '') - this.$set(item, 'kccvppsbm', '') - this.$set(item, 'kccvppscn', '') - }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) - this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) - this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) - this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) - this.$set(item, 'nylx', item.attrInfoMap.NYLX) - this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) - this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) - this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) - this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) - this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) - } + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') { + StandardsInfoPage(this.sarAccessInfoSearch).then(res => { + this.sarAccessInfoSearchList = res.data.list + this.sarAccessInfoSearchList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + if (item.attrInfoMap === null) { + this.$set(item, 'zccssrqgj', '') + this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') + this.$set(item, 'sycpx', '') + this.$set(item, 'typeApplicable', '') + this.$set(item, 'nylx', '') + this.$set(item, 'zrbm', '') + this.$set(item, 'cycvppsbm', '') + this.$set(item, 'cycvppscn', '') + this.$set(item, 'kccvppsbm', '') + this.$set(item, 'kccvppscn', '') + } else { + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + } + }) + this.drawerTotal = res.data.count + }, e => { }) - this.drawerTotal = res.data.count - }, e => { - }) + }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){ + this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, { + _this: this, + }, res => { + console.log('1640',res) + this.sarAccessInfoSearchList = res.data.list + }, e => { + }) + }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){ + this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, { + _this: this, + }, res => { + console.log('1648',res) + this.sarAccessInfoSearchList = res.data.list + }, e => { + }) + } }, // 查询数据搜索 table 数据 selectLawsStands () { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { this.sarAccessInfoSearch.standType = 'INLAND' this.pageInfo() - } else { + } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') { this.sarAccessInfoSearch.standType = 'FOREIGN' this.pageInfo() + }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') { + this.sarAccessInfoSearch.standType = 'LAWS' + this.pageInfo() + }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') { + this.sarAccessInfoSearch.standType = 'BUSINESS' + this.pageInfo() } }, selectPage() { @@ -1532,7 +1617,7 @@ export default { }, // 数据搜索table判断checked状态 selectable (row) { - return row.isRelateAccess === '1' + return row.isRelateAccess === '1' || row.isRelateAccess === undefined }, // 数据搜索 table select事件 sarAccessInfoSearchSelect (val) { From 4b43026ea6e6edf52f720a81f89496c2ecafa0b5 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 30 Nov 2021 15:19:00 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=B8=89=E4=B8=AA=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 10 ++++++++-- .../pages/otherAddEit.vue | 10 ++++++++-- .../pages/projectAddEit.vue | 12 +++++++++--- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 8c06b1097..8d4c98fe5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1713,9 +1713,15 @@ export default { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { this.sarAccessInfoSearch.standType = 'INLAND' this.selectPage() - } else { + } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') { this.sarAccessInfoSearch.standType = 'FOREIGN' - this.selectPage() + this.pageInfo() + }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') { + this.sarAccessInfoSearch.standType = 'LAWS' + this.pageInfo() + }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') { + this.sarAccessInfoSearch.standType = 'BUSINESS' + this.pageInfo() } }, // 数据搜索table判断checked状态 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 9e06b7c04..0356caf9e 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1610,9 +1610,15 @@ export default { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { this.sarAccessInfoSearch.standType = 'INLAND' this.selectPage() - } else { + } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') { this.sarAccessInfoSearch.standType = 'FOREIGN' - this.selectPage() + this.pageInfo() + }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') { + this.sarAccessInfoSearch.standType = 'LAWS' + this.pageInfo() + }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') { + this.sarAccessInfoSearch.standType = 'BUSINESS' + this.pageInfo() } }, // 数据搜索table判断checked状态 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index caaf87e51..8d325ec78 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1686,9 +1686,15 @@ export default { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { this.sarAccessInfo.standType = 'INLAND' this.selectPage() - } else { - this.sarAccessInfo.standType = 'FOREIGN' - this.selectPage() + } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') { + this.sarAccessInfoSearch.standType = 'FOREIGN' + this.pageInfo() + }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') { + this.sarAccessInfoSearch.standType = 'LAWS' + this.pageInfo() + }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') { + this.sarAccessInfoSearch.standType = 'BUSINESS' + this.pageInfo() } }, // 数据搜索table判断checked状态