Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/inspectInfo.vue

@@ -871,8 +871,12 @@
             this.customerList = []
             let customer = response
             for (let i = 0; i < response.length; i++) {
-              customer =
-                response[i].customerName + '(' + response[i].customerPhone + ')'
+              if(response[i].supplier){
+                customer =  response[i].customerName + '(' + response[i].customerPhone + ')'+'-'+response[i].supplier
+              }
+              else{
+                customer = response[i].customerName + '(' + response[i].customerPhone + ')'
+              }
               this.customerList.push({
                 valueKey: i,
                 value: customer,