Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -1138,10 +1138,10 @@ export default {
       }]
       getCorp().then(res=>{
         this.goodsForm = {
-          corpId:res.data.data.id,
+          corpId:res.data.data?res.data.data.id:'',
           businessType:"出口",
           shippingMode:"集装箱",
-          belongCompany:res.data.data.belongCompany
+          belongCompany:res.data.data?res.data.data.belongCompany:''
         }
       })
       this.entrustList = [{$cellEdit: true}]
@@ -1350,7 +1350,7 @@ export default {
       let data = JSON.parse(JSON.stringify(this.tableData))
       data.forEach((item, index) => {
         item.sort = index + 1
-        if (item.region.length !== 0) {
+        if (item.region !== undefined && item.region.length !== 0) {
           item.region = item.region.join(',')
         }else {
           item.region = ''
@@ -1505,10 +1505,11 @@ export default {
     //选择地址客户带出地址
     withAddress(row, scope) {
       this.tableData[scope.$index].address = ''
+      console.log(row)
       if (!scope.row.key) scope.row.key = 0
       this.tableData[scope.$index].corpName = row.cname
       if (row.attn){
-        this.tableData[scope.$index].address = row.tel
+        this.tableData[scope.$index].address = row.attn
       }
       if (row.tel) {
         if (!row.attn) {