Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/inspectionManagement.vue

@@ -345,6 +345,9 @@
 					.then((response) => {
 						this.isShowPrint = true
 						this.printData = response
+						    if (response.compName == '黑龙江秋收有限公司') {
+               				 this.printData.compName = '黑龙江中天昊元贸易有限公司'
+              }
 						// window.location.href="../../../static/inspection.html?dataList="+JSON.stringify(response)
 					})
 			},

src/views/houseSelfCollect/weighingManagement.vue

@@ -362,6 +362,9 @@
               .toPromise()
               .then((response) => {
                 index1++;
+              if (response.compName == '黑龙江秋收有限公司') {
+              response.compName = '黑龙江中天昊元贸易有限公司'
+              }
                 this.jjSelectPrintList.push(response)
                 if (index1 == this.modification.length) {
                   this.printBig(1, this.radio)
@@ -386,6 +389,9 @@
             .toPromise()
             .then((response) => {
               this.dialogData = response
+              if (response.compName == '黑龙江秋收有限公司') {
+              this.printData.compName = '黑龙江中天昊元贸易有限公司'
+              }
               this.isShowPrint = true
             })
             .catch((response) => {