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

src/pages/details/otherBussStandardDetails/index.vue

@@ -3,7 +3,7 @@
   <div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
     <!--title 标题-->
     <div class="details-header">
-      <span>{{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>
+      <span>{{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName}}》 企标详情</span>
       <b style="float:right;font-size: 25px;color: #ff9900">{{ ((qualityCommentScore*2*0.9)+(dynamicCommentScore*2*0.1)).toFixed(1) }}</b>
       <!--      之前的，先注掉-->
       <!--      <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>-->

src/pages/details/otherStandardDetails/index.vue

@@ -5,7 +5,7 @@
     <div class="details-header">
       <span v-if="sarStandardsInfoEO.standYear === null">{{ sarStandardsInfoEO.standSortShow || '' }} {{
           sarStandardsInfoEO.standNumber
-        }} 《{{ sarStandardsInfoEO.standName }}》</span>
+        }} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》</span>
       <span v-else>{{ sarStandardsInfoEO.standSortShow || '' }} {{
           sarStandardsInfoEO.standNumber
         }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》</span>

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

@@ -22,7 +22,7 @@
             <template slot="title">基础信息</template>
           </ProcessTitle>
           <el-collapse-transition>
-          <div class="prc-content-border" v-if="foldFormFlag === false">
+          <div class="prc-content-border" v-show="foldFormFlag === false">
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">

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

@@ -3464,10 +3464,6 @@ export default {
     },
   },
   mounted() {
-    this.bpnId = this.$route.query.bpnId
-    if (this.bpnId !== undefined) {
-      this.getTaskId()
-    }
     this.getTree()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
@@ -3491,6 +3487,10 @@ export default {
       this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
       this.setMap(this.standStateOptions)
+      this.bpnId = this.$route.query.bpnId
+      if (this.bpnId !== undefined) {
+        this.getTaskId()
+      }
     })
     this.busVsFunc()
     this.modelFunc()