Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue

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;
 }

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

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 () {

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>

src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue

@@ -384,6 +384,7 @@
     <ProcessFooter
       show-save
       show-transfer
+      show-affirm
       show-confirm
       :show-submit="submitShow"
       :show-confirm="acceptShow"