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

src/views/system/business.vue

@@ -334,6 +334,7 @@ export default {
           rptNo:row.rptNo,
           businessId:row.businessId,
           cooperatorName:row.cooperatorName,
+          customerName:row.customerName,
           activeIndex: this.activeIndex
         }
       })

src/views/system/businessInfo.vue

@@ -316,7 +316,8 @@
         rptNo : this.$route.query.rptNo,
         businessId : this.$route.query.businessId,
         cooperatorName : this.$route.query.cooperatorName,
-  
+        customerName : this.$route.query.customerName,
+
       }
     },
     watch: {},
@@ -577,6 +578,9 @@
         this.fileList.forEach(item=>{
           //文件信息中raw才是真的文件
           fd.append("files",item.raw);
+          fd.append("customerName",this.customerName);
+          fd.append("headInfId",this.headInfId);
+
           if(this.model_type == "模型文件"){
             this.fileNameModel = "1"
           }
@@ -593,7 +597,7 @@
             }
           }
           request.post('/report/fileReportAdd',{
-            file_name : item.raw.name,
+            file_name : this.customerName+"_"+this.headInfId+"_"+item.raw.name,
             fileModel:this.fileNameModel,
             fileNameTxt:this.fileNameTxt,
             fileNameXml:this.fileNameXml,