From 303836eac5fdaa6bb1bf3e6d8571632f0004ca2d Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 7 Sep 2021 14:27:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index be621f770..28287653c 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -433,7 +433,7 @@ label="企标编号" prop="standCode" label-width="150px" - class="add-form-item form-item-disabled" + class="add-form-item" > Date: Tue, 7 Sep 2021 15:01:49 +0800 Subject: [PATCH 2/4] feat: There is no way the #47605 --- src/pages/details/otherBussStandardDetails/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 198c4c3c8..8bf10a74d 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -36,7 +36,7 @@

{{ sarStandardsInfoEO.standName || '-' }}

{{ sarStandardsInfoEO.standEnName || '-' }}

- {{ sarStandardsInfoEO.standStatusShow || '-' }}

@@ -2029,7 +2029,11 @@ export default { field['tips'] = tips } if (value && typeof value === 'number') { - value = this.$dateFormat(value, 'yyyy-MM-dd') + value = this.$moment(value).format('YYYY-MM-DD') + } + // 时间格式处理 + if (field.attrType === 'DATE_PICKER' && value) { + value = this.$moment(value).format('YYYY-MM-DD') } field['value'] = value if (field.showRegionId === location.value) { From 53b8c2657e81ea8beabe51d26e80de668615c8b0 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 7 Sep 2021 15:17:29 +0800 Subject: [PATCH 3/4] feat: There is no way the #47918 --- .../components/EnterpriseStandardDatabase.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 79f359ad7..852f35551 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -3401,10 +3401,10 @@ export default { this.SarExportSearchEo = item } // 处理我的收藏和个性化标签传参 - if (this.selectSarMenu.id === 'wdsc') { + if (this.selectSarMenu.id === 'qbwdsc') { this.sarBussionessSearch.menuId = undefined this.sarBussionessSearch.labelMenuId = undefined - this.sarBussionessSearch.collectMenuId = 'wdsc' + this.sarBussionessSearch.collectMenuId = 'qbwdsc' } else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') { this.sarBussionessSearch.menuId = undefined this.sarBussionessSearch.labelMenuId = this.selectSarMenu.id From e7153cc84776eee35657aac1cf4d86dde2b1ccbf Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 7 Sep 2021 15:33:59 +0800 Subject: [PATCH 4/4] feat: There is no way the #47887 --- .../components/EnterpriseStandardDatabase.vue | 6 ++++-- src/pages/searchCenter/pages/advancedSearch.vue | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 852f35551..8472b93f2 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1930,12 +1930,14 @@ export default { if(checkedData) { if(checkedData.length > 0){ this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",") - this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",") this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") + this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",") + this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") }else { this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code - this.sarBussionessSearch.VPPSBMBUSS = checkedData.code this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName + this.sarBussionessSearch.VPPSBMBUSS = checkedData.code + this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName } } this.modalShowFlag2 = false diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 8168842a6..fd01ef46e 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -1502,8 +1502,10 @@ export default { if(checkedData) { if(checkedData.length > 0){ this.standForm.VPPSBMBUSS = checkedData.map(item => item.code).join(",") + this.standForm.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") }else { this.standForm.VPPSBMBUSS = checkedData.code + this.standForm.VPPSCNBUSS = checkedData.chineseName } } this.modalShowFlag2 = false