diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderItemSpecIdUpdateBo.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderItemSpecIdUpdateBo.java
new file mode 100644
index 00000000..f7c558bc
--- /dev/null
+++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderItemSpecIdUpdateBo.java
@@ -0,0 +1,9 @@
+package cn.qihangerp.api.order;
+
+import lombok.Data;
+
+@Data
+public class OrderItemSpecIdUpdateBo {
+    private Long orderItemId;
+    private Long erpGoodsSpecId;
+}
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderItemController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderItemController.java
index 847780ea..9e0d7ca0 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderItemController.java
+++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderItemController.java
@@ -2,6 +2,8 @@ package cn.qihangerp.api.order.controller;
 
 
 
+import cn.qihangerp.api.order.OrderItemSpecIdUpdateBo;
+import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.TableDataInfo;
 import cn.qihangerp.module.order.domain.bo.OrderItemListBo;
@@ -9,9 +11,7 @@ import cn.qihangerp.module.order.service.OOrderItemService;
 import cn.qihangerp.module.order.service.OOrderService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 店铺订单Controller
@@ -36,7 +36,23 @@ public class OrderItemController extends BaseController
         var pageList = itemService.selectPageVo(pageQuery,bo);
         return getDataTable(pageList);
     }
+    /**
+     * 修改订单明细specId
+     * @param bo
+     * @return
+     */
+    @PostMapping("/order_item_sku_id_update")
+    public AjaxResult orderItemSpecIdUpdate(@RequestBody OrderItemSpecIdUpdateBo bo)
+    {
+        if(bo.getOrderItemId()==null || bo.getOrderItemId() ==0) return AjaxResult.error("参数错误：orderItemId为空");
+        if(bo.getErpGoodsSpecId()==null || bo.getErpGoodsSpecId() ==0) return AjaxResult.error("参数错误：ErpGoodsSpecId为空");
 
+        var result = itemService.updateErpSkuId(bo.getOrderItemId(),bo.getErpGoodsSpecId());
+        if (result.getCode() == 0) {
+            return AjaxResult.success();
+        } else return AjaxResult.error(result.getMsg());
+
+    }
 //    /**
 //     * 更新erp sku id
 //     * @param orderItem
diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java
index 83ae42ef..1efbe0be 100644
--- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java
+++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java
@@ -1,9 +1,10 @@
 package cn.qihangerp.api.order.controller;
 
-
+import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.TableDataInfo;
 import cn.qihangerp.module.order.domain.bo.ShipStockUpBo;
+import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo;
 import cn.qihangerp.module.order.service.OOrderShipListItemService;
 import cn.qihangerp.module.order.service.OOrderShipListService;
 import cn.qihangerp.security.common.BaseController;
@@ -52,27 +53,27 @@ public class OrderShipController extends BaseController {
         return getDataTable(pageList);
     }
 
-//    @PostMapping("/stock_up_complete")
-//    public AjaxResult stock_up_complete(@RequestBody ShipStockUpCompleteBo bo)
-//    {
-//        int result = shipStockUpService.stockUpComplete(bo);
-//        if(result == -1) return AjaxResult.error("参数错误：orderItemIds为空");
-//        if(result == -2) return AjaxResult.error("参数错误：没有要添加的");
-//        else if(result == -1001) return AjaxResult.error("存在错误的orderItemId：状态不对不能生成出库单");
-//        else if(result == -1002) return AjaxResult.error("存在错误的订单数据：名单明细中没有skuId请修改！");
-//        //wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry)
-//        return toAjax(1);
-//    }
-//
-//    @PostMapping("/stock_up_complete_by_order")
-//    public AjaxResult stock_up_completeByOrder(@RequestBody ShipStockUpCompleteBo bo)
-//    {
-//        int result = shipStockUpService.stockUpCompleteByOrder(bo);
-//        if(result == -1) return AjaxResult.error("参数错误：orderItemIds为空");
-//        if(result == -2) return AjaxResult.error("参数错误：没有要添加的");
-//        else if(result == -1001) return AjaxResult.error("存在错误的orderItemId：状态不对不能生成出库单");
-//        else if(result == -1002) return AjaxResult.error("存在错误的订单数据：名单明细中没有skuId请修改！");
-//        //wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry)
-//        return toAjax(1);
-//    }
+    @PostMapping("/stock_up_complete")
+    public AjaxResult stock_up_complete(@RequestBody ShipStockUpCompleteBo bo)
+    {
+        int result = shipStockUpService.stockUpComplete(bo);
+        if(result == -1) return AjaxResult.error("参数错误：orderItemIds为空");
+        if(result == -2) return AjaxResult.error("参数错误：没有要添加的");
+        else if(result == -1001) return AjaxResult.error("存在错误的orderItemId：状态不对不能生成出库单");
+        else if(result == -1002) return AjaxResult.error("存在错误的订单数据：名单明细中没有skuId请修改！");
+        //wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry)
+        return toAjax(1);
+    }
+
+    @PostMapping("/stock_up_complete_by_order")
+    public AjaxResult stock_up_completeByOrder(@RequestBody ShipStockUpCompleteBo bo)
+    {
+        int result = shipStockUpService.stockUpCompleteByOrder(bo);
+        if(result == -1) return AjaxResult.error("参数错误：orderItemIds为空");
+        if(result == -2) return AjaxResult.error("参数错误：没有要添加的");
+        else if(result == -1001) return AjaxResult.error("存在错误的orderItemId：状态不对不能生成出库单");
+        else if(result == -1002) return AjaxResult.error("存在错误的订单数据：名单明细中没有skuId请修改！");
+        //wmsStockOutEntryService.insertWmsStockOutEntry(wmsStockOutEntry)
+        return toAjax(1);
+    }
 }
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java
index 67aa6004..2fb0fc67 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java
@@ -23,7 +23,7 @@ public interface OOrderItemService extends IService<OOrderItem> {
     PageResult<OrderItemListVo> selectPageVo(PageQuery pageQuery, OrderItemListBo bo);
     PageResult<OOrderItem> queryPageList(OOrderItem bo, PageQuery pageQuery);
 
-    ResultVo<Integer>  updateErpSkuId(String id,Long erpSkuId);
+    ResultVo<Integer>  updateErpSkuId(Long orderItemId,Long erpSkuId);
 
     List<OOrderItem> getOrderItemListByOrderId(Long orderId);
     List<SalesTopSkuVo> selectTopSku(String startDate, String endDate);
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java
index 7f944e6c..df7f58a9 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java
@@ -4,6 +4,7 @@ import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.module.order.domain.OOrderShipList;
 import cn.qihangerp.module.order.domain.bo.ShipStockUpBo;
+import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +14,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface OOrderShipListService extends IService<OOrderShipList> {
     PageResult<OOrderShipList> querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery);
+    int stockUpCompleteByOrder(ShipStockUpCompleteBo bo);
+    /**
+     * 备货完成
+     * @param bo
+     * @return
+     */
+    int stockUpComplete(ShipStockUpCompleteBo bo);
 }
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java
index 89ab6c1e..f1ff90ec 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java
@@ -1,7 +1,9 @@
 package cn.qihangerp.module.order.service.impl;
 
 
+import cn.qihangerp.model.entity.OGoodsSku;
 import cn.qihangerp.model.entity.OOrderItem;
