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

src/views/system/businessInfo.vue

@@ -584,6 +584,7 @@
           if(this.model_type == "模型文件"){
             this.fileNameModel = "1"
           }
+          else {
           if(item.raw.name.toString().endsWith("txt")){
             this.fileNameTxt = "1"
           }
@@ -595,7 +596,7 @@
               this.$alert("请上传正确的文件类型");
               return;
             }
-          }
+          }}
           request.post('/report/fileReportAdd',{
             file_name : this.customerName+"_"+this.headInfId+"_"+item.raw.name,
             fileModel:this.fileNameModel,