Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/order.js

@@ -34,14 +34,6 @@ export function getOrder(orderId) {
   })
 }
 
-// 获得订单
-export function getOrderInfo(id) {
-  return request({
-    url: '/ecw/order/info/' + id,
-    method: 'get'
-  })
-}
-
 // 获得订单分页
 export function getOrderPage(query) {
   return request({

src/views/ecw/order/warehousing/components/orderBaseInfo/index.vue

+<template>
+  <div>
+    <el-descriptions border v-if="order.orderId">
+      <el-descriptions-item label="唛头">{{ order.marks }}</el-descriptions-item>
+      <el-descriptions-item label="已到箱数">{{ order.sumNum }}</el-descriptions-item>
+      <el-descriptions-item label="订单状态">{{ order.status }}</el-descriptions-item>
+      <el-descriptions-item label="送货时间">todo</el-descriptions-item>
+      <el-descriptions-item label="运输方式">{{ order.logisticsInfoDto.transportId }}</el-descriptions-item>
+      <el-descriptions-item label="始发地">{{ order.logisticsInfoDto.startWarehouseId }}</el-descriptions-item>
+      <el-descriptions-item label="目的地">{{ order.logisticsInfoDto.destWarehouseId }}</el-descriptions-item>
+      <el-descriptions-item label="发货人姓名">{{ order.consignorVO.name }}</el-descriptions-item>
+      <el-descriptions-item label="发货人公司">{{ order.consignorVO.company }}</el-descriptions-item>
+      <el-descriptions-item label="发货人电话">{{ order.consignorVO.phone }}</el-descriptions-item>
+      <el-descriptions-item label="收货人姓名">{{ order.consigneeVO.name }}</el-descriptions-item>
+      <el-descriptions-item label="收货人公司">{{ order.consigneeVO.company }}</el-descriptions-item>
+      <el-descriptions-item label="收货人电话">{{ order.consigneeVO.phone }}</el-descriptions-item>
+      <el-descriptions-item label="入仓类型">{{ order.warehouseType }}</el-descriptions-item>
+      <el-descriptions-item label="订单号">{{ order.orderNo }}</el-descriptions-item>
+    </el-descriptions>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "orderBaseInfo",
+  props: {
+    order: Object
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ecw/order/warehousing/index.vue

 <template>
   <div class="app-container">
     <h2>入仓操作-NC1231231N</h2>
-    <el-descriptions border>
-      <el-descriptions-item label="唛头"></el-descriptions-item>
-      <el-descriptions-item label="已到箱数"></el-descriptions-item>
-      <el-descriptions-item label="订单状态"></el-descriptions-item>
-      <el-descriptions-item label="送货时间"></el-descriptions-item>
-      <el-descriptions-item label="运输方式"></el-descriptions-item>
-      <el-descriptions-item label="始发地"></el-descriptions-item>
-      <el-descriptions-item label="目的地"></el-descriptions-item>
-      <el-descriptions-item label="发货人姓名"></el-descriptions-item>
-      <el-descriptions-item label="发货人公司"></el-descriptions-item>
-      <el-descriptions-item label="发货人电话"></el-descriptions-item>
-      <el-descriptions-item label="收货人姓名"></el-descriptions-item>
-      <el-descriptions-item label="收货人公司"></el-descriptions-item>
-      <el-descriptions-item label="收货人电话"></el-descriptions-item>
-      <el-descriptions-item label="入仓类型"></el-descriptions-item>
-      <el-descriptions-item label="订单号"></el-descriptions-item>
-      <el-descriptions-item label="储位">
-        <el-button type="primary">选择</el-button>
-      </el-descriptions-item>
-    </el-descriptions>
+
+    <order-base-info :order="order"></order-base-info>
+
+    <div style="margin-top: 10px">
+      <span>储位：</span><el-button type="primary" size="mini">选择</el-button>
+    </div>
 
     <h2>货物信息</h2>
     <el-table
-      :data="[{},{}]"
+      :data="order.orderItemVOList || []"
       style="width: 100%">
       <el-table-column
-        prop="address"
+        type="index"
+        width="50"
         label="序号">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="prodTitleZh"
         label="品名">
       </el-table-column>
       <el-table-column
-        prop="address"
         label="填单货物属性">
+        <template v-slot="{row}">
+          品牌：{{ row.brand ? '有' : '无' }}<br>
+          箱数：{{ row.num }}<br>
+          体积：{{ row.volume }}m³<br>
+          重量：{{ row.weight }}Kg
+        </template>
       </el-table-column>
       <el-table-column
-        prop="address"
         label="入库货物属性">
+        <template v-slot="{row}">
+          品牌：{{ row.brand ? '有' : '无' }}<br>
+          箱数：{{ row.num }}<br>
+          体积：{{ row.volume }}m³<br>
+          重量：{{ row.weight }}Kg
+        </template>
       </el-table-column>
       <el-table-column
         prop="address"
@@ -162,14 +159,19 @@
 
 <script>
 import {getCurrencyList} from "@/api/ecw/currency"
-import {getOrder, getOrderInfo} from "@/api/ecw/order"
+import {getOrder} from "@/api/ecw/order"
+import orderBaseInfo from "@/views/ecw/order/warehousing/components/orderBaseInfo"
 
 export default {
   name: "Warehousing",
+
+  components: {
+    orderBaseInfo
+  },
+
   mounted() {
     getCurrencyList().then(res => this.currencyList = res.data)
-    getOrder(17).then(r => this.order = r.data)
-    getOrderInfo(17).then(r => this.order = r.data)
+    getOrder(15).then(r => this.order = r.data)
   },
   data() {
     return {