订单互斥，订单关联数据回显

src/views/ecw/order/addAssociatedOrder.vue

@@ -33,14 +33,16 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="入仓时间" prop="rucangTime"></el-table-column>
+      <el-table-column label="入仓时间" prop="rucangTime">
+        <template v-slot="{row}">
+         {{parseTime(row.rucangTime)}}
+        </template>
+      </el-table-column>
       <el-table-column label="状态">
         <template v-slot:default="scope">
           <dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作人"></el-table-column>
-      <el-table-column label="操作时间"></el-table-column>
       <el-table-column label="操作">
         <template v-slot:default="scope">
           <el-button type="text" size="mini" @click="joinAssociation(scope.row.orderId)">加入关联</el-button>

src/views/ecw/order/associatedOrder.vue

@@ -33,9 +33,25 @@
      </el-table-column>
      <el-table-column type="index" label="序号"></el-table-column>
      <el-table-column label="订单号" prop="orderBackVO.orderNo"></el-table-column>
-     <el-table-column label="唛头" prop="marks"></el-table-column>
-     <el-table-column label="货物数据"></el-table-column>
-     <el-table-column label="入仓时间"></el-table-column>
+     <el-table-column label="唛头" prop="orderBackVO.marks"></el-table-column>
+     <el-table-column label="货物数据">
+       <template v-slot="{row}">
+        <div>
+          {{row.orderBackVO.costVO.totalNum}}箱
+        </div>
+         <div>
+          {{row.orderBackVO.costVO.totalVolume}}m³
+        </div>
+         <div>
+          {{row.orderBackVO.costVO.totalWorth}}KG
+        </div>
+       </template>
+     </el-table-column>
+     <el-table-column label="入仓时间" prop="orderBackVO.rucangTime">
+       <template v-slot="{row}">
+         {{parseTime(row.orderBackVO.rucangTime)}}
+       </template>
+     </el-table-column>
      <el-table-column label="状态" prop="status" >
        <template v-slot:default="scope">
          <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
@@ -68,12 +84,14 @@ import {
   guanlianList,
 } from "@/api/ecw/associatedOrder";
 import {getDictDatas,DICT_TYPE} from '@/utils/dict'
