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

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

@@ -23,7 +23,7 @@
              ></el-input>
            </el-form-item>
            <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-             <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+             <el-select disabled v-model="qbfsForm.bussSort" filterable placeholder="请选择企标类别" style="width: 100%;">
                <el-option
                  v-for="(item, index) in standSortOptions"
                  :key="index"
@@ -497,7 +497,7 @@ export default {
         }
         this.qbfsForm.rqbName = this.selectList[0].rqbName
         this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
-        this.qbfsForm.isRelate = this.selectList[0].isRelate
+        this.qbfsForm.isRelate = this.selectList[0].isRelate.indexOf("null") !== -1 ? "":this.selectList[0].isRelate
         this.qbfsForm.useLevel = this.selectList[0].useLevel
         this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
         this.qbfsForm.technologic = this.selectList[0].technologic