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

src/pages/personal/pages/my-questions/index.vue

@@ -1673,7 +1673,20 @@ export default {
     queBtn(){
       this.fileList = []
       // 清空提问
-      const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand)
+      if(this.standList.length === 0){
+        this.standType = !this.activeType ? 'INLAND' : this.activeType
+        this.questionForm = {
+          pubQue :  '',//公共问题
+          classification: !this.activeType ? 'INLAND' : this.activeType, //标准类型
+          problemDescription: '', //问题
+          questioner: this.$store.getters.userInfo.userId, //提问人
+          standardEncdoing: '',  //标准编号
+          standardName: '',   //标准名称
+          standardId:'',   //标准id
+          fileList: '',
+        }
+      }else{
+        const selectedStand = this.activestand == '0' || this.activeType === 'INLAND' ? this.standList[0] : this.standMap.get(this.activestand)
         this.standType = selectedStand.classification
         this.questionForm = {
           pubQue :  selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题
@@ -1685,6 +1698,7 @@ export default {
           standardId: selectedStand.standardId,   //标准id
           fileList: '',
         }
+      }
       this.dialogVisible = true
     },
     handleClose(){

src/pages/regulatoryRepository/standQA/index.vue

@@ -1047,7 +1047,20 @@ export default {
     //提问按钮
     queBtn(){
       this.fileList = []
-      const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand)
+      if(this.standList.length === 0){
+        this.standType = !this.activeType ? 'INLAND' : this.activeType
+        this.questionForm = {
+          pubQue :  '',//公共问题
+          classification: !this.activeType ? 'INLAND' : this.activeType, //标准类型
+          problemDescription: '', //问题
+          questioner: this.$store.getters.userInfo.userId, //提问人
+          standardEncdoing: '',  //标准编号
+          standardName: '',   //标准名称
+          standardId:'',   //标准id
+          fileList: '',
+        }
+      }else{
+        const selectedStand = this.activestand == '0' || this.activeType === 'INLAND' ? this.standList[0] : this.standMap.get(this.activestand)
         this.standType = selectedStand.classification
         this.questionForm = {
           pubQue :  selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题
@@ -1059,6 +1072,7 @@ export default {
           standardId: selectedStand.standardId,   //标准id
           fileList: '',
         }
+      }
       this.dialogVisible = true
     },
     handleClose(){