feature: 新增入仓记录弹窗

src/views/ecw/box/shippingAir/nodePage/mergePkg/unPkgPage.vue

@@ -47,7 +47,7 @@
           </el-table-column>
           <el-table-column :label="$t('箱数')" align="center" prop="sumNum">
             <template slot-scope="scope">
-              <el-link type="primary">
+              <el-link type="primary" @click.native="showWarehouseLogs(scope.row)">
                 {{ scope.row.sumNum }}<span v-if="scope.row.mixStatus === 1">（{{$t('混箱')}}）</span>
               </el-link>
             </template>
@@ -84,15 +84,15 @@
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" @pagination="getList" />
       </el-row>
     </el-row>
-    <warehouse-detail :orderId="showWarehouseInItemId" :orderItemId="showWarehouseInItemId" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
+    <warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
     <realated-order :orderItemId="showRelatedItemId" v-if="showRelatedItemId" @close="showRelatedItemId=null"></realated-order>
   </div>
 </template>
 
 <script>
-import { getUnPkgPage, createPkgOrder, createBatchPkgOrder } from '@/api/ecw/boxAir'
+import { getUnPkgPage, createPkgOrder, createBatchPkgOrder, getOrderTagList } from '@/api/ecw/boxAir'
 import { formatDate, serviceMsg } from '../../utils'
-import WarehouseDetail from "../../../shippingSea/nodePage/tally/warehouseDetail";
+import WarehouseDetail from "./warehouseDetail.vue";
 import RealatedOrder from "../../../shippingSea/nodePage/tally/realatedOrder.vue";
 import {getOrder} from "@/api/ecw/order";
 export default {

src/views/ecw/box/shippingAir/nodePage/mergePkg/warehouseDetail.vue

+<template>
+  <!-- 订单获取入仓记录 -->
+  <el-dialog title="入仓记录" visible :before-close="closeDialog" :close-on-click-modal="false" width="95%" append-to-body>
+    <el-table :data="warehouseItem">
+      <el-table-column type="index" :label="$t('序号')" />
+      <el-table-column :label="$t('箱数')" prop="cartonsNum">
+        <template slot-scope="{row}">
+          <template v-if="row.orderWarehouseInDetailsVOList && row.orderWarehouseInDetailsVOList.length">
+            <WarehouseRecordDetail v-model="row.orderWarehouseInDetailsVOList" :num="row.cartonsNum" text readonly />
+          </template>
+          <template v-else>{{ row.cartonsNum }}</template>
+        </template>
+      </el-table-column>
+      <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 && row.boxGauge.split('*')[0]}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('宽')" prop="boxGauge">
+        <template slot-scope="{row}">
+          {{row.boxGauge && row.boxGauge.split('*')[1]}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('高')" prop="boxGauge">
+        <template slot-scope="{row}">
+          {{row.boxGauge && 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('储位')" align="center" prop="positionNo" width="250px">
+        <template slot-scope="{row}">{{row.orderLocationBackVOList && row.orderLocationBackVOList.map(e => (e.areaName + (e.locationName === null ? '' : e.locationName))).join(',')}}</template>
+      </el-table-column>
+      <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 WarehouseRecordDetail from '@/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue'
+import { parseTime } from "@/utils/ruoyi";
+export default {
+  filters: { parseTime },
+   components: {
+    WarehouseRecordDetail
+  },
+  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 [];
+      let dataList = []
+      this.warehouseList.map(
+        (item) => {
+          return item.orderWarehouseInBackItemDoList.map(v => {
+            dataList.push({...v})
+          })
+        }
+      )
+      console.log('dataList', dataList)
+      return dataList
+    },
+    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>