From b0e77dc12bbd87c90e8cd22a7a926aa2c5044727 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 17:15:16 +0800 Subject: [PATCH 1/8] commit --- .../standardForComments/pags/consultationDetails.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index a704c9847..51d0a516a 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -277,10 +277,10 @@ cid: this.$route.query.item.cid, content: this.opinionContent.content, partCode: this.opinionContent.partCode, - userId: this.$store.getters.userInfo.userId, - userName: this.$store.getters.userInfo.account, - deptName: this.$store.getters.userInfo.orgName, - deptId: this.$store.getters.userInfo.orgId + userId: this.$store.getters.userInfo.userId || '', + userName: this.$store.getters.userInfo.userName || '', + deptName: this.$store.getters.userInfo.orgName || '', + deptId: this.$store.getters.userInfo.orgId || '' } if (this.type === 'edit') { form.id = this.id From 6c9c2debef237d7e5f70886719315110efe5f9d8 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 17:15:50 +0800 Subject: [PATCH 2/8] commit --- .../standardForComments/pags/consultationDetails.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 51d0a516a..0ec0f90a7 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -193,7 +193,6 @@ _this: this }, res => { this.standinfoList = res.data.records - console.log(this.standinfoList); this.total = res.data.total this.spinShow = false }, e => { From b51e16288586f78852088e690f827d45d66a47e0 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 17:24:22 +0800 Subject: [PATCH 3/8] commit --- .../standardForComments/pags/consultationDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 0ec0f90a7..864bd9717 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -27,7 +27,7 @@

- {{ this.$route.query.item.endTime || '-' }} + {{ this.$route.query.item.startTime || '-' }}

From bb04c9b13bbbb4ffe203b5cfbae40bf9b6ab0f40 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 9 Aug 2021 17:33:49 +0800 Subject: [PATCH 4/8] feat: There is no way the --- src/pages/searchCenter/pages/advancedSearch.vue | 4 ++-- src/pages/searchCenter/pages/standardSearch.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index ffcef1be5..9b3694721 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -938,7 +938,7 @@ 查看 取消收藏 - 分享 + @@ -962,7 +962,7 @@

取消收藏 收藏 - 分享 +
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 3b70f1a4a..15040c34f 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -215,7 +215,7 @@
-
发布日期: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }}
+
发布日期11: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }}
@@ -2531,7 +2531,7 @@ //display: -webkit-box; //-webkit-line-clamp: 3; -webkit-box-orient: vertical; - max-height: 60px; + max-height: 78px; } .AllTime { margin-top: 15px; From a67e4ea1fb11b23180953f5739d85cf0e715206e Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 9 Aug 2021 17:39:16 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=83=A8=E9=97=A8=E8=BD=AC=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index de2138c64..d3f760def 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -345,21 +345,33 @@ export default { addList() { dicTypeData().then(res => { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - }) - standUnqualified(this.queryUnqualidiedData).then(res => { - this.unqualidiedData = res.data.records - this.unqualidiedData.forEach(item => { - this.$set(item,'engineer','') - this.$set(item,'engineerId','') - this.$set(item,'dutyPeopleInfo','') - this.$set(item,'dutyPeople','') - this.$set(item,'dutyPeopleInfoId','') - this.$set(item,'dutyPeopleId','') - this.$set(item,'fileText',[]) - this.$set(item,'fileTextId',[]) - this.$set(item,'fileTextPath',[]) + standUnqualified(this.queryUnqualidiedData).then(res => { + this.unqualidiedData = res.data.records + this.unqualidiedData.forEach(item => { + // 责任部门转换 + if (item.responsibleUnit !== null || item.responsibleUnit !== "") { + let k = (item.responsibleUnit || "").split(',') + for (let i in this.zrbmOptions) { + for (let m = 0; m< k.length; m++) { + if (this.zrbmOptions[i].value === k[m]) { + k[m] = this.zrbmOptions[i].label + } + item.responsibleUnit = k.join(',') + } + } + } + this.$set(item,'engineer','') + this.$set(item,'engineerId','') + this.$set(item,'dutyPeopleInfo','') + this.$set(item,'dutyPeople','') + this.$set(item,'dutyPeopleInfoId','') + this.$set(item,'dutyPeopleId','') + this.$set(item,'fileText',[]) + this.$set(item,'fileTextId',[]) + this.$set(item,'fileTextPath',[]) + }) + this.total = res.data.total }) - this.total = res.data.total }) this.standModel = true; }, From 29c631ce57cbbf638d260be16de1495fbe4bdf30 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 9 Aug 2021 18:00:56 +0800 Subject: [PATCH 6/8] feat: There is no way the --- src/pages/searchCenter/pages/advancedSearch.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 9b3694721..a4b482228 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -324,8 +324,8 @@ - - + From 499520bc4dbf3ad59d12ae04aa15e677c466669d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 9 Aug 2021 18:01:25 +0800 Subject: [PATCH 7/8] feat: There is no way the --- src/pages/searchCenter/pages/advancedSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index a4b482228..d3bdaaeb9 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -324,7 +324,7 @@ - + From a16f0524daf14092a54b08689e2e490e57e7fa48 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 18:05:18 +0800 Subject: [PATCH 8/8] commit --- .../pages/standInvolveProjectDetail.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 04bb340e5..0d07c9321 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -371,13 +371,13 @@ export default { loading: 'loading' }, res => { if (res.ok) { - res.data.records.forEach((item)=>{ - for(let key in item){ - if(item[key] == null){ - item[key]='无' - } - } - }) + // res.data.records.forEach((item)=>{ + // for(let key in item){ + // if(item[key] == null){ + // item[key]='无' + // } + // } + // }) this.sarProStateListDatas = res.data.records this.sarProStateTotal = res.data.total }