From ff5a750abd79ea084362dea64057fcc30026ac82 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 24 Apr 2023 16:04:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataCenter/dataCenterDetail.vue | 18 ++++++++++++++++-- .../regulatoryRepository/dataCenter/index.vue | 8 ++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue index 1e1548d27..0b2766bac 100644 --- a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue +++ b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue @@ -37,6 +37,13 @@ class="icon-download" v-btn-permission="'85f32cb652c38e39c84e4507cc2955c2'" /> + @@ -59,7 +66,8 @@ export default { return { detailInfoForm: {}, detailInfoId: '', - fileList: [] + fileList: [], + isTemplate: false } }, methods: { @@ -130,11 +138,17 @@ export default { }, e => { }); }, - + verifyTemplate(){ + const id = this.$route.query.treeId + this.$http._getData('/fileMaterialCenter/zlTree/getMoBan',{ id }).then(res => { + this.isTemplate = res.data + }) + } }, created() { this.detailInfoId = this.$route.query.id console.log('13', this.$route.query.id) + this.verifyTemplate() }, mounted() { let fileId diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue index 87b061952..d3e63afda 100644 --- a/src/pages/regulatoryRepository/dataCenter/index.vue +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -492,7 +492,8 @@ export default { ] }, productModal: false, - productTitle: '' + productTitle: '', + treeId: '', } }, methods: { @@ -601,6 +602,7 @@ export default { } if(list1.length > 0){ this.treeList = list1 + this.treeId = this.treeList[0].id } }, treeClick(treeNode,a,b) { @@ -610,6 +612,7 @@ export default { this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id this.attributeEO.treeName = treeNode.name this.searchInfo() + this.treeId = treeNode.id }, selectTreeClick(treeNode) { this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id @@ -780,7 +783,8 @@ export default { this.$router.push({ name: "dataCenterDetail", query: { - id: row.id + id: row.id, + treeId: this.treeId } }); }, From 30ec804094644bfacb057e15704d19315f2f2a99 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 24 Apr 2023 16:25:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E6=B1=87=E6=80=BB-=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E7=90=86=E7=94=B1=E6=94=B9=E4=B8=BA=E7=90=86=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbfs/common/formList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue index c26d83e77..4de6ebf4e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue @@ -490,12 +490,12 @@ - + From b887e3253bb881af19a988252aeba5b2c42ed9d8 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 24 Apr 2023 16:31:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E8=AE=A1=E5=88=92-=E6=B7=BB=E5=8A=A0=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 336365e53..25487e49c 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1535,6 +1535,12 @@ {{ scope.row.standCode }} + + + Date: Mon, 24 Apr 2023 16:49:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/dataCenter/dataCenterDetail.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue index 0b2766bac..b1f060d83 100644 --- a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue +++ b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue @@ -141,7 +141,9 @@ export default { verifyTemplate(){ const id = this.$route.query.treeId this.$http._getData('/fileMaterialCenter/zlTree/getMoBan',{ id }).then(res => { - this.isTemplate = res.data + if(res.data){ + this.isTemplate = res.data.data + } }) } }, From 5c282797c470d34e18ef7d1e3da109d3c6e6d238 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 24 Apr 2023 17:03:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfs/step1.vue | 18 ++++++++++++++++++ .../components/EnterpriseStandardDatabase.vue | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 1baee681f..ade3fe271 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -526,6 +526,20 @@ value-format="yyyy-MM-dd" clearable> + + + + + + + + + + + +