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

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -841,8 +841,10 @@
                             const filterList = list.filter(s => s !== 'null');
                             this.addForm.esMatingRelations = filterList.join(",");
                         }else if(val === 'null'){
-                            this.addForm.esMatingRelations = "";
+                            this.addForm.esMatingRelations = null;
                         }
+                    }else {
+                        this.addForm.esMatingRelations = null
                     }
                 }
             },

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -949,6 +949,15 @@
                         @fileSuccess="fileSuccess"
                       ></custom-file>
                     </template>
+                    <template v-else-if="field.attrType === 'FILE' && field.attrField === 'FBGYWBD'">
+                      <custom-file
+                          :config="field"
+                          v-model="sarStandardsInfoEO[field.attrField]"
+                          :disabled="formdisableflag"
+                          :show-modify-name="true"
+                          @fileSuccess="fileSuccess"
+                      ></custom-file>
+                    </template>
                   </template>
                 </template>
                 <el-form-item label="标准年份" prop="standYear" label-width="150px" class="add-form-item">
@@ -1187,7 +1196,7 @@
                   ></custom-date-pick>
                 </template>
                 <!--                发布稿的组件 -->
-                <template v-else-if="field.attrType === 'FILE' && field.attrField !== 'FBGBJBD'">
+                <template v-else-if="field.attrType === 'FILE' && field.attrField !== 'FBGBJBD' && field.attrField !== 'FBGYWBD' ">
                   <custom-file
 
                     :config="field"

src/pages/regulatoryRepository/standQA/index.vue

@@ -132,7 +132,7 @@
     </div>
     <span slot="footer" class="dialog-footer">
     <el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
-    <el-button class="common-button-primary" size="mini" type="primary" @click="queSubmit">提 交</el-button>
+    <el-button class="common-button-primary" size="mini" :loading="isSubmit" type="primary" @click="queSubmit">提 交</el-button>
     </span>
   </el-dialog>
   <!--    选择标准抽屉-->
@@ -586,6 +586,7 @@ export default {
       activeName: 'INLAND',
       activeType: 'INLAND',
       activestand: '',
+      isSubmit: false,
       activeQue: '',
       standType: 'INLAND',
       dialogVisible: false,
@@ -1035,6 +1036,7 @@ export default {
     },
     //提交问题
       queSubmit(){
+        this.isSubmit = true
         if(this.standType === 'OTHER'){
           this.questionForm.standardId = this.questionForm.pubQue
           this.questionForm.standardName = this.questionForm.pubQue
@@ -1049,6 +1051,7 @@ export default {
                   _this: this
                 }, res => {
                   this.dialogVisible = false
+                    this.isSubmit = false
                   this.searchBtn()
                 }, e => {
 

src/pages/regulatoryRepository/standQA/index2.vue

@@ -320,7 +320,7 @@
     </div>
     <span slot="footer" class="dialog-footer">
     <el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
-    <el-button class="common-button-primary" size="mini" type="primary" @click="queSubmit">提 交</el-button>
+    <el-button class="common-button-primary" :loading="queSubmitLading" size="mini" type="primary" @click="queSubmit">提 交</el-button>
     </span>
   </el-dialog>
   <!--    选择标准抽屉-->
@@ -766,6 +766,7 @@ export default {
           {required: true, message: '请输入问题', trigger: 'blur'},
         ],
       },
+      queSubmitLading: false,
       questionSerach:{
         classification: 'INLAND',
         standardName: '',  //标准名称
@@ -1226,6 +1227,7 @@ export default {
     },
     //提交问题
       queSubmit(){
+      this.queSubmitLading = true
         if(this.standType === 'OTHER'){
           this.questionForm.standardId = this.questionForm.pubQue
           this.questionForm.standardName = this.questionForm.pubQue
@@ -1260,15 +1262,18 @@ export default {
                       this.standSearch2()
                       break
                   }
+                    this.queSubmitLading = false
                   this.queSearch()
                 }, e => {
 
                 })
             }else{
+              this.queSubmitLading = false
               return this.$message.warning('请输入问题')
             }
           })
         }else{
+          this.queSubmitLading = false
           this.$message.warning('请选择至少一条标准')
         }
       },