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

src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue

@@ -201,7 +201,7 @@
             style="width: 100%;"
             :model="historySeeForm"
           >
-            <el-form-item class="add-form-item" label="标准编号:">
+            <el-form-item class="add-form-item" label="标准号:">
               <div class="seeItem">{{historySeeForm.standSerialNumber}}</div>
             </el-form-item>
             <el-form-item class="add-form-item" label="标准名称:">
@@ -566,6 +566,7 @@ export default {
       this.$nextTick(() => {
         const arr = []
         let questionType = []
+        if (this.historySeeForm.quesType){
         questionType = this.historySeeForm.quesType.split(',')
         questionType.map((item) => {
           this.optionList.map((opr) => {
@@ -576,6 +577,7 @@ export default {
           })
         })
         this.historySeeForm.quesType = arr.toString()
+        }
       })
     },
     // 分页事件