入仓记录增加商品明细 / 后台订单详情-入仓详情-查看箱明细-前

https://zentao.test.jdshangmen.com/task-view-3165.html

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

@@ -4,7 +4,14 @@
         <el-button v-if="info.transportId==3" style="position:absolute;top:15px;left:340px" type="primary" @click="seePackLog">{{$t('查看打包历史')}}</el-button>
         <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}">
+              <template v-if="row.orderWarehouseInDetailsVOList && row.orderWarehouseInDetailsVOList.length">
+                <WarehouseRecordDetail v-model="row.orderWarehouseInDetailsVOList" 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" />
@@ -60,8 +67,10 @@ import { DICT_TYPE } from '@/utils/dict'
 import { parseTime } from '@/utils/ruoyi'
 import WarehouseAreaSelect from "@/components/WarehouseAreaSelect"
 import ImageDisplay from "@/views/ecw/order/components/imageDisplay.vue";
+import WarehouseRecordDetail from '@/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue'
 export default {
   components: {
+    WarehouseRecordDetail,
     ImageDisplay,
     WarehouseAreaSelect
   },

src/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue

 <template>
   <div style="display: inline-block">
-    <el-button size="mini" type="primary" style="margin-right: 10px" @click="handleOpen">{{ title }}</el-button>
+    <template v-if="text">
+      <el-button size="mini" type="text" style="margin-right: 10px" @click="handleOpen">{{ value.length }}（混箱）</el-button>
+    </template>
+    <template v-else>
+      <el-button size="mini" type="primary" style="margin-right: 10px" @click="handleOpen">{{ title }}</el-button>
+    </template>
     <el-dialog
       append-to-body
       :title="title"
@@ -48,6 +53,10 @@ export default {
     readonly: {
       type: Boolean,
       default: false
+    },
+    text: {
+      type: Boolean,
+      default: false
     }
   },