From 8ef4d8271d9bbf5f2168bab3338138219f68c2f9 Mon Sep 17 00:00:00 2001
From: zhaoxianhui <1994861028@qq.com>
Date: Wed, 6 Jul 2022 10:15:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
=?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=20=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E6=97=B6=20=E6=89=8B?=
=?UTF-8?q?=E6=9C=BA=E7=AB=AF=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=A4=9A=E5=87=BA?=
=?UTF-8?q?=E7=9A=84=E5=AD=97=E7=AC=A6Bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../processCenter/pages/phone/bzrk/step2.vue | 32 ++++++++++---------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index 74fa39027..8f470ede8 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -53,12 +53,7 @@
-
+ {{form.standName}}
-
+ {{form.standEnName}}
@@ -369,7 +359,10 @@
关联信息
-
+
+
+ {{form.dtbjh}}
+
@@ -384,8 +377,14 @@
-
-
+
+
+ {{form.cbbh}}
+
+
+
+ {{form.yybj}}
+
@@ -1052,4 +1051,7 @@ export default {
line-height: 22px !important;
}
}
+.wrap{
+ white-space:normal;
+}
From b4f857863b49309cc244ffe4ffc6002b767f34d9 Mon Sep 17 00:00:00 2001
From: zhaoxianhui <1994861028@qq.com>
Date: Wed, 6 Jul 2022 10:45:04 +0800
Subject: [PATCH 2/3] =?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=E6=89=B9=E5=87=86?=
=?UTF-8?q?=E8=8A=82=E7=82=B9=20=E7=BC=BA=E5=B0=91=E8=B0=83=E7=A0=94?=
=?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=92=8C=E7=9B=B8=E5=85=B3=E9=99=84=E4=BB=B6?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../processCenter/pages/phone/bzdy/step9.vue | 29 +++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue
index b84236e39..691171e79 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue
@@ -3,7 +3,7 @@
标准调研流程
批准
-
+
+
+
+
+ - -
+
+
+
+
+
+ - -
+
+
隐藏基础信息
@@ -136,7 +156,9 @@
date: '', // 完成时间
hzfileId: '',
hzfileName: '',
- textsh: ''
+ textsh: '',
+ modelList:[], //调研模板
+ fjList:[] //相关附件
},
formRules: {
textsh: [
@@ -292,10 +314,13 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ console.log(data)
this.commentText9 = data.commentText9 || ''
this.form.processName = data.form ? data.form.processName : data.processName
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
+ this.form.modelList = data.modelList
+ this.form.fjList =data.fjList
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
From bbb008e692c90df6dbba497133fef6972a3830ba Mon Sep 17 00:00:00 2001
From: zhaoxianhui <1994861028@qq.com>
Date: Wed, 6 Jul 2022 14:44:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=9A=90=E8=97=8FBUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/navMenu/index.vue | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 3fbdc9c8b..8827ed2a8 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -399,11 +399,11 @@
// path: '/convertDocView',
// menuId: '3F52K25546'
// },
- {
- title: '菜单管理',
- path: '/menuManage',
- menuId: '87b8b4f5817a7829696e63185c744d52'
- },
+ // {
+ // title: '菜单管理',
+ // path: '/menuManage',
+ // menuId: '87b8b4f5817a7829696e63185c744d52'
+ // },
{
title: '链接管理',
path: '/linkManage',