From 57bfa01e4453e3cf5efd72656e73ca53d995650d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 9 Aug 2021 11:06:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/pages/details.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index ffaa965d6..2c68a966a 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -30,7 +30,7 @@ 项目级别: {{ localProEO.projectLevel }} - 项目经理: {{ localProEO.projectManager }} + 项目经理: {{ localProEO.uname }} 项目计划开始时间: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }} 项目计划完成时间: Date: Mon, 9 Aug 2021 14:09:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84--=E5=AE=9E=E6=96=BD?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=B2=A1=E5=9B=9E=E6=98=BE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 28e1db059..0201692f1 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -190,12 +190,14 @@ @@ -3509,6 +3511,10 @@ export default { if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) { res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ } + if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) { + res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ + console.log(res.data.list[i].SSRQ); + } } this.stahndinfoList = res.data.list this.total = res.data.count From e14730c0a675dbef6c8ce70e7d77ac49ba41321a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 14:14:54 +0800 Subject: [PATCH 3/5] commit --- .../pages/creatProcess/bzdy/step2.vue | 31 ++++++++++++---- .../pages/creatProcess/bzdy/step3.vue | 35 ++++++++++++++----- .../pages/creatProcess/bzdy/step4.vue | 15 ++++---- .../pages/creatProcess/bzdy/step5.vue | 29 +++++++++++---- .../pages/creatProcess/bzdy/step6.vue | 12 +++---- .../pages/creatProcess/bzdy/step7.vue | 12 +++---- .../pages/creatProcess/bzdy/step8.vue | 12 +++---- .../pages/creatProcess/bzdy/step9.vue | 12 +++---- .../pages/creatProcess/bzjd/step2.vue | 1 - 9 files changed, 104 insertions(+), 55 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 1c406b205..842b3a8d0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -135,6 +135,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { @@ -261,11 +276,13 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.form.model = data.model - this.form.modelName = data.modelName + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.model = data.model || data.form.model + this.form.modelName = data.modelName || data.form.modelName + this.form.responUserList = data.form.responUserList + this.form.responUserListName = data.form.responUserListName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index e4b8d0b87..e3f635c75 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -147,6 +147,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { @@ -305,13 +320,15 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.form.model = data.model - this.form.modelName = data.modelName - this.form.fileName = data.fileName || '' - this.form.fileId = data.fileId || '' + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.model = data.model || data.form.model + this.form.modelName = data.modelName || data.form.modelName + this.form.responUserList = data.form.responUserList + this.form.responUserListName = data.form.responUserListName + this.form.fileName = data.form.fileName || data.fileName || '' + this.form.fileId = data.form.fileId || data.fileId || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 8cc57135e..d991f2dac 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -252,13 +252,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.form.file = data.fileId - this.form.fileName = data.fileName - this.form.model = data.model - this.form.modelName = data.modelName + console.log(data); + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.file = data.fileId || data.form.fileId + this.form.fileName = data.fileName || data.form.fileName + this.form.model = data.model || data.form.model + this.form.modelName = data.modelName || data.form.modelName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index a590d8ece..011d29d6d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -174,6 +174,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { @@ -327,12 +342,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileId = data.hzfileId - this.form.hzfileName = data.hzfileName + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index b55d1e585..3e33eac63 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 953b1085a..2d7c2e343 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index 2efa1dc5c..2942c2ccb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 7339115b3..41e534615 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 69682b390..9838e9e60 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -321,7 +321,6 @@ this.active = name }, handleSave() { - this.saveLoading = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) From 181d58e9f0eb854d12f4dd66a3310f580c339c09 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 9 Aug 2021 14:34:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?Id=EF=BC=8C=E6=A0=87=E5=87=86=E5=BA=93=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E5=8A=A0=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1.vue | 3 ++ .../pags/consultationDetails.vue | 43 +++++++++++-------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 74b330f0a..c38825090 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -282,6 +282,7 @@ export default { endTime: '', // 结束日期 cname: '', // 名称 standType: '', + standId: '', }, formRules: { cid: [ @@ -299,6 +300,7 @@ export default { standSort: '', standNumber: '', standType: '', + standId: '', page: 1, pageSize: this.$store.getters.userInfo.configContent }, @@ -456,6 +458,7 @@ export default { this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber } this.form.standType = bringData[0].standType + this.form.standId = bringData[0].id this.form.cname = bringData[0].standName; this.listModel = false; } else if (this.selectedList.length > 1) { diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 23cc1cb95..a704c9847 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -11,19 +11,27 @@

- {{ $route.query.item.cid }} + + {{ this.$route.query.item.cid }} +

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

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

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

@@ -120,6 +128,7 @@ name: 'consultationDetails', data () { return { + itemData: this.$route.query.item, id: '', // 选中id type: '', // 选中状态 spinShow: false, @@ -152,6 +161,17 @@ } }, methods: { + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'INLAND_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, exportAll () { window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid) }, @@ -166,21 +186,6 @@ } }) }, - - //点击查看 - handlePreview(data) { - console.log(data); - return - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: data.id, - pageType: data.standType - } - }); - window.open(routeUrl.href, "_blank"); - }, - // 获取详情信息列表 getList() { this.spinShow = true From 52c5ecae016e5b45930110e44296fa659f733d6c Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 9 Aug 2021 15:56:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 84fe9f31a..c26c24ebd 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -135,11 +135,11 @@ export default { // // // title: '本地产品/项目库', // // // path: '/localProductsOrProjectLibrary' // // // }, - { + /*{ title: '企业标准库', path: '/enterpriseStandardDatabase', menuId: '01ed8f752748227777b3572d56ee9ab5' - }, + },*/ // { // title: '企标制修订计划', // path: '/enterBSysRevPlanManaLib',