+import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
 import cn.qihangerp.module.order.domain.bo.OrderItemListBo;
 import cn.qihangerp.model.vo.OrderItemListVo;
 import cn.qihangerp.module.order.domain.vo.SalesTopSkuVo;
@@ -33,6 +35,8 @@ import java.util.regex.Pattern;
 public class OOrderItemServiceImpl extends ServiceImpl<OOrderItemMapper, OOrderItem>
     implements OOrderItemService {
     private final OOrderItemMapper mapper;
+    private final OGoodsSkuMapper goodsSkuMapper;
+
     private final String DATE_PATTERN =
             "^(?:(?:(?:\\d{4}-(?:0?[1-9]|1[0-2])-(?:0?[1-9]|1\\d|2[0-8]))|(?:(?:(?:\\d{2}(?:0[48]|[2468][048]|[13579][26])|(?:(?:0[48]|[2468][048]|[13579][26])00))-0?2-29))$)|(?:(?:(?:\\d{4}-(?:0?[13578]|1[02]))-(?:0?[1-9]|[12]\\d|30))$)|(?:(?:(?:\\d{4}-0?[13-9]|1[0-2])-(?:0?[1-9]|[1-2]\\d|30))$)|(?:(?:(?:\\d{2}(?:0[48]|[13579][26]|[2468][048])|(?:(?:0[48]|[13579][26]|[2468][048])00))-0?2-29))$)$";
     private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN);
@@ -73,9 +77,18 @@ public class OOrderItemServiceImpl extends ServiceImpl<OOrderItemMapper, OOrderI
     }
 
     @Override
