From e6adccc0e43b9167c5a0ebd9661670ae0c6bdb80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 6 Apr 2022 11:03:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue    | 2 +-
 .../pages/creatProcess/qbzxdjhgk/component/establish.vue       | 3 ++-
 .../pages/creatProcess/qbzxdjhgk/component/merge.vue           | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index eb0a73603..222a4795c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -702,7 +702,7 @@ export default {
             this.acceptShow = false
             this.submitShow = true
           }
-          this.commentText4 = data.commentText4 || ''
+          this.commentText4 = data.commentText || data.commentText4 || ''
           this.form.fjList = data.fjList || data.form.fjList
           this.form.spId = data.form ? data.form.spId :  ''
           this.form.spName = data.form ? data.form.spName :  ''
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 7e29e5222..e7bc44a9c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -275,7 +275,7 @@
         </div>
         <div class="demo-drawer-footer">
           <el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
-          <el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
+          <el-button type="primary" size="mini" @click="QYBZenterDrawer">带入</el-button>
         </div>
       </div>
     </el-drawer>
@@ -727,6 +727,7 @@ export default {
       this.QYBZmodal = true
     },
     QYBZcloseDrawer () {
+      this.QYBZmodal = false
       this.clearQYBZ()
     },
     QYBZenterDrawer () {
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 995b7c792..b8b7ee587 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -428,7 +428,7 @@
         </div>
         <div class="demo-drawer-footer">
           <el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
-          <el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
+          <el-button type="primary" size="mini" @click="QYBZenterDrawer">带入</el-button>
         </div>
       </div>
     </el-drawer>
@@ -843,6 +843,7 @@ export default {
       this.QYBZmodal = true
     },
     QYBZcloseDrawer () {
+      this.QYBZmodal = false
       this.clearQYBZ()
     },
     QYBZenterDrawer () {