特殊，订单关联，

src/api/ecw/associatedOrder.js

+// export function
+import request from '@/utils/request'
+
+export function orderGuanlian(params){
+  return request({
+    url:'order/guanlian/page',
+    method:'get',
+    params:params,
+  })
+};

src/utils/dict.js

@@ -147,7 +147,8 @@ export const DICT_TYPE = {
   PAY_TYPE:'pay_type',
   RECEIVE_FLAG:'receive_flag',
   COMDINED_VALUE_ADDED_FEE:'combined_value_added_fee',
-  ORDER_SPECIAL_NEEDS:'order_special_needs'
+  ORDER_SPECIAL_NEEDS:'order_special_needs',
+  ORDER_ABNORMAL_STATE:'order_abnormal_state'
 }
 
 /**

src/views/ecw/order/addAssociatedOrder.vue

 <template>
 <div class="add-associated-order">
- <h1 class="title">订单号：ECP0013123N 选择订单</h1>
+ <h1 class="title">订单号：{{orderDetails.orderNo}} 选择订单</h1>
   <el-divider></el-divider>
   <el-form inline label-width="85px" label-position="left">
     <el-form-item label="订单号">
@@ -72,8 +72,22 @@
 
 <script>
 //添加关联订单
+import {getOrder} from "@/api/ecw/order";
+
 export default {
-  name: "addAssociatedOrder"
+  name: "addAssociatedOrder",
+  data(){
+    return {
+      orderDetails:{}
+    }
+  },
+  created() {
+    getOrder(this.orderId).then( r =>{
+      if(r.code === 0){
+        this.orderDetails = r.data;
+      }
+    })
+    },
 }
 </script>
 

src/views/ecw/order/associatedOrder.vue

@@ -48,7 +48,7 @@
          <el-button type="primary">批量移出</el-button>
        </div>
      <div>
-       <el-button type="primary">添加关联订单</el-button>
+        <el-button type="primary" @click="$router.push(`/order/add-associated-order/${orderId}`)">添加关联订单</el-button>
      </div>
    </div>
    <el-table>
@@ -76,7 +76,7 @@
 //关联订单
 import ordeDetailsForm from "@/views/ecw/order/components/ordeDetailsForm";
 import {getOrder} from "@/api/ecw/order";
-
+import {orderGuanlian} from "@/api/ecw/associatedOrder";
 export default {
   name: "associatedOrder",
   props:{
@@ -87,16 +87,30 @@ export default {
   },
   data(){
     return {
-      orderDetails:{}
+      orderDetails:{},
+      params:{
+        orderId:undefined,
+        page:1,
+        rows:10
+      }
     }
   },
   created() {
+    this.params.orderId = this.orderId;
+    this.getList();
     getOrder(this.orderId).then( r =>{
       if(r.code === 0){
         this.orderDetails = r.data;
       }
     })
   },
+  methods:{
+    getList(){
+      orderGuanlian(this.params).then(r => {
+        console.log(r)
+      })
+    }
+  }
 }
 </script>
 

src/views/ecw/order/components/ordeDetailsForm.vue

@@ -3,10 +3,16 @@
     <el-descriptions class="margin-top" border :column="4">
       <el-descriptions-item label="唛头">{{details.marks}}</el-descriptions-item>
       <el-descriptions-item label="已到箱数/总箱数">{{details.sumQuantity}}/{{details.sumNum}}</el-descriptions-item>
-      <el-descriptions-item label="订单状态">{{details.status}}</el-descriptions-item>
+      <el-descriptions-item label="订单状态">
+        <dict-tag :type="DICT_TYPE.ORDER_ABNORMAL_STATE" :value="details.status" />
+      </el-descriptions-item>
       <el-descriptions-item label="送货日期">{{}}</el-descriptions-item>
-      <el-descriptions-item label="运输方式">{{details.transportId}}</el-descriptions-item>
-      <el-descriptions-item label="出货渠道">{{details.channelId}}</el-descriptions-item>
+      <el-descriptions-item label="运输方式">
+        <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="details.transportId"></dict-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="出货渠道">
+       <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="details.channelId"></dict-tag>
+      </el-descriptions-item>
       <el-descriptions-item label="始发地">{{details.logisticsInfoDto.startWarehouseId}}</el-descriptions-item>
       <el-descriptions-item label="目的地">{{details.logisticsInfoDto.destWarehouseId}}</el-descriptions-item>
       <el-descriptions-item  label="发货人姓名">{{details.consignorVO.customerId}}</el-descriptions-item>
@@ -22,6 +28,8 @@
 </template>
 
 <script>
+import { DICT_TYPE } from '@/utils/dict';
+import {getTradeCityList} from "@/api/ecw/region";
 export default {
   props:{
     details:{
@@ -36,6 +44,26 @@ export default {
     },
   },
   name: "ordeDetailsForm",
+  created() {
+    getTradeCityList().then(res => {
+      this.tradeCityList = res.data
+    })
+    },
+  components:{
+    //目的地
+    importCityList(){
+      return this.tradeCityList.filter(item => item.type == 1)
+    },
+    //始发地
+    exportCityList(){
+      return this.tradeCityList.filter(item => item.type == 2)
+    },
+  },
+  data(){
+    return {
+      DICT_TYPE,
+    }
+  }
 }
 </script>
 

src/views/ecw/order/components/specialNeeds.vue

@@ -69,6 +69,8 @@ export default {
         if(r.code === 0){
           this.clearFrom();
           this.$emit('update:show',false)
+          this.$emit('determine')
+          this.$message.success('提交成功');
         }
       })
     },

src/views/ecw/order/index.vue

@@ -119,6 +119,7 @@
           <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
             <span>{{ scope.row.orderNo }}</span>
           </router-link>
+          {{scope.row.advanceType}}
         </template>
       </el-table-column>
       <el-table-column label="唛头" align="center" prop="marks" />
@@ -188,7 +189,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <special-needs :show.sync="isShow":order-id="orderId"  ></special-needs>
+    <special-needs :show.sync="isShow":order-id="orderId" @determine="getList" ></special-needs>
   </div>
 </template>