From a6cac32ba5801059af15344490f8c72f26f710db Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Thu, 30 Jun 2022 16:10:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056155=20=E8=B0=83?= =?UTF-8?q?=E7=A0=94=E6=B5=81=E7=A8=8B=20=E6=B5=81=E7=A8=8B=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E8=BF=9B=E5=8E=BB=E7=9A=84=E6=9F=A5=E7=9C=8B=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=95=B0=E6=8D=AE=20=E7=BC=BA=E5=B0=91=E8=B0=83?= =?UTF-8?q?=E7=A0=94=E6=A8=A1=E6=9D=BF=E5=AD=97=E6=AE=B5=E5=92=8C=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=99=84=E4=BB=B6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step9.vue | 45 ++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 4afbccc7f..84aa9df3e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -63,6 +63,38 @@ - - + +
+
+ {{ item.name }} + +
+
+
+ - - +
+ + +
+
+ {{ item.name }} + +
+
+
+ - - +
+ @@ -263,7 +295,9 @@ date: '', // 完成时间 hzfileId: '', hzfileName: '', - textpz: '' + textpz: '', + modelList:[], + fjList: [] }, formRules: { textpz: [ @@ -285,6 +319,10 @@ const attId = file this.$preview(attId) }, + clickButtonToUpload(file) { + const attId = file.attId + this.$preview(attId) + }, handleTransfer() { this.drawerModal = true }, @@ -331,6 +369,10 @@ updateFile (fileId) { window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId }, + updateFile2 (item) { + let id = item.id + window.location.href = '/api/att/attFile/downloadFile?fileId=' + id + }, // 导入按钮 上传之前的钩子 beginImportFile (file) { var filename = file.name @@ -428,6 +470,7 @@ this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName this.commentText9 = data.commentText9 || '' + this.form.modelList = data.form ? data.form.modelList : data.modelList }).catch(e => { }) }) From af170a5fe86f36554505f126763c7524b291c954 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Thu, 30 Jun 2022 16:20:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055717=20=E3=80=90WE?= =?UTF-8?q?LINK=E3=80=91=E5=AE=A1=E6=A0=B82=E8=8A=82=E7=82=B9=E6=94=B6?= =?UTF-8?q?=E5=88=B0=E5=AE=A1=E6=89=B9=E4=BA=86=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=90=8E=E6=8F=90=E7=A4=BA=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=89=8B=E6=9C=BA=E6=93=8D=E4=BD=9C=EF=BC=8C=E8=85=BE?= =?UTF-8?q?=E8=AE=AF=E6=96=87=E6=A1=A3=E4=B8=AD=E5=86=99=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=98=AF=E6=94=AF=E6=8C=81=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/bzpg/step6.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/phone/bzpg/step6.vue b/src/pages/processCenter/pages/phone/bzpg/step6.vue index 47aad5c0b..57246fc43 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step6.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step6.vue @@ -2,7 +2,7 @@
- +
基础信息
From 0f43773caf6ffd6832b95997bf1fb029fdb30a87 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Thu, 30 Jun 2022 17:10:45 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E4=B8=AD=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B9=B4=E4=BB=BD=E6=98=BE=E7=A4=BA=E6=A8=AA?= =?UTF-8?q?=E7=BA=BF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 399185dba..ffc259728 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -197,19 +197,24 @@ width="150" > Date: Thu, 30 Jun 2022 17:20:02 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E4=B8=AD=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B9=B4=E4=BB=BD=E6=98=BE=E7=A4=BA=E6=A8=AA?= =?UTF-8?q?=E7=BA=BF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index ffc259728..1067b3dae 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -203,6 +203,9 @@ {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} + + {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} + {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} @@ -212,6 +215,9 @@ {{ scope.row.standSortShow }} {{ scope.row.standNumber }} + + {{ scope.row.standSortShow }} {{ scope.row.standNumber }} + {{ scope.row.standSortShow }} {{ scope.row.standNumber }} From ded47baeea094f4bff44749f38f9a655fb66fe93 Mon Sep 17 00:00:00 2001 From: zyd Date: Thu, 30 Jun 2022 17:43:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 1067b3dae..192491223 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -236,6 +236,9 @@ {{ scope.row.standName }} + {{ + scope.row.standName + }} {{ scope.row.standName }} @@ -254,6 +257,9 @@ {{ scope.row.standEnName }} + {{ + scope.row.standEnName + }} {{ scope.row.standEnName }} @@ -271,6 +277,9 @@
{{ formatIssueDate(scope.row.issueTime) }}
+
+ {{ formatIssueDate(scope.row.issueTime) }} +
{{ formatIssueDate(scope.row.issueTime) }}
@@ -288,6 +297,9 @@ {{ scope.row.SSRQ }} + {{ + scope.row.SSRQ + }} {{ scope.row.SSRQ }} @@ -303,6 +315,9 @@ {{ scope.row.XCXSSRQ }} + {{ + scope.row.XCXSSRQ + }} {{ scope.row.XCXSSRQ }} @@ -319,6 +334,9 @@ {{ scope.row.ZCCSSRQ }} + {{ + scope.row.ZCCSSRQ + }} {{ scope.row.ZCCSSRQ }} @@ -340,6 +358,9 @@ {{ textStatusMap[scope.row.textStatus] }} + {{ + textStatusMap[scope.row.textStatus] + }} {{ textStatusMap[scope.row.textStatus] }} From cd442b280fa909fe6b0359ca2146df5c5b9f52e1 Mon Sep 17 00:00:00 2001 From: zhaoxianhui <1994861028@qq.com> Date: Fri, 1 Jul 2022 13:42:18 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90WELINK=E3=80=91=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=86=E5=8F=91=E8=8A=82=E7=82=B9=20=E8=BD=AC=E5=8A=9E?= =?UTF-8?q?=E5=90=8E=20=E9=A1=B5=E9=9D=A2=E6=B2=A1=E9=80=80=E5=9B=9EBug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/bzdy/step2.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/processCenter/pages/phone/bzdy/step2.vue b/src/pages/processCenter/pages/phone/bzdy/step2.vue index d3882d6dc..405de4a03 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step2.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step2.vue @@ -108,6 +108,7 @@ import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process' + import hwh5 from '@/api/hwh5-cloudonline.js' import axios from "axios"; export default { @@ -170,6 +171,7 @@ this.drawerModal = false this.$message.success('调整成功') this.processNum() + hwh5.close() this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { this.$message.warning(res.message) @@ -258,6 +260,7 @@ }, {}, res => { if (res.success) { this.$message.success('提交成功') + hwh5.close() this.$router.push('/processCenter') } this.isSubmit = false