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

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

@@ -1259,6 +1259,7 @@ export default {
         this.form.zrgcs = "";
       }
       this.form.menuIds = this.form.treeListId;
+      this.form.BBFDTBZ = this.form.bfbdtbzh
       const json = JSON.stringify(this.form);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -216,13 +216,6 @@
                     <el-option label="修订" value="修订"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="qbfsForm.rqbName"
-                    placeholder="请输入代替企标编号"
-                    :maxlength="500"/>
-                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
                     type="primary"

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -232,13 +232,6 @@
                    <el-option label="修订" value="修订"></el-option>
                  </el-select>
                </el-form-item>
-               <el-form-item v-if="qbfsForm.reviseStatus === '修订'"  label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-                 <el-input
-                   disabled
-                   v-model="qbfsForm.rqbName"
-                   placeholder="请输入代替企标编号"
-                   :maxlength="500"/>
-               </el-form-item>
                <el-form-item class="search-item btn-box">
                  <el-button
                    type="primary"

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -223,13 +223,6 @@
                     <el-option label="修订" value="修订"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="qbfsForm.rqbName"
-                    placeholder="请输入代替企标编号"
-                    :maxlength="500"/>
-                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
                     type="primary"