From 270fc21a0972e33cd7d603a50f141a298ae08e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 16 May 2022 14:51:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?52797=20=E3=80=90=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=EF=BC=8C=E5=88=86=E8=BE=A8=E7=8E=871920*1080,=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=9B=BE=E8=A1=A8=E4=B8=8D=E5=85=A8=20=E5=B0=BD?= =?UTF-8?q?=E9=87=8F=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index c8bc403dd..0013bbc1e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -404,7 +404,7 @@ :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
-
+
无内容
@@ -418,7 +418,7 @@
-
+
无内容
@@ -1187,7 +1187,7 @@ .itemsTextBox { min-height: 300px; - max-height: 500px; + max-height: 900px; overflow: auto; line-height: 20px; /deep/ td { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 6518e4149..95cc2f08b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -411,7 +411,7 @@ :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
-
+
无内容
@@ -425,7 +425,7 @@
-
+
无内容
@@ -1197,7 +1197,7 @@ export default { .itemsTextBox { min-height: 300px; - max-height: 500px; + max-height: 900px; overflow: auto; line-height: 20px; /deep/ td { From 240a9750506c38b91141e92ea576cfdcabeda646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 16 May 2022 16:57:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step3.vue | 1 + .../pages/creatProcess/bzdy/step4.vue | 9 ++-- .../pages/creatProcess/bzrk/step3.vue | 41 ++++++++++++------- .../pages/creatProcess/bzrk/step4.vue | 4 +- 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 7a844b5d3..ce882650e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -477,6 +477,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + console.log(data); let commitStatus = res.commitStatus if(commitStatus && commitStatus > 0){ this.acceptShow = true diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 06933383b..7d0f94a7e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -384,14 +384,15 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.dyhz = data.form ? data.form.dyhz : data.dyhz + console.log(data); + this.form.dyhz = data.dyhz || data.form.dyhz this.form.title = data.title || data.form.title this.form.processName = data.processName || data.form.processName this.form.date = data.date || data.form.date this.json = data || data.form - this.form.file = data.form ? data.form.fileId : data.fileId - this.form.fileName = data.form ? data.form.fileName : data.fileName - this.form.fileId = data.form ? data.form.fileId : data.fileId + this.form.file = data.fileId || data.form.fileId + this.form.fileName = data.fileName || data.form.fileName + this.form.fileId = data.fileId || data.form.fileId this.form.modelList = data.form ? data.form.modelList : data.modelList this.form.fjList = data.fjList || data.form.fjList this.newDocUser = data.form ? data.form.docUser : data.docUser diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index d2a819423..e06763fa3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -86,6 +86,20 @@ 否 + + + + + + + @@ -143,20 +157,6 @@ clearable > - - - - - - - @@ -499,6 +499,17 @@ > + + + + +
@@ -939,6 +950,7 @@ export default { categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 + cyzbpmOptions: [], //我司参与制标排名 wssmrOptions: [], // 我司署名人 qcdwOptions: [], // 起草单位 sycpxOptions: [], // 适用产品线 @@ -1272,6 +1284,7 @@ export default { this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 this.wssmrOptions = res.data.WSSMR // 我司署名人 this.qcdwOptions = res.data.QCDW // 起草单位 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index fc611d8e3..38da23b1e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -31,7 +31,7 @@ 海外标准入库 - + - +