修复部分bug

src/views/jiedao/profile/delivery.vue

@@ -2050,26 +2050,28 @@ export default {
     })
 
     // this.getIdCard()
-    if (this.$route.query.tranfId) {
-      setTimeout(() => {
-        this.$set(this.form, 'transportId', this.$route.query.tranfId)
-      }, 500)
-    }
+
     if (this.$route.query.id) {
-      await getOrderDetail(this.$route.query.id).then((res) => {
+      await getOrderDetail(this.$route.query.id).then(async (res) => {
         this.form = Object.assign({}, res.data, { orderItemVOList: [] })
         this.form.deliveryDate = res.data.deliveryDate
-        this.$set(this.form, 'consigneePhone', res.data.consigneeVO.phone)
-        this.$set(this.form, 'countryCode', res.data.consigneeVO.countryCode)
-        this.$set(this.form, 'consigneeCompany', res.data.consigneeVO.company)
-        this.$set(
-          this.form,
-          'consigneeCompanyEn',
-          res.data.consigneeVO.companyEn
-        )
-        this.$set(this.form, 'consigneeEmail', res.data.consigneeVO.email)
-        this.$set(this.form, 'consigneeName', res.data.consigneeVO.name)
-        this.$set(this.form, 'consigneeNameEn', res.data.consigneeVO.nameEn)
+        if(res.data.consigneeVO){
+          this.$set(this.form, 'consigneePhone', res.data.consigneeVO.phone)
+          this.$set(this.form, 'countryCode', res.data.consigneeVO.countryCode)
+          this.$set(this.form, 'consigneeCompany', res.data.consigneeVO.company)
+          this.$set(this.form,'consigneeCompanyEn', res.data.consigneeVO.companyEn)
+          this.$set(this.form, 'consigneeEmail', res.data.consigneeVO.email)
+          this.$set(this.form, 'consigneeName', res.data.consigneeVO.name)
+          this.$set(this.form, 'consigneeNameEn', res.data.consigneeVO.nameEn)
+        }
+
+        if(this.form.type){
+          this.form.type = this.form.type.split(",").filter(item => !!item)
+        }
+
+        await this.getOpenedRouterList()
+        this.handleChangeLineId()
+
         if (res.data.status != 0) {
           this.editFlag = false
         }
@@ -2086,8 +2088,14 @@ export default {
           })
         })
       })
-    } else this.addProduct()
-
+    } else{
+      this.addProduct()
+      if (this.$route.query.tranfId) {
+        setTimeout(() => {
+          this.$set(this.form, 'transportId', this.$route.query.tranfId)
+        }, 500)
+      }
+    }
     await this.$nextTick()
     this.$refs.form.clearValidate()
   },
@@ -2104,13 +2112,13 @@ export default {
       await this.$nextTick()
 
       // 如果已选中的城市不在列表中则清空
-      if(this.form.departureId && this.importCityList.findIndex(item => item.id == this.form.departureId) < 0){
+      /* if(this.form.departureId && this.importCityList.findIndex(item => item.id == this.form.departureId) < 0){
         this.form.objectiveId = null
-      }
+      } */
       // 如果只有一个城市则选中
-      if(this.importCityList.length === 1){
+      /* if(this.importCityList.length === 1){
         this.form.objectiveId = this.importCityList[0].id
-      }
+      } */
     },
     async getChannelList() {
       const query = {
@@ -2415,7 +2423,7 @@ export default {
         params.destCountryId = this.form.destCountryId
       }
       await this.$nextTick()
-      getOpenedRouterList(params).then((res) => {
+      await getOpenedRouterList(params).then((res) => {
         this.routerList = res.data.filter((item) => {
           return (
             this.exportCityIds.indexOf(item.startCityId) > -1 &&

src/views/jiedao/profile/orderdetail.vue

@@ -53,7 +53,7 @@
             <el-descriptions-item :label="$t('delivery.addressdetail')" label-style="width:150px">{{consigneeVO?consigneeVO.address:''}}</el-descriptions-item>
             <template v-if="showMore">
               <el-descriptions-item :label="$t('orderdetail.consigneeNameEn')" label-style="width:120px">{{ consigneeVO.nameEn }}</el-descriptions-item>
-              <el-descriptions-item :label="$t('orderdetail.consigneeCompany')" label-style="width:120px">
+              <el-descriptions-item :label="$t('公司中文名称')" label-style="width:120px">
                 {{ consigneeVO.company }}
               </el-descriptions-item>
               <el-descriptions-item :label="$t('orderdetail.consigneeCompanyEn')" label-style="width:120px">
@@ -105,16 +105,13 @@
         <el-descriptions-item :label="$t('prepayDeal.drawee')">
           <span  v-if="order.drawee==1">{{ $t('orderdetail.consignor') }}</span>
           <span  v-else-if="order.drawee==2">{{ $t('orderdetail.consignee') }}</span>
-          <span  v-else>{{order.customDraweeVOList?order.customDraweeVOList[0].name:''}}</span>
+          <el-button type="text" v-else @click="showDraweeDialog=true">{{$t('自定义')}}</el-button>
         </el-descriptions-item>
 
         <!--单证报关-->
-        <el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('orderdetail.customsType')">
+        <el-descriptions-item :label="$t('orderdetail.customsType')">
           <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" />
         </el-descriptions-item>
-        <el-descriptions-item v-else label="">
-          <!--占位-->
-        </el-descriptions-item>
 
         <el-descriptions-item :label="$t('orderdetail.isCargoControl')">{{ order.isCargoControl?$t('orderdetail.is'):$t('orderdetail.no') }}</el-descriptions-item>
         <el-descriptions-item :label="$t('orderdetail.objectport')" v-if="[3, 4].indexOf(+order.transportId) > -1">
@@ -312,6 +309,21 @@
       </el-tabs>
     </el-card>
 
+    <el-dialog :title="$t('付款人')" :visible.sync="showDraweeDialog" v-if="order && order.customDraweeVOList">
+      <el-table :data="order.customDraweeVOList" v-if="order.drawee==3" >
+        <el-table-column :label="$t('费用类型')" prop="label" width="200px">
+          <template slot-scope="{row}">
+            <dict-tag :type="DICT_TYPE.ECW_CUSTOM_DRAWEE" :value="row.name"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('付款人')" width="300px">
+          <template slot-scope="{row}">
+            <dict-tag :type="DICT_TYPE.DRAWEE" :value="row.value" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
     <print-warehouse-receipt v-if="showWarehouseReceipt" :order-id="order.orderId" @close="showWarehouseReceipt=false" />
     <print-lading-bill v-if="showLadingBill" :order-id="order.orderId" :transport-type="order.transportId" @close="showLadingBill=false" />
     <declaration-documents v-if="declarationOrderId !== null" :order-id="order.orderId" :disabled="documentsDidables" @close="declarationOrderId=null" />
@@ -350,6 +362,7 @@ export default {
       orderId: 17,
       tableData: [],
       channelList: [],
+      showDraweeDialog: false,
       queryParams: {
         page: 1,
         rows: 10