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

src/pages/processCenter/pages/creatProcess/bzpg/step1.vue

@@ -528,6 +528,7 @@ export default {
       // 查询相关参数
       searching: false,
       fileType: "",
+      subFlag: 0,
       projectSearch: {
         managementHostName: "", //管理主体
         developmentHostName: "", //开发主体
@@ -847,8 +848,13 @@ export default {
           this.projectList.forEach(items => {
             if(!proData.includes(items.projectGroup)){
               this.dataList.push(items)
+            }else{
+              this.subFlag++
             }
           })
+          if(this.subFlag > 0){
+            this.$message.warning('请勿重复添加数据')
+          }
         }else{
           this.dataList = this.projectList
         }

src/pages/processCenter/pages/phone/qbfz/step5.vue

@@ -11,6 +11,7 @@
     <div class="content" v-show="active === '1'">
       <div style="overflow: auto;">
         <el-form
+          ref="qbfsForm"
           :model="qbfsForm"
           class="label-input-form"
           :rules="formRules"

src/pages/processCenter/pages/phone/qbfz/step6.vue

@@ -11,6 +11,7 @@
     <div class="content" v-show="active === '1'">
       <div style="overflow: auto;">
         <el-form
+          ref="qbfsForm"
           :model="qbfsForm"
           class="label-input-form"
           :rules="formRules"

src/pages/processCenter/pages/phone/qbfz/step7.vue

@@ -11,6 +11,7 @@
     <div class="content" v-show="active === '1'">
       <div style="overflow: auto;">
         <el-form
+          ref="qbfsForm"
           :model="qbfsForm"
           class="label-input-form"
           :rules="formRules"