From c35c73701bdbb2e79701ab73dbb7579d9332d4d1 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 13 Oct 2021 16:00:56 +0800
Subject: [PATCH 1/2] commit

---
 src/assets/styles/newStyle.less                           | 3 +++
 src/pages/processCenter/pages/creatProcess/bzdy/step1.vue | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less
index d2d4354f1..d5e16a9ed 100644
--- a/src/assets/styles/newStyle.less
+++ b/src/assets/styles/newStyle.less
@@ -445,6 +445,9 @@ tr.el-table__row{
 .el-table th>.cell {
   font-size: 14px;
 }
+.el-table td>.cell {
+  font-size: 12px;
+}
 .el-table th.gutter{
   display: table-cell !important;
 }
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index f2e0ffd6e..b3dde6259 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -436,6 +436,8 @@ export default {
           message: response.message,
           type: 'success'
         })
+      } else {
+        this.$message.error('程序异常，上传失败')
       }
     },
     importFileSuccess2 (response, file) {
@@ -456,6 +458,8 @@ export default {
           message: response.message,
           type: 'success'
         })
+      } else {
+        this.$message.error('程序异常，上传失败')
       }
     },
     fileUpload () {

From 8cb45eae57b7913c7659eecaa6c4ec7f1cf824c1 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, 13 Oct 2021 16:28:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8C=89=E9=92=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/components/ProcessFooter.vue              | 13 +++++++++++++
 .../processCenter/pages/creatProcess/xmpg/step7.vue |  2 +-
 .../pages/creatProcess/xmqdqr/step2.vue             |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index e5ecd16c3..33376f829 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -102,6 +102,15 @@
         :loading="submitLoading"
         v-if="showConfirm"
       >接收待办</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        class="common-button-primary"
+        icon="el-icon-check"
+        @click="handleSubmit"
+        :loading="submitLoading"
+        v-if="showAffirm"
+      >确认</el-button>
     </div>
 
     <!-- 组织机构树 -->
@@ -179,6 +188,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showAffirm: {
+      type: Boolean,
+      default: false
+    },
     showConfirm: {
       type: Boolean,
       default: false
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index f75c4c94e..3de594499 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -4,7 +4,7 @@
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程</template>
       <template slot="proNode">标准法规部领导审批</template>
-    </ProcessHeader>xmpgStep7
+    </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index 18d6126a9..c22bc45d2 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -384,7 +384,7 @@
     <ProcessFooter
       show-save
       show-transfer
-      show-confirm
+      show-affirm
       :submitLoading="isSubmit"
       :transfer-loading="isTransfer"
       :saveLoading="saveLoading"