+import Template from "@/views/cms/template";
 export default {
   name: "associatedOrder",
   props:{
     orderId:[String,Boolean]
   },
   components:{
+    Template,
     ordeDetailsForm
   },
   computed:{
@@ -113,6 +131,7 @@ export default {
       guanlianList(this.params).then(r => {
         if(r.code === 0){
           this.list = r.data
+         console.log( this.list[0])
         }
       })
     },

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

@@ -4,13 +4,14 @@
       <el-descriptions-item label="唛头">{{details.marks}}</el-descriptions-item>
       <el-descriptions-item label="已到箱数/总箱数">{{details.sumQuantity || 0}}/{{details.totalsumNum || 0}}</el-descriptions-item>
       <el-descriptions-item label="订单状态">
-        <dict-tag :type="DICT_TYPE.ORDER_ABNORMAL_STATE" :value="details.status" />
+        <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="details.status" />
       </el-descriptions-item>
       <el-descriptions-item label="送货日期"></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="出货渠道">
+        {{details.channelId}}123
        <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="details.channelId"></dict-tag>
       </el-descriptions-item>
       <el-descriptions-item label="始发地">{{ details.logisticsInfoDto ? details.logisticsInfoDto.startTitleZh :''}}</el-descriptions-item>

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

@@ -53,6 +53,9 @@
     <el-table-column label="目的地" prop="objectiveName"></el-table-column>
     <el-table-column
     label="发货人">
+      <template v-slot="{row}">
+        <div></div>
+      </template>
   </el-table-column>
     <el-table-column
       label="收货人">
@@ -116,6 +119,7 @@ import {
 import {applicationGetOrderByProcessId, feeApplicationGet, getOrder, getOrderPage,} from "@/api/ecw/order";
 import { getChannelList } from '@/api/ecw/channel';
 import Template from "@/views/cms/template";
+import {getSupplierPage} from "@/api/ecw/supplier";
 export default {
   components: {Template},
   props:{

src/views/ecw/order/mutexOrder.vue

@@ -32,17 +32,37 @@
         width="55">
       </el-table-column>
       <el-table-column type="index" label="序号"></el-table-column>
-      <el-table-column label="订单号" prop="orderNo"></el-table-column>
-      <el-table-column label="唛头" prop="marks"></el-table-column>
-      <el-table-column label="货物数据"></el-table-column>
-      <el-table-column label="入仓时间" prop="remarks"></el-table-column>
+      <el-table-column label="订单号" prop="orderBackVO.orderNo"></el-table-column>
+      <el-table-column label="唛头" prop="orderBackVO.marks"></el-table-column>
+      <el-table-column label="货物数据">
+        <template v-slot="{row}">
+          <div>
+            {{row.orderBackVO.costVO.totalNum}}箱
+          </div>
+          <div>
+            {{row.orderBackVO.costVO.totalVolume}}m³
+          </div>
+          <div>
+            {{row.orderBackVO.costVO.totalWorth}}KG
+          </div>
+          </template>
+      </el-table-column>
+      <el-table-column label="入仓时间">
+        <template v-slot="{row}">
+          {{parseTime(row.orderBackVO.rucangTime)}}
+        </template>
+      </el-table-column>
       <el-table-column label="状态" prop="status" >
         <template v-slot:default="scope">
-          <dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
+          <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作人"></el-table-column>
-      <el-table-column label="操作时间" prop="createTime"></el-table-column>
+      <el-table-column label="操作时间" prop="createTime">
+        <template v-slot="{row}">{{
+            parseTime(row.orderBackVO.createTime)
+          }}</template>
+      </el-table-column>
       <el-table-column label="操作">
         <template v-slot:default='scope'>
           <el-button type="text"  @click ="guanlianOrderByOrderId(scope.row.orderId)">
@@ -64,12 +84,14 @@ import {
   guanlianList,
 } from "@/api/ecw/mutexOrder";
 import {getDictDatas,DICT_TYPE} from '@/utils/dict'
+import Template from "@/views/cms/template";
 export default {
   name: "mutexOrder",
   props:{
     orderId:[String,Boolean]
   },
   components:{
+    Template,
     ordeDetailsForm
   },
   data(){

src/views/ecw/order/notMutexOrder.vue

@@ -13,7 +13,7 @@
       </el-form-item>
     </el-form>
     <h1 class="title">
-      未加入关联订单列表
+      未加入互斥订单列表
     </h1>
     <el-divider></el-divider>
     <el-table :data="list" @selection-change="handleSelectionChange">
@@ -24,15 +24,29 @@
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column label="订单号" prop="orderNo"></el-table-column>
       <el-table-column label="唛头" prop="marks"></el-table-column>
-      <el-table-column label="货物数据"></el-table-column>
-      <el-table-column label="入仓时间" prop="rucangtime"></el-table-column>
+      <el-table-column label="货物数据">
+        <template v-slot="{row}">
+          <div>
+            {{row.costVO.totalNum}}箱
+          </div>
+          <div>
+            {{row.costVO.totalVolume}}m³
+          </div>
+          <div>
+            {{row.costVO.totalWorth}}KG
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="入仓时间" prop="rucangTime">
+        <template v-slot="{row}">
+          {{parseTime(row.rucangTime)}}
+        </template>
+      </el-table-column>
       <el-table-column label="状态">
         <template v-slot:default="scope">
           <dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作人"></el-table-column>
-      <el-table-column label="操作时间"></el-table-column>
       <el-table-column label="操作">
         <template v-slot:default="scope">
           <el-button type="text" size="mini" @click="joinAssociation(scope.row.orderId)">加入互斥</el-button>
@@ -91,6 +105,7 @@ export default {
       }).then(r => {
         if (r.code === 0) {
           this.list = r.data
+          console.log(this.list[0])
         }
       })
     },