-    public ResultVo<Integer> updateErpSkuId(String id, Long erpSkuId) {
+    public ResultVo<Integer> updateErpSkuId(Long orderItemId, Long erpSkuId) {
+        OOrderItem oOrderItem = mapper.selectById(orderItemId);
+        if(oOrderItem==null){
+            return ResultVo.error("找不到数据");
+        }else if(oOrderItem.getShipStatus()!=0) return ResultVo.error("发货之后的订单item不允许修改");
+
+        OGoodsSku oGoodsSku = goodsSkuMapper.selectById(erpSkuId);
+        if(oGoodsSku==null){
+            return ResultVo.error("找不到商品Sku数据");
+        }
         OOrderItem update = new OOrderItem();
-        update.setId(id);
+        update.setId(orderItemId.toString());
         update.setGoodsSkuId(erpSkuId);
         update.setUpdateBy("手动修改ERP SKU ID");
         update.setUpdateTime(new Date());
diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java
index e935a07e..1bddf33e 100644
--- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java
+++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java
@@ -2,24 +2,34 @@ package cn.qihangerp.module.order.service.impl;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
+import cn.qihangerp.module.order.domain.OOrderShipListItem;
 import cn.qihangerp.module.order.domain.bo.ShipStockUpBo;
+import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo;
+import cn.qihangerp.module.order.mapper.OOrderShipListItemMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.qihangerp.module.order.domain.OOrderShipList;
 import cn.qihangerp.module.order.service.OOrderShipListService;
 import cn.qihangerp.module.order.mapper.OOrderShipListMapper;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import java.util.Date;
+import java.util.List;
+
 /**
 * @author qilip
 * @description 针对表【o_order_ship_list(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Service实现
 * @createDate 2025-05-24 16:03:35
 */
+@AllArgsConstructor
 @Service
 public class OOrderShipListServiceImpl extends ServiceImpl<OOrderShipListMapper, OOrderShipList>
     implements OOrderShipListService{
+    private final OOrderShipListItemMapper shipListItemMapper;
     @Override
     public PageResult<OOrderShipList> querySupplierPageList(ShipStockUpBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<OOrderShipList> queryWrapper = new LambdaQueryWrapper<OOrderShipList>()
@@ -32,6 +42,89 @@ public class OOrderShipListServiceImpl extends ServiceImpl<OOrderShipListMapper,
 
         return PageResult.build(pages);
     }
+
+    /**
+     * 备货完成 by Order
+     * @param bo
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int stockUpCompleteByOrder(ShipStockUpCompleteBo bo) {
+
+        if(bo.getOrderNums() == null || bo.getOrderNums().length == 0) return -1;
+
+        int total=0;
+        // 循环判断状态
+        for (String orderNum:bo.getOrderNums()) {
+            List<OOrderShipList> oOrderShipLists = this.baseMapper.selectList(new LambdaQueryWrapper<OOrderShipList>().eq(OOrderShipList::getOrderNum, orderNum));
+            if(oOrderShipLists == null || oOrderShipLists.size() == 0) continue;
+
+            // 更新订单
+            OOrderShipList update = new OOrderShipList();
+            update.setId(oOrderShipLists.get(0).getId());
+            update.setStatus(2);
+            update.setUpdateBy("备货完成");
+            update.setUpdateTime(new Date());
+            this.baseMapper.updateById(update);
+
+            List<OOrderShipListItem> upList = shipListItemMapper.selectList(new LambdaQueryWrapper<OOrderShipListItem>().eq(OOrderShipListItem::getListId,oOrderShipLists.get(0).getId()));
+            if (upList != null) {
+                for(OOrderShipListItem up : upList) {
+                    if (up.getStatus() == 0 || up.getStatus() == 1) {
+                        OOrderShipListItem updateItem = new OOrderShipListItem();
+                        updateItem.setId(up.getId());
+                        updateItem.setStatus(2);//备货完成
+                        updateItem.setUpdateBy("备货完成");
+                        updateItem.setUpdateTime(new Date());
+                        shipListItemMapper.updateById(updateItem);
+                    }
+                }
+            }
+        }
+
+        return 1;
+    }
+
+    /**
+     * 备货完成
+     * @param bo
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int stockUpComplete(ShipStockUpCompleteBo bo) {
+
+        if(bo.getIds() == null || bo.getIds().length == 0) return -1;
+
+        int total=0;
+        // 循环判断状态
+        for (Long id:bo.getIds()) {
+            OOrderShipListItem up = shipListItemMapper.selectById(id);
+            if (up != null) {
+                if (up.getStatus() == 0 || up.getStatus() == 1) {
+                    OOrderShipListItem update = new OOrderShipListItem();
+                    update.setId(id);
+                    update.setStatus(2);//备货完成
+                    update.setUpdateBy("备货完成");
+                    update.setUpdateTime(new Date());
+                    shipListItemMapper.updateById(update);
+                }
+                List<OOrderShipListItem> oOrderShipListItems = shipListItemMapper.selectList(new LambdaQueryWrapper<OOrderShipListItem>().eq(OOrderShipListItem::getListId, up.getListId()).eq(OOrderShipListItem::getStatus, 0));
+                if(oOrderShipListItems == null || oOrderShipListItems.size() == 0) {
+                    // 订单备货全部完成，更新订单状态
+                    OOrderShipList listUpdate = new OOrderShipList();
+                    listUpdate.setId(up.getListId());
+                    listUpdate.setStatus(2);
+                    listUpdate.setUpdateBy("备货完成");
+                    listUpdate.setUpdateTime(new Date());
+                    this.baseMapper.updateById(listUpdate);
+                }
+            }
+        }
+
+        return 1;
+    }
 }
 
 
diff --git a/vue/package.json b/vue/package.json
index 8835324c..0fc97aec 100644
--- a/vue/package.json
+++ b/vue/package.json
@@ -58,6 +58,7 @@
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
+    "vue-print-nb": "^1.7.5",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0"
diff --git a/vue/src/api/order/order.js b/vue/src/api/order/order.js
index 2a7d4336..4151daf3 100644
--- a/vue/src/api/order/order.js
+++ b/vue/src/api/order/order.js
@@ -87,3 +87,11 @@ export function manualShipmentOrder(data) {
     data: data
   })
 }
+//修改订单item skuId
+export function orderItemSpecIdUpdate(data) {
+  return request({
+    url: '/api/oms-api/order/order_item_sku_id_update',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/vue/src/api/shipping/shipping.js b/vue/src/api/shipping/shipping.js
index 4d57a57a..aa2e7f16 100644
--- a/vue/src/api/shipping/shipping.js
+++ b/vue/src/api/shipping/shipping.js
@@ -38,13 +38,7 @@ export function shipStockupCompleteByOrder(data) {
   })
 }
 
-export function orderItemSpecIdUpdate(data) {
-  return request({
-    url: '/shipping/order_item_spec_id_update',
-    method: 'post',
-    data: data
-  })
-}
+
 
 // 生成出库单（备货清单生成出库单）
 export function generateStockOutEntry(data) {
diff --git a/vue/src/main.js b/vue/src/main.js
index e9c3abd4..cb32fae3 100644
--- a/vue/src/main.js
+++ b/vue/src/main.js
@@ -41,6 +41,8 @@ import DictData from '@/components/DictData'
 import Avue from '@smallwei/avue';
 import '@smallwei/avue/lib/index.css';
 
+import Print from 'vue-print-nb'
+Vue.use(Print)
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
diff --git a/vue/src/views/shipping/stockup/index.vue b/vue/src/views/shipping/stockup/index.vue
index e28dfb45..f6a28a52 100644
--- a/vue/src/views/shipping/stockup/index.vue
+++ b/vue/src/views/shipping/stockup/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="仓库备货清单" name="stockShip">
+      <el-tab-pane label="仓库发货订单" name="stockShip">
         <warehouse-shipment></warehouse-shipment>
-
       </el-tab-pane>
+
       <el-tab-pane label="供应商发货订单" name="supplierShip" lazy>
         <supplier-shipment></supplier-shipment>
       </el-tab-pane>
diff --git a/vue/src/views/shipping/stockup/warehouse/index-1.vue b/vue/src/views/shipping/stockup/warehouse/index-1.vue
deleted file mode 100644
index b2a71d32..00000000
--- a/vue/src/views/shipping/stockup/warehouse/index-1.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
-
-      <el-tab-pane label="备货订单" name="stockupOrder">
-        <ship-stockup-order></ship-stockup-order>
-      </el-tab-pane>
-      <el-tab-pane label="备货商品明细" name="stockupOrderItem" lazy>
-        <ship-stockup-order-item></ship-stockup-order-item>
-      </el-tab-pane>
-<!--      <el-tab-pane label="京东自营" name="jdvcOrder" lazy>-->
-<!--        <order-jd-vc></order-jd-vc>-->
-<!--      </el-tab-pane>-->
-<!--      <el-tab-pane label="抖店" name="douOrder" lazy>-->
-<!--        <order-dou></order-dou>-->
-<!--      </el-tab-pane>-->
-<!--      <el-tab-pane label="拼多多" name="pddOrder" lazy>-->
-<!--        <order-pdd></order-pdd>-->
-<!--      </el-tab-pane>-->
-    </el-tabs>
-
-  </div>
-</template>
-
-<script>
-import ShipStockupOrder  from "@/views/shipping/stockup/warehouse/order_list.vue";
-import ShipStockupOrderItem  from "@/views/shipping/stockup/warehouse/order_item_list.vue";
-
-export default {
-  name: "warehouseShipment",
-  components:{ShipStockupOrder,ShipStockupOrderItem},
-  data() {
-    return {
-      activeName: 'stockupOrder'
-    };
-  },
-  created() {
-
-  },
-  mounted() {
-
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event);
-    }
-  }
-};
-</script>
diff --git a/vue/src/views/shipping/stockup/warehouse/index.vue b/vue/src/views/shipping/stockup/warehouse/index.vue
index 5a53407e..615adcea 100644
--- a/vue/src/views/shipping/stockup/warehouse/index.vue
+++ b/vue/src/views/shipping/stockup/warehouse/index.vue
@@ -1,573 +1,40 @@
 <template>
-  <div class="app-container" >
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="店铺" prop="shopId">
-        <el-select v-model="queryParams.shopId" filterable  placeholder="搜索店铺" >
-          <el-option v-for="item in shopList" :key="item.id" :label="item.name" :value="item.id">
-            <span style="float: left">{{ item.name }}</span>
+  <div class="app-container">
+    <el-tabs v-model="activeName" @tab-click="handleClick" type="card">
+      <el-tab-pane label="发货订单" name="stockShip">
+        <warehouse-shipment></warehouse-shipment>
+      </el-tab-pane>
+      <el-tab-pane label="发货订单商品" name="stockShipItem" lazy>
+        <warehouse-shipment-item></warehouse-shipment-item>
+      </el-tab-pane>
 
-              <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 500">视频号小店</span>
-              <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 200">京东POP</span>
-              <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 280">京东自营</span>
-              <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 100">淘宝天猫</span>
-              <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 300">拼多多</span>
-              <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 400">抖店</span>
-              <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 999">线下渠道</span>
-          </el-option>
-          </el-select>
-      </el-form-item>
-<!--      <el-form-item label="商品ID" prop="goodsId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.goodsId"-->
-<!--          placeholder="请输入erp系统商品id"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="商品编码" prop="goodsNum">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.goodsNum"-->
-<!--          placeholder="请输入商品编码"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="规格ID" prop="specId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.specId"-->
-<!--          placeholder="请输入erp系统商品规格id"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="规格编码" prop="specNum">
-        <el-input
-          v-model="queryParams.specNum"
-          placeholder="请输入商品规格编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备货状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择">
-        <el-option
-          v-for="item in statusList"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-document-copy"
-          size="mini"
-          :disabled="multiple"
-          @click="handleSelection"
-        >备货完成</el-button>
-      </el-col>
-      <el-col :span="1.5">
-      <el-button
-        type="primary"
-        plain
-        icon="el-icon-printer"
-        size="mini"
-        :disabled="multiple"
-        @click="handleStatistics"
-      >打印备货单</el-button>
-
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-    <el-table v-loading="loading" :data="shippingList" @selection-change="handleSelectionChange"  >
-       <el-table-column type="selection" width="55" v-if="queryParams.status==='0'" align="center" />
-      <!-- <el-table-column label="主键" align="center" prop="id" /> -->
-      <el-table-column label="订单编号" align="left" prop="orderNum" width="150"/>
-       <el-table-column label="店铺" align="left" prop="shopId" width="200">
-        <template slot-scope="scope">
-          <el-tag>{{ shopList.find(x=>x.id === scope.row.shopId)?shopList.find(x=>x.id === scope.row.shopId).name:''  }}</el-tag>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="子订单编号" align="center" prop="orderItemId" /> -->
-<!--      <el-table-column label="订单日期" align="center" prop="orderDate" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.orderDate, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <el-table-column label="商品明细" align="center">
-        <template slot="header">
-            <table>
-              <th>
-                <td width="50px">图片</td>
-                <td width="300px" align="left">标题</td>
-                <td width="150" align="left">SKU名</td>
-                <td width="150" align="left">Sku编码</td>
-                <td width="150" align="left">系统SkuId</td>
-                <td width="50" align="left">数量</td>
-              </th>
-            </table>
-        </template>
-        <template slot-scope="scope">
-          <el-table :data="scope.row.children"  :show-header="false" style="width: 100%"  >
-                  <el-table-column label="商品图片" width="50px">
-                    <template slot-scope="scope">
-                          <el-image  style="width: 40px; height: 40px;" :src="scope.row.goodsImg" :preview-src-list="[scope.row.goodsImg]"></el-image>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="商品名" align="left" width="300px" prop="goodsTitle" />
-                  <el-table-column label="SKU名" align="left" prop="goodsSpec" width="150"/>
-            <el-table-column label="Sku编码" align="left" prop="specNum" width="150"/>
-<!--                  <el-table-column label="规格编码" align="center" prop="specNum" />-->
-<!--                  <el-table-column label="erp商品id" align="center" prop="goodsId" />-->
-                  <el-table-column label="商品SkuId" align="center" prop="specId" width="150">
-                    <template slot-scope="scope">
-                      <span style="margin-right: 15px">{{scope.row.specId}}</span>
-<!--                      <a style="color:royalblue" href="javascript:void(0);"-->
-<!--                        v-if="!scope.row.specId||scope.row.specId === 0"-->
-<!--                        size="mini"-->
-<!--                        type="primary"-->
-<!--                        plain-->
-<!--                        @click="handleUpdateLink(scope.row)"-->
-<!--                      >修改商品SkuId</a>-->
-                      <el-button icon="el-icon-edit" size="mini"  @click="handleUpdateLink(scope.row)"></el-button>
-
-                    </template>
-                  </el-table-column>
-
-                   <el-table-column label="商品数量" align="center" prop="quantity" width="50px">
-                     <template slot-scope="scope">
-                     <el-tag size="small">{{scope.row.quantity}}</el-tag>
-                     </template>
-                   </el-table-column>
-          </el-table>
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="商品图片" >-->
-<!--        <template slot-scope="scope">-->
-<!--              <el-image  style="width: 70px; height: 70px;" :src="scope.row.goodsImg"></el-image>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="商品标题" align="center" prop="goodsTitle" />-->
-<!--      <el-table-column label="规格" align="center" prop="goodsSpec" />-->
-<!--      <el-table-column label="规格编码" align="center" prop="specNum" />-->
-<!--      <el-table-column label="erp商品id" align="center" prop="goodsId" />-->
-<!--      <el-table-column label="erp商品SkuId" align="center" prop="specId" />-->
-<!--      <el-table-column label="商品Sku编码" align="center" prop="specNum" />-->
-<!--       <el-table-column label="商品数量" align="center" prop="quantity" >-->
-<!--         <template slot-scope="scope">-->
-<!--         <el-tag size="small">{{scope.row.quantity}}</el-tag>-->
-<!--         </template>-->
-<!--       </el-table-column>-->
-<!--      <el-table-column label="仓库库存" align="center" prop="inventory" />-->
-      <el-table-column label="状态" align="center" prop="status" width="100">
-        <template slot-scope="scope">
-          <el-tag size="small" v-if="scope.row.status === 0">待备货</el-tag>
-          <el-tag size="small" v-if="scope.row.status === 1">备货中</el-tag>
-          <el-tag size="small" v-if="scope.row.status === 2">备货完成</el-tag>
-          <el-tag size="small" v-if="scope.row.status === 3">已发货</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="150">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            v-if="scope.row.status ===0 || scope.row.status === 1"
-            plain
-            type="success"
-            icon="el-icon-document-copy"
-            @click="stockupCompleteByOrder(scope.row)"
-          >确认备货完成</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 对话框 -->
-
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body >
-      <div id="dialogContent">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" inline>
-<!--        <el-form-item label="单号" prop="stockOutNum" v-if="isGen">-->
-<!--          <el-input v-model="form.stockOutNum" disabled placeholder="请输入单号" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="完成时间" prop="completeTime" v-if="isGen">
-          <el-date-picker clearable
-            v-model="form.completeTime"
-            type="datetime" disabled
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="打印时间" prop="completeTime" v-if="!isGen">
-          <el-date-picker clearable
-                          v-model="form.completeTime"
-                          type="datetime" disabled
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="请选择时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-divider content-position="center" v-if="isGen">备货商品</el-divider>
-        <el-table :data="skuList" :row-class-name="rowItemIndex" ref="skuItem">
-<!--          <el-table-column type="selection" width="50" align="center" />-->
-          <el-table-column label="序号" align="center" prop="index" width="50"/>
-          <el-table-column label="商品图片" prop="goodsImg" >
-            <template slot-scope="scope">
-              <el-image style="width: 70px; height: 70px" :src="scope.row.goodsImg"></el-image>
-            </template>
-          </el-table-column>
-          <el-table-column label="商品标题" prop="goodsTitle" ></el-table-column>
-          <el-table-column label="规格" prop="goodsSpec" ></el-table-column>
-          <el-table-column label="sku编码" prop="specNum" ></el-table-column>
-          <el-table-column label="数量" prop="quantity"></el-table-column>
-          <el-table-column label="仓库库存" prop="inventory"></el-table-column>
-
-        </el-table>
-      </el-form>
-    </div>
-      <div slot="footer" class="dialog-footer" v-if="isGen">
-        <el-button type="primary" @click="submitForm">完成</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-      <div slot="footer" class="dialog-footer" v-if="!isGen">
-        <el-button v-print="'#dialogContent'">打印</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 修改skuid对话框 -->
-    <el-dialog title="修改SkuId" :visible.sync="skuIdUpdateOpen" width="500px" append-to-body>
-      <el-form ref="form2" :model="form2" :rules="rules2" label-width="120px" inline>
-<!--        <el-form-item label="ERP商品ID" prop="erpGoodsId" >-->
-<!--          <el-input v-model="form2.erpGoodsId" disabled placeholder="请输入ERP商品ID" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="ERP商品SkuId" prop="erpGoodsSpecId" >
-          <el-input type="number" v-model="form2.erpGoodsSpecId" placeholder="请输入ERP商品SkuId" />
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitSkuIdUpdateForm">修改</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+    </el-tabs>
 
   </div>
 </template>
 
 <script>
-import {
-  listShipStockupWarehouse,
-  orderItemSpecIdUpdate,
-  shipStockupCompleteByOrder
-} from "@/api/shipping/shipping";
-import { listShop } from "@/api/shop/shop";
+import warehouseShipment  from "@/views/shipping/stockup/warehouse/order_list.vue";
+import warehouseShipmentItem  from "@/views/shipping/stockup/warehouse/order_item_list.vue";
+
+
 export default {
-  name: "ShipStockupOrder",
-  // computed: {
-  //   supplier() {
-  //     return supplier
-  //   }
-  // },
+  name: "stocking",
+  components:{warehouseShipment,warehouseShipmentItem},
   data() {
     return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 仓库订单发货表格数据
-      shippingList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      skuIdUpdateOpen: false,
-      isGen:true,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 100,
-        shopId: null,
-        goodsId: null,
-        specId: null,
-        goodsNum: null,
-        goodsSpec: null,
-        specNum: null,
-        status: null,
-      },
-      // 表单参数
-      form: {
-        ids:[],
-        completeTime:null
-      },
-      form1: {
-        orderItemIds:[]
-      },
-      form2: {
-        orderItemId:null
-      },
-      shopList: [],
-      skuList:[],
-      supplierList:[],
-      // 备货原始数据
-      shippingListOrigin:[],
-      statusList: [
-        {
-          value: '0',
-          label: '待备货'
-        }, {
-          value: '1',
-          label: '备货中'
-        }, {
-          value: '2',
-          label: '备货完成'
-        }
-      ],
-      // 表单校验
-      rules: {
-        stockOutNum: [{ required: true, message: "单号不能为空", trigger: "blur" }],
-        completeTime: [{ required: true, message: "生成时间不能为空", trigger: "blur" }],
-        goodsId: [{ required: true, message: "erp系统商品id不能为空", trigger: "blur" }],
-        specId: [{ required: true, message: "erp系统商品规格id不能为空", trigger: "blur" }],
-        quantity: [{ required: true, message: "商品数量不能为空", trigger: "blur" }],
-      },
-      rules1: {
-        supplierId: [{ required: true, message: "请选择供应商", trigger: "blur" }],
-      },
-      rules2: {
-        erpGoodsSpecId: [{ required: true, message: "请选择填写ERP商品SkuId", trigger: "blur" }],
-      }
+      activeName: 'stockShip'
     };
+  },
+  created() {
+
   },
   mounted() {
 
-  },
-  created() {
-    listShop({}).then(response => {
-        this.shopList = response.rows;
-      });
-    if(this.$route.query.status){
-      this.queryParams.status = this.$route.query.status
-    }else {
-      this.queryParams.status = '0'
-    }
-    this.getList();
   },
   methods: {
-    rowItemIndex({ row, rowIndex }) {
-      row.index = rowIndex + 1;
-    },
-    /** 查询仓库订单发货列表 */
-    getList() {
-      this.loading = true;
-      listShipStockupWarehouse(this.queryParams).then(response => {
-        this.shippingListOrigin = response.rows;
-        // this.shippingList = response.rows;
-        // this.total = response.total;
-        // 数据处理
-        // 原数据格式 [obj...]
-        let newList=[]
-// 用 Array.prototype.reduct 实现类似于 groupBy 的效果。
-        var categoryAndObjMapList = response.rows.reduce((result, currValue) => {
-          let currCategory = currValue.orderNum;
-          // 当前分类已经有了，非空数组，则向对应分类下的列表中新增一个元素
-          if (Object.keys(result).includes(currCategory)) {
-            result[currCategory].push(currValue);
-          } else {
-            // 初始化新的分类，并同时设置第一个元素
-            result[currCategory] = [currValue];
-          }
-          console.log({currCategory, result});
-          return result;
-        }, {});
-
-        console.log(categoryAndObjMapList);
-        Object.keys(categoryAndObjMapList).forEach(x=>{
-          let newObj = {
-            orderNum:x,
-            status:categoryAndObjMapList[x][0].status,
-            shopId:categoryAndObjMapList[x][0].shopId,
-            hasChildren:true,
-            children:categoryAndObjMapList[x]
-          }
-          newList.push(newObj)
-          // newList.push(...categoryAndObjMapList[x])
-          // console.log("============")
-          // console.log(categoryAndObjMapList[x])
-        })
-        console.log("----------------",newList)
-        this.shippingList = newList
-        this.total = newList.length
-
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.skuList = []
-      this.open = false;
-      this.skuIdUpdateOpen = false;
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.orderNum)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 提交按钮 */
-    submitForm() {
-      console.log("=============备货完成提交===",this.ids)
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if(!this.skuList || this.skuList.length === 0){
-            this.$modal.msgError("请选择备货商品");
-          }
-          this.form.orderNums = this.ids;
-          shipStockupCompleteByOrder(this.form).then(response => {
-            this.$modal.msgSuccess("备货完成");
-            this.open = false;
-            this.getList();
-          });
-
-        }
-      });
-    },
-    /** 单个备货 **/
-    stockupCompleteByOrder(row) {
-      this.form.orderNums = [];
-      this.form.orderNums.push(row.orderNum)
-      shipStockupCompleteByOrder(this.form).then(response => {
-        this.$modal.msgSuccess("备货完成");
-        this.open = false;
-        this.getList();
-      });
-
-
-    },
-    handleStatistics(row){
-      this.handleSelection(row,false)
-    },
-    /** 按钮操作 */
-    handleSelection(row,isGen) {
-      const ids = row.orderNum || this.ids;
-      // console.log("=====生成出库单=====",ids)
-      if(!ids && ids.length===0){
-        this.$modal.msgError("请选择备货订单");
-        return
-      }
-      if(isGen===undefined) this.isGen = true
-      else this.isGen = isGen
-      if(this.isGen === false)this.title = "打印备货单";
-      else this.title = "备货完成";
-
-      // 创建一个包含年月日小时分钟秒的字符串作为基本编号
-      var date = new Date();
-      var year = date.getFullYear().toString(); // 四位数表示的年份
-      var month = (date.getMonth() + 1).toString().padStart(2, '0'); // 两位数表示的月份（注意要加上补零）
-      var day = date.getDate().toString().padStart(2, '0'); // 两位数表示的天数（同样需要补零）
-      var hours = date.getHours().toString().padStart(2, '0'); // 两位数表示的小时数（同样需要补零）
-      var minutes = date.getMinutes().toString().padStart(2, '0'); // 两位数表示的分钟数（同样需要补零）
-      var seconds = date.getSeconds().toString().padStart(2, '0'); // 两位数表示的秒数（同样需要补零）
-      // 生成随机数部分
-      var randomNum = Math.floor((Math.random() * 9) + 1); // 生成1到9之间的随机整数
-      // 将所有部分组合起来形成最终的编号
-      var code = `${year}${month}${day}${hours}${minutes}${seconds}${randomNum}`;
-      // console.log("生成的编号为：" + code);
-
-      this.form.stockOutNum = code
-      this.form.completeTime = new Date()
-      this.skuList=[]
-
-      ids.forEach(orderNum=>{
-        // const obj = this.shippingList.find(y=>y.orderNum === orderNum)
-        const objs= this.shippingListOrigin.filter(y=>y.orderNum === orderNum)
-        objs.forEach(obj=>{
-
-
-        const has = this.skuList.find(y=>y.originalSkuId === obj.originalSkuId)
-        if(has){
-          // 增加数量即可
-          has.quantity = has.quantity + obj.quantity
-          has.ids.push(orderNum)
-        }else{
-          // 新增数据
-          const ids1 =[]
-          ids1.push(orderNum);
-          this.skuList.push({
-            ids:ids1,
-            specId:obj.specId,
-            originalSkuId:obj.originalSkuId,
-            goodsImg:obj.goodsImg,
-            goodsNum:obj.goodsNum,
-            goodsTitle:obj.goodsTitle,
-            goodsSpec:obj.goodsSpec,
-            specNum:obj.specNum,
-            quantity:obj.quantity,
-            inventory:obj.inventory
-          })
-        }
-        })
-      })
-
-
-      this.open = true;
-      // this.$modal.confirm('是否确认删除仓库订单发货编号为"' + ids + '"的数据项？').then(function() {
-      //   return delShipping(ids);
-      // }).then(() => {
-      //   this.getList();
-      //   this.$modal.msgSuccess("删除成功");
-      // }).catch(() => {});
-
-    },
-    /** 修改商品关联 */
-    handleUpdateLink(row){
-      this.skuIdUpdateOpen = true
-      this.form2.orderItemId = row.id
-      // this.$modal.msgError("修改商品关联");
-    },
-    submitSkuIdUpdateForm(){
-      this.$refs["form2"].validate(valid => {
-        if (valid) {
-          orderItemSpecIdUpdate(this.form2).then(response => {
-            this.$modal.msgSuccess("SkuId修改成功");
-            this.skuIdUpdateOpen = false;
-            this.getList();
-          });
-
-        }
-      });
+    handleClick(tab, event) {
+      console.log(tab, event);
     }
   }
 };
diff --git a/vue/src/views/shipping/stockup/warehouse/order_item_list.vue b/vue/src/views/shipping/stockup/warehouse/order_item_list.vue
index 9eb18c82..a5aff161 100644
--- a/vue/src/views/shipping/stockup/warehouse/order_item_list.vue
+++ b/vue/src/views/shipping/stockup/warehouse/order_item_list.vue
@@ -1,8 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="订单号" prop="orderNum">
+        <el-input
+          v-model="queryParams.orderNum"
+          placeholder="请输入订单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格编码" prop="specNum">
+        <el-input
+          v-model="queryParams.specNum"
+          placeholder="请输入商品规格编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="店铺" prop="shopId">
-        <el-select v-model="queryParams.shopId" filterable  placeholder="搜索店铺" >
+        <el-select v-model="queryParams.shopId" filterable  placeholder="搜索店铺" clearable @change="handleQuery">
           <el-option v-for="item in shopList" :key="item.id" :label="item.name" :value="item.id">
             <span style="float: left">{{ item.name }}</span>
 
@@ -40,16 +56,9 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="规格编码" prop="specNum">
-        <el-input
-          v-model="queryParams.specNum"
-          placeholder="请输入商品规格编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label="备货状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择">
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable @change="handleQuery">
         <el-option
           v-for="item in statusList"
           :key="item.value"
@@ -89,9 +98,18 @@
     </el-row>
 
     <el-table v-loading="loading" :data="shippingList" @selection-change="handleSelectionChange">
-       <el-table-column type="selection" width="55" v-if="queryParams.status==='0'" align="center" />
+       <el-table-column type="selection" width="55"  align="center" />
       <!-- <el-table-column label="主键" align="center" prop="id" /> -->
-      <el-table-column label="订单编号" align="center" prop="orderNum" />
+      <el-table-column label="订单号" align="left" prop="orderNum" width="200px">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+          >{{scope.row.orderNum}} </el-button>
+          <i class="el-icon-copy-document tag-copy" :data-clipboard-text="scope.row.orderNum" @click="copyActiveCode($event,scope.row.orderNum)" ></i>
+        </template>>
+      </el-table-column>
        <el-table-column label="店铺" align="center" prop="shopId" >
         <template slot-scope="scope">
           <span>{{ shopList.find(x=>x.id === scope.row.shopId).name  }}</span>
@@ -103,17 +121,21 @@
 <!--          <span>{{ parseTime(scope.row.orderDate, '{y}-{m}-{d}') }}</span>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="商品图片" >
+      <el-table-column label="图片" width="55">
         <template slot-scope="scope">
-              <el-image  style="width: 70px; height: 70px;" :src="scope.row.goodsImg"></el-image>
+              <el-image  style="width: 45px; height: 45px;" :src="scope.row.goodsImg"></el-image>
         </template>
       </el-table-column>
-      <el-table-column label="商品标题" align="center" prop="goodsTitle" />
-      <el-table-column label="规格" align="center" prop="goodsSpec" />
-      <el-table-column label="规格编码" align="center" prop="specNum" />
-      <el-table-column label="erp商品id" align="center" prop="goodsId" />
-      <el-table-column label="erp商品SkuId" align="center" prop="specId" />
-      <el-table-column label="商品Sku编码" align="center" prop="specNum" />
+      <el-table-column label="商品" align="left" prop="goodsTitle" />
+      <el-table-column label="规格" align="left" prop="skuName" >
+        <template slot-scope="scope">
+          {{getSkuValues(scope.row.skuName)}}
+        </template>
+      </el-table-column>
+      <el-table-column label="Sku编码" align="center" prop="skuNum" />
+<!--      <el-table-column label="erp商品id" align="center" prop="goodsId" />-->
+      <el-table-column label="商品库SkuId" align="center" prop="skuId" />
+<!--      <el-table-column label="商品Sku编码" align="center" prop="specNum" />-->
        <el-table-column label="商品数量" align="center" prop="quantity" >
          <template slot-scope="scope">
          <el-tag size="small">{{scope.row.quantity}}</el-tag>
@@ -151,36 +173,43 @@
 
     <!-- 添加或修改仓库订单发货对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <div id="dialogContent">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px" inline>
 <!--        <el-form-item label="单号" prop="stockOutNum" v-if="isGen">-->
 <!--          <el-input v-model="form.stockOutNum" disabled placeholder="请输入单号" />-->
 <!--        </el-form-item>-->
-        <el-form-item label="完成时间" prop="completeTime" v-if="isGen">
-          <el-date-picker clearable
-            v-model="form.completeTime"
-            type="datetime" disabled
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-divider content-position="center" v-if="isGen">备货商品</el-divider>
+<!--        <el-form-item label="完成时间" prop="completeTime" v-if="isGen">-->
+<!--          <el-date-picker clearable-->
+<!--            v-model="form.completeTime"-->
+<!--            type="datetime" disabled-->
+<!--            value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--            placeholder="请选择时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-divider content-position="center" v-if="isGen">备货商品</el-divider>-->
         <el-table :data="skuList" :row-class-name="rowItemIndex" ref="skuItem">
-<!--          <el-table-column type="selection" width="50" align="center" />-->
+          <!--          <el-table-column type="selection" width="50" align="center" />-->
           <el-table-column label="序号" align="center" prop="index" width="50"/>
-          <el-table-column label="商品图片" prop="goodsImg" >
+          <el-table-column label="图片" prop="goodsImg" width="55">
             <template slot-scope="scope">
-              <el-image style="width: 70px; height: 70px" :src="scope.row.goodsImg"></el-image>
+              <el-image style="width: 45px; height: 45px" :src="scope.row.goodsImg"></el-image>
             </template>
           </el-table-column>
-          <el-table-column label="商品标题" prop="goodsTitle" ></el-table-column>
-          <el-table-column label="规格" prop="goodsSpec" ></el-table-column>
-          <el-table-column label="sku编码" prop="specNum" ></el-table-column>
-          <el-table-column label="数量" prop="quantity"></el-table-column>
-          <el-table-column label="仓库库存" prop="inventory"></el-table-column>
+          <el-table-column label="商品" prop="goodsTitle" ></el-table-column>
+          <el-table-column label="规格" prop="skuName" >
+            <template slot-scope="scope">
+            {{getSkuValues(scope.row.skuName)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="Sku编码" prop="skuNum" width="150"></el-table-column>
+          <el-table-column label="数量" prop="quantity" width="60"></el-table-column>
+          <!--          <el-table-column label="仓库库存" prop="inventory"></el-table-column>-->
 
         </el-table>
       </el-form>
+      </div>
       <div slot="footer" class="dialog-footer" v-if="isGen">
+        <el-button v-print="'#dialogContent'">打印</el-button>
         <el-button type="primary" @click="submitForm">完成</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -206,8 +235,10 @@
 </template>
 
 <script>
-import {listShipStockupWarehouse, orderItemSpecIdUpdate,shipStockupComplete} from "@/api/shipping/shipping";
+import {listShipStockupWarehouse,shipStockupComplete} from "@/api/shipping/shipping";
+import {orderItemSpecIdUpdate} from "@/api/order/order";
 import { listShop } from "@/api/shop/shop";
+import Clipboard from "clipboard";
 export default {
   name: "ShipStockupOrderItem",
   // computed: {
@@ -267,12 +298,9 @@ export default {
         {
           value: '0',
           label: '待备货'
-        }, {
-          value: '1',
-          label: '备货中'
         }, {
           value: '2',
-          label: '已出库'
+          label: '备货完成'
         }
       ],
       // 表单校验
@@ -306,13 +334,39 @@ export default {
     this.getList();
   },
   methods: {
+    copyActiveCode(event,queryParams) {
+      console.log(queryParams)
+      const clipboard = new Clipboard(".tag-copy")
+      clipboard.on('success', e => {
+        this.$message({ type: 'success', message: '复制成功' })
+        // 释放内存
+        clipboard.destroy()
+      })
+      clipboard.on('error', e => {
+        // 不支持复制
+        this.$message({ type: 'waning', message: '该浏览器不支持自动复制' })
+        // 释放内存
+        clipboard.destroy()
+      })
+    },
     rowItemIndex({ row, rowIndex }) {
       row.index = rowIndex + 1;
     },
+    getSkuValues(spec){
+      try {
+        // 解析 JSON，返回一个数组
+        const parsedSpec = JSON.parse(spec) || [];
+
+        // 使用 map 提取所有 value，使用 join() 用逗号连接
+        return parsedSpec.map(item => item.attr_value || item.value).join(', ') || '';
+      } catch (error) {
+        return spec; // 如果 JSON 解析出错，返回空字符串
+      }
+    },
     /** 查询仓库订单发货列表 */
     getList() {
       this.loading = true;
-      listShipStockupWarehouset(this.queryParams).then(response => {
+      listShipStockupWarehouse(this.queryParams).then(response => {
         this.shippingList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -410,8 +464,8 @@ export default {
             goodsImg:obj.goodsImg,
             goodsNum:obj.goodsNum,
             goodsTitle:obj.goodsTitle,
-            goodsSpec:obj.goodsSpec,
-            specNum:obj.specNum,
+            skuName:obj.skuName,
+            skuNum:obj.skuNum,
             quantity:obj.quantity,
             inventory:obj.inventory
           })
diff --git a/vue/src/views/shipping/stockup/warehouse/order_list.vue b/vue/src/views/shipping/stockup/warehouse/order_list.vue
index 7563caea..b414407e 100644
--- a/vue/src/views/shipping/stockup/warehouse/order_list.vue
+++ b/vue/src/views/shipping/stockup/warehouse/order_list.vue
@@ -1,11 +1,18 @@
 <template>
   <div class="app-container" >
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="店铺" prop="shopId">
-        <el-select v-model="queryParams.shopId" filterable  placeholder="搜索店铺" >
+      <el-form-item label="订单号" prop="orderNum">
+        <el-input
+          v-model="queryParams.orderNum"
+          placeholder="请输入订单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="店铺" prop="shopId" >
+        <el-select v-model="queryParams.shopId" clearable filterable  placeholder="搜索店铺" @change="handleQuery">
           <el-option v-for="item in shopList" :key="item.id" :label="item.name" :value="item.id">
             <span style="float: left">{{ item.name }}</span>
-
               <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 500">视频号小店</span>
               <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 200">京东POP</span>
               <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 280">京东自营</span>
@@ -15,7 +22,7 @@
               <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 999">线下渠道</span>
           </el-option>
           </el-select>
-      </el-form-item> 
+      </el-form-item>
 <!--      <el-form-item label="商品ID" prop="goodsId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.goodsId"-->
@@ -49,7 +56,7 @@
         />
       </el-form-item>
       <el-form-item label="备货状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择">
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable  @change="handleQuery">
         <el-option
           v-for="item in statusList"
           :key="item.value"
@@ -65,16 +72,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-document-copy"
-          size="mini"
-          :disabled="multiple"
-          @click="handleSelection"
-        >备货完成</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-document-copy"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleSelection"-->
+<!--        >备货完成</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
       <el-button
         type="primary"
@@ -89,9 +96,19 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" :data="shippingList" @selection-change="handleSelectionChange"  >
-       <el-table-column type="selection" width="55" v-if="queryParams.status==='0'" align="center" />
-      <!-- <el-table-column label="主键" align="center" prop="id" /> -->
-      <el-table-column label="订单编号" align="left" prop="orderNum" width="150"/>
+       <el-table-column type="selection" width="55"  align="center" />
+      <!-- <el-table-column label="主键" align="center" prop="id" v-if="queryParams.status==='0'"/> -->
+      <el-table-column label="订单编号" align="left" prop="orderNum" width="200px">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+          >{{scope.row.orderNum}} </el-button>
+          <i class="el-icon-copy-document tag-copy" :data-clipboard-text="scope.row.orderNum" @click="copyActiveCode($event,scope.row.orderNum)" ></i>
+
+        </template>
+      </el-table-column>
        <el-table-column label="店铺" align="left" prop="shopId" width="200">
         <template slot-scope="scope">
           <el-tag>{{ shopList.find(x=>x.id === scope.row.shopId)?shopList.find(x=>x.id === scope.row.shopId).name:''  }}</el-tag>
@@ -103,51 +120,45 @@
 <!--          <span>{{ parseTime(scope.row.orderDate, '{y}-{m}-{d}') }}</span>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="商品明细" align="center">
+      <el-table-column label="商品明细" align="left" >
         <template slot="header">
-            <table>
-              <th>
-                <td width="50px">图片</td>
-                <td width="300px" align="left">标题</td>
-                <td width="150" align="left">SKU名</td>
-                <td width="150" align="left">Sku编码</td>
-                <td width="150" align="left">系统SkuId</td>
-                <td width="50" align="left">数量</td>
-              </th>
-            </table>
+          <table>
+            <th>
+              <td width="50px">图片</td>
+              <td width="300px" align="left">标题</td>
+              <td width="250" align="left">规格</td>
+              <td width="150" align="left">Sku编码</td>
+              <td width="150" align="left">系统SkuId</td>
+              <td width="50" align="left">数量</td>
+            </th>
+          </table>
         </template>
         <template slot-scope="scope">
           <el-table :data="scope.row.children"  :show-header="false" style="width: 100%"  >
-                  <el-table-column label="商品图片" width="50px">
-                    <template slot-scope="scope">
-                          <el-image  style="width: 40px; height: 40px;" :src="scope.row.goodsImg" :preview-src-list="[scope.row.goodsImg]"></el-image>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="商品名" align="left" width="300px" prop="goodsTitle" />
-                  <el-table-column label="SKU名" align="left" prop="goodsSpec" width="150"/>
-            <el-table-column label="Sku编码" align="left" prop="specNum" width="150"/>
-<!--                  <el-table-column label="规格编码" align="center" prop="specNum" />-->
-<!--                  <el-table-column label="erp商品id" align="center" prop="goodsId" />-->
-                  <el-table-column label="商品SkuId" align="center" prop="specId" width="150">
-                    <template slot-scope="scope">
-                      <span style="margin-right: 15px">{{scope.row.specId}}</span>
-<!--                      <a style="color:royalblue" href="javascript:void(0);"-->
-<!--                        v-if="!scope.row.specId||scope.row.specId === 0"-->
-<!--                        size="mini"-->
-<!--                        type="primary"-->
-<!--                        plain-->
-<!--                        @click="handleUpdateLink(scope.row)"-->
-<!--                      >修改商品SkuId</a>-->
-                      <el-button icon="el-icon-edit" size="mini"  @click="handleUpdateLink(scope.row)"></el-button>
+            <el-table-column label="图片" width="50px">
+              <template slot-scope="scope">
+                <el-image  style="width: 40px; height: 40px;" :src="scope.row.goodsImg" :preview-src-list="[scope.row.goodsImg]"></el-image>
+              </template>
+            </el-table-column>
+            <el-table-column label="商品" align="left" width="300px" prop="goodsTitle" />
+            <el-table-column label="规格" align="left" prop="skuName" width="250">
+              <template slot-scope="scope">
+                {{ getSkuValues(scope.row.skuName)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="Sku编码" align="left" prop="skuNum" width="150"/>
+            <el-table-column label="商品SkuId" align="center" prop="skuId" width="150">
+              <template slot-scope="scope">
+                <span style="margin-right: 15px">{{scope.row.skuId}}</span>
+                <el-button icon="el-icon-edit" size="mini" plain @click="handleUpdateLink(scope.row)"></el-button>
+              </template>
+            </el-table-column>
 
-                    </template>
-                  </el-table-column>
-
-                   <el-table-column label="商品数量" align="center" prop="quantity" width="50px">
-                     <template slot-scope="scope">
-                     <el-tag size="small">{{scope.row.quantity}}</el-tag>
-                     </template>
-                   </el-table-column>
+            <el-table-column label="商品数量" align="center" prop="quantity" width="50px">
+              <template slot-scope="scope">
+                <el-tag size="small">{{scope.row.quantity}}</el-tag>
+              </template>
+            </el-table-column>
           </el-table>
         </template>
       </el-table-column>
@@ -206,36 +217,40 @@
 <!--        <el-form-item label="单号" prop="stockOutNum" v-if="isGen">-->
 <!--          <el-input v-model="form.stockOutNum" disabled placeholder="请输入单号" />-->
 <!--        </el-form-item>-->
-        <el-form-item label="完成时间" prop="completeTime" v-if="isGen">
-          <el-date-picker clearable
-            v-model="form.completeTime"
-            type="datetime" disabled
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="打印时间" prop="completeTime" v-if="!isGen">
-          <el-date-picker clearable
-                          v-model="form.completeTime"
-                          type="datetime" disabled
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="请选择时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-divider content-position="center" v-if="isGen">备货商品</el-divider>
+<!--        <el-form-item label="完成时间" prop="completeTime" v-if="isGen">-->
+<!--          <el-date-picker clearable-->
+<!--            v-model="form.completeTime"-->
+<!--            type="datetime" disabled-->
+<!--            value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--            placeholder="请选择时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="打印时间" prop="completeTime" v-if="!isGen">-->
+<!--          <el-date-picker clearable-->
+<!--                          v-model="form.completeTime"-->
+<!--                          type="datetime" disabled-->
+<!--                          value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                          placeholder="请选择时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-divider content-position="center" v-if="isGen">备货商品</el-divider>-->
         <el-table :data="skuList" :row-class-name="rowItemIndex" ref="skuItem">
-<!--          <el-table-column type="selection" width="50" align="center" />-->
+          <!--          <el-table-column type="selection" width="50" align="center" />-->
           <el-table-column label="序号" align="center" prop="index" width="50"/>
-          <el-table-column label="商品图片" prop="goodsImg" >
+          <el-table-column label="图片" prop="goodsImg" width="55">
             <template slot-scope="scope">
-              <el-image style="width: 70px; height: 70px" :src="scope.row.goodsImg"></el-image>
+              <el-image style="width: 45px; height: 45px" :src="scope.row.goodsImg"></el-image>
             </template>
           </el-table-column>
-          <el-table-column label="商品标题" prop="goodsTitle" ></el-table-column>
-          <el-table-column label="规格" prop="goodsSpec" ></el-table-column>
-          <el-table-column label="sku编码" prop="specNum" ></el-table-column>
-          <el-table-column label="数量" prop="quantity"></el-table-column>
-          <el-table-column label="仓库库存" prop="inventory"></el-table-column>
+          <el-table-column label="商品" prop="goodsTitle" ></el-table-column>
+          <el-table-column label="规格" prop="skuName" >
+            <template slot-scope="scope">
+              {{ getSkuValues(scope.row.skuName)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="Sku编码" prop="skuNum" width="150"></el-table-column>
+          <el-table-column label="数量" prop="quantity" width="60"></el-table-column>
+          <!--          <el-table-column label="仓库库存" prop="inventory"></el-table-column>-->
 
         </el-table>
       </el-form>
@@ -272,10 +287,12 @@
 <script>
 import {
   listShipStockupWarehouse,
-  orderItemSpecIdUpdate,
   shipStockupCompleteByOrder
 } from "@/api/shipping/shipping";
+import {orderItemSpecIdUpdate} from "@/api/order/order";
 import { listShop } from "@/api/shop/shop";
+import Clipboard from "clipboard";
+
 export default {
   name: "ShipStockupOrder",
   // computed: {
@@ -337,9 +354,6 @@ export default {
         {
           value: '0',
           label: '待备货'
-        }, {
-          value: '1',
-          label: '备货中'
         }, {
           value: '2',
           label: '备货完成'
@@ -376,9 +390,35 @@ export default {
     this.getList();
   },
   methods: {
+    copyActiveCode(event,queryParams) {
+      console.log(queryParams)
+      const clipboard = new Clipboard(".tag-copy")
+      clipboard.on('success', e => {
+        this.$message({ type: 'success', message: '复制成功' })
+        // 释放内存
+        clipboard.destroy()
+      })
+      clipboard.on('error', e => {
+        // 不支持复制
+        this.$message({ type: 'waning', message: '该浏览器不支持自动复制' })
+        // 释放内存
+        clipboard.destroy()
+      })
+    },
     rowItemIndex({ row, rowIndex }) {
       row.index = rowIndex + 1;
     },
+    getSkuValues(spec){
+      try {
+        // 解析 JSON，返回一个数组
+        const parsedSpec = JSON.parse(spec) || [];
+
+        // 使用 map 提取所有 value，使用 join() 用逗号连接
+        return parsedSpec.map(item => item.attr_value || item.value).join(', ') || '';
+      } catch (error) {
+        return spec; // 如果 JSON 解析出错，返回空字符串
+      }
+    },
     /** 查询仓库订单发货列表 */
     getList() {
       this.loading = true;
@@ -533,7 +573,8 @@ export default {
             goodsNum:obj.goodsNum,
             goodsTitle:obj.goodsTitle,
             goodsSpec:obj.goodsSpec,
-            specNum:obj.specNum,
+            skuName:obj.skuName,
+            skuNum:obj.skuNum,
             quantity:obj.quantity,
             inventory:obj.inventory
           })