From 3b36ebdc79f7d2e0e0e7cac8356e4b47a1f45d2c Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 30 Aug 2021 15:25:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C--=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=20=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E9=87=8C=E9=9D=A2=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=E6=A0=87=E5=87=86=E5=8F=B7/?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=92=8C=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E7=AB=A0=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 42 +++++++++++++++---- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 53b6bf83e..10d2c6945 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -108,13 +108,27 @@ >
-
-
+
+
- + + + + + + + @@ -230,7 +244,12 @@ name: "technologyInvolveProject", pageSize: this.$store.getters.userInfo.configContent, showSarProStateModal: false, sarProStateEO: { - productName: '' + //标准编号 + standNumber: '', + //标准名称 + standName: '', + //具体章条 + specificItem: '', }, sarProStateTotal: 0, sarProStateTotalPage: 1, @@ -306,11 +325,15 @@ name: "technologyInvolveProject", this.showSarProStateModal = true }, // 查询项目数据 clearSearchProState () { - this.sarProStateEO.productName = '' + this.sarProStateEO.standNumber = '' + this.sarProStateEO.standName = '' + this.sarProStateEO.specificItem = '' this.querySarProStateZero() }, // 清空条件查询 clearSearchPro () { - this.sarProStateEO.productName = '' + this.sarProStateEO.standNumber = '' + this.sarProStateEO.standName = '' + this.sarProStateEO.specificItem = '' this.showSarProStateModal = false }, // 关闭查看事件 pageProStateChange (page) { @@ -368,5 +391,8 @@ name: "technologyInvolveProject", .search-area .search-item .el-input--suffix .el-input__inner{ padding-right: 15px; } + .search-area-detail .el-input__inner{ + width: 150px; + } } From ebe387e93261d902ec6669ac04227d72e6fc3124 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 30 Aug 2021 15:32:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=EF=BC=8C=E8=BD=A6=E5=BA=93?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/roleManage/index.vue | 1306 +++++++++-------- .../pages/details.vue | 6 +- 2 files changed, 710 insertions(+), 602 deletions(-) diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index fb9f602a5..022c01a12 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -1,624 +1,732 @@ diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index dda9cc87c..0256f9035 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -39,9 +39,9 @@
- 调取 - 批量删除 - + + + Date: Mon, 30 Aug 2021 16:36:52 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=9B=BD=E5=A4=96=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=99=AE=E9=80=9A=E6=9F=A5=E8=AF=A2=E6=B8=85=E7=A9=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 3ee6d83d5..c1acaa477 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2613,6 +2613,13 @@ export default { }, // 清空搜索框 clearAllSearch (flag) { + if (flag==='standCommonlySearch'){ + this.standCommonlySearch.standNumber=''; + this.standCommonlySearch.standSort=''; + this.standCommonlySearch.page=1; + + } + this.getDomesticStandardTable(this.standCommonlySearch) if (flag === 'sarStandardsSearch') { this.sarStandardsSearch.standSort = '' From 9e729793e3921b123ce8119283a0780a5476d0f5 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 30 Aug 2021 16:48:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/roleManage/index.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 022c01a12..b8c79cdbc 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -471,7 +471,6 @@ export default { if (selected !== -1) { // 子节点只要被选中父节点就被选中 this.selectedParent(currentObj) - this.selectedParent2(currentObj) // 统一处理子节点为相同的勾选状态 this.uniteChildSame(currentObj, true) } else { @@ -483,8 +482,7 @@ export default { }, // 统一处理子节点为相同的勾选状态 uniteChildSame(treeList, isSelected) { - // this.$refs.tree3.setChecked(treeList.id, isSelected) - this.$refs.tree2.setChecked(treeList.id, isSelected) + this.$refs.tree3.setChecked(treeList.id, isSelected) for (let i = 0; i < treeList.children.length; i++) { this.uniteChildSame(treeList.children[i], isSelected) } From 12371449b844a4d605b6c535d5f07096c0a4c7b5 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 30 Aug 2021 17:56:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6--?= =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standardWarning.vue | 73 +++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 5 deletions(-) diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 59df5b758..471eb3411 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -11,25 +11,51 @@
实施预警
+ + + + + + + + + + + + + 查询 + + + 清空
- + 新车型实施日期预警 { @@ -567,6 +607,19 @@ export default { console.log(e) }) }, + clearBtnClick() { + this.dynamic = { + //标准编号 + standCode: "", + //标准名称 + standName: "", + //实施日期 + putTime: "", + //适用车型 + applyType: "", + } + this.searchBtnClick() + }, //取消预警 cancelWarning (index, row) { console.log(index, row) @@ -882,6 +935,16 @@ export default { } .more { + + /deep/ .el-input__inner { + width: 155px; + } + .choose-time-area { + /deep/ .el-input__inner { + width: 220px; + } + } + cursor: pointer; color: #12508e; position: absolute;