订单详情的入仓记录

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

+<template>
+    <!-- 订单获取入仓记录 -->
+    <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="1000px">
+        <el-table v-if="warehouseItem && warehouseItem.orderWarehouseInBackItemDoList" :data="warehouseItem.orderWarehouseInBackItemDoList">
+          <el-table-column type="index" :label="$t('序号')" />
+          <el-table-column :label="$t('箱数')" prop="cartonsNum" />
+          <el-table-column :label="$t('入仓类型')" prop="cartonsNum">
+            <template slot-scope="{row}">
+              <dict-tag :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" :value="row.specificationType" />
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('包装类型')" prop="unit">
+            <template slot-scope="{row}">
+              <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="row.unit" />
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('长')" prop="boxGauge">
+            <template slot-scope="{row}">
+              {{row.boxGauge.split('*')[0]}}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('宽')" prop="boxGauge" >
+            <template slot-scope="{row}">
+              {{row.boxGauge.split('*')[1]}}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('高')" prop="boxGauge" >
+            <template slot-scope="{row}">
+              {{row.boxGauge.split('*')[2]}}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('体积') + '(m³)'" prop="volume" />
+          <el-table-column :label="$t('重量') + '(kg)'" prop="weight" />
+          <el-table-column :label="$t('数量（个）')" prop="quantityAll" />
+          <el-table-column :label="$t('快递单号')" prop="expressNo" />
+          <el-table-column :label="$t('入仓时间')" prop="inTime" >
+            <template slot-scope="{row}">{{row.inTime|parseTime}}</template>
+          </el-table-column>
+        </el-table>
+    </el-dialog>
+</template>
+<script>
+import { getOrder, getOrderWarehouseIn } from '@/api/ecw/order'
+import { DICT_TYPE } from '@/utils/dict'
+import { parseTime } from '@/utils/ruoyi'
+export default {
+    filters: {parseTime},
+    props:{
+        order: Object, // order 和 orderId 二选一
+        orderId: Number,
+        orderItemId: Number,
+    },
+    data(){
+        return {
+          orderDetail: null,
+            warehouseList: null
+        }
+    },
+    computed:{
+      info(){
+        return this.orderDetail || this.order
+      },
+      orderItem(){
+        if(!this.info) return null
+        return this.info.orderItemVOList.find(item => item.orderItemId == this.orderItemId)
+      },
+      warehouseItem(){
+        if(!this.warehouseList) return []
+        return this.warehouseList.find(item => item.orderItemId == this.orderItemId) || []
+      },
+      title(){
+        if(!this.orderItem) return '-'
+        return this.$l(this.orderItem, 'prodTitle') + ' - ' + this.$t('入仓记录')
+      }
+    },
+    
+    created(){
+        this.show = true
+        if(!this.order && this.orderId){
+          getOrder(this.orderId).then(res => {
+            this.orderDetail = res.data
+          })
+        }
+        this.getOrderWarehouseIn()
+    },
+    methods:{
+        closeDialog(){
+            this.show = false
+            this.$emit('close');
+        },
+        getOrderWarehouseIn(){
+          getOrderWarehouseIn(this.info.orderId).then(res => {
+            this.warehouseList = res.data
+          })
+        }
+    }
+}
+</script>
\ No newline at end of file

src/views/ecw/order/detail.vue

@@ -120,7 +120,8 @@
             <el-table-column prop="num" :label="$t('填单件数')"  width="90px"/>
             <el-table-column prop="sumNum" :label="$t('入仓件数')"  width="90px">
               <template slot-scope="{row}">
-                {{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}
+                <el-link type="primary" @click.native="showWarehouseLogs(row)">{{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}</el-link>
+                <div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">(多规格)</div>
               </template>
             </el-table-column>
             <el-table-column prop="unit" :label="$t('单位')" width="90px">
@@ -242,6 +243,7 @@
 
     <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" />
+    <warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
   </div>
 </template>
 
@@ -255,11 +257,12 @@ import {getCurrencyList} from '@/api/ecw/currency'
 import {getReceivableListByOrderId} from '@/api/ecw/receipt'
 import { getChannel } from '@/api/ecw/channel';
 import {listByIds} from '@/api/ecw/region'
+import WarehouseDetail from './components/WarehouseDetail';
 
 export default {
   name: "detail",
   components: {
-    PrintWarehouseReceipt, PrintLadingBill
+    PrintWarehouseReceipt, PrintLadingBill, WarehouseDetail
   },
   filters: {
     customsTypeFilter(e, customsTypeList) {
@@ -290,7 +293,9 @@ export default {
       unitList:[],
       feeList: [],
       channelName: '/',
-      region: ''
+      region: '',
+      orderWarehouseIn: null, // 入仓详情
+      showWarehouseInItemId: null, // 当前显示的入仓
     }
   },
   computed:{
@@ -374,6 +379,15 @@ export default {
     },
     downloadPackingList(){
       window.open(this.order.packingListUrl)
+    },
+    // 显示入仓记录
+    showWarehouseLogs(row){
+      this.showWarehouseInItemId = row.orderItemId
+    },
+    getWarehouseIn(){
+      getOrderWarehouseIn(this.order.id).then(res => {
+        this.orderWarehouseIn = res.data
+      })
     }
   }
 };