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

src/views/houseSelfCollect/inspectInfo.vue

@@ -414,6 +414,9 @@
                     .toPromise()
                     .then((response) => {
                       this.inspect = response
+                      if (response.compName == '黑龙江秋收有限公司') {
+               				 this.inspect.compName = '黑龙江中天昊元贸易有限公司'
+              					}
                     })
                   this.isShowPrint = true
                   //打印
@@ -469,6 +472,9 @@
                     .toPromise()
                     .then((response) => {
                       this.inspect = response
+                      if (response.compName == '黑龙江秋收有限公司') {
+               				 this.inspect.compName = '黑龙江中天昊元贸易有限公司'
+              					}
                     })
                   this.isShowPrint = true
                 })
@@ -495,6 +501,9 @@
                     .toPromise()
                     .then((response) => {
                       this.inspect = response
+                      if (response.compName == '黑龙江秋收有限公司') {
+               				 this.inspect.compName = '黑龙江中天昊元贸易有限公司'
+              					}
                     })
                   this.isShowPrint = true
                 })

src/views/houseSelfCollect/inspectionManagement.vue

@@ -332,6 +332,7 @@
 					.then((response) => {
 						console.log(response)
 						this.inspect = response.records
+						
 						this.deptBudgetTotal = response.total
 						// this.$forceUpdate();
 					})
@@ -347,7 +348,7 @@
 						this.printData = response
 						    if (response.compName == '黑龙江秋收有限公司') {
                				 this.printData.compName = '黑龙江中天昊元贸易有限公司'
-              }
+              					}
 						// window.location.href="../../../static/inspection.html?dataList="+JSON.stringify(response)
 					})
 			},

src/views/houseSelfCollect/settlement.vue

@@ -743,6 +743,9 @@ export default {
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
              this.printData= response
+              if (response == '黑龙江秋收有限公司') {
+              this.printData.compName = '黑龙江中天昊元贸易有限公司'
+            }
              console.log(this.printData,'结算打印')
          })
          this.isShowPrint = true

src/views/houseSelfCollect/weightCheck.vue

@@ -830,6 +830,9 @@
                     .toPromise()
                     .then((response) => {
                       this.inspect = response
+                      if (response.compName == '黑龙江秋收有限公司') {
+               				 this.inspect.compName = '黑龙江中天昊元贸易有限公司'
+              					}
                       this.inspect.a = '中天'
                       // this.tableData = response
                       this.isShowPrint = true