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] =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=96=87=E4=BB=B6=E5=9B=9E?=
=?UTF-8?q?=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 @@
海外标准入库
-
+
-
+