优化订单相关接口

core/model/src/main/java/cn/qihangerp/model/entity/OOrder.java

@@ -136,12 +136,12 @@ public class OOrder implements Serializable {
     private Date orderTime;
 
     /**
-     * 发货人
+     * 发货方 0 自己发货1联合发货2供应商发货
      */
     private Long shipper;
 
     /**
-     * 发货方式2供应商代发0仓库发货
+     * 发货方式2供应商代发0仓库发货1联合发货
      */
     private Integer shipType;
 

microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java

@@ -64,31 +64,7 @@ public class OrderController extends BaseController
         var pageList = orderService.queryWaitShipmentPageList(order,pageQuery);
         return getDataTable(pageList);
     }
-    /**
-     * 已分配供应商发货列表
-     * @param order
-     * @param pageQuery
-     * @return
-     */
-    @GetMapping("/assignedShipmentList")
-    public TableDataInfo assignedShipmentList(OrderSearchRequest order, PageQuery pageQuery)
-    {
-        var pageList = orderService.queryAssignedShipmentList(order,pageQuery);
-        return getDataTable(pageList);
-    }
 
-    /**
-     * 已发货列表
-     * @param order
-     * @param pageQuery
-     * @return
-     */
-    @GetMapping("/shippedList")
-    public TableDataInfo shippedList(OrderSearchRequest order, PageQuery pageQuery)
-    {
-        var pageList = orderService.queryShippedPageList(order,pageQuery);
-        return getDataTable(pageList);
-    }
 
 
 //    @PostMapping

microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java

@@ -94,10 +94,10 @@ public class OrderShipController extends BaseController {
     }
 
     /**
-     //     * 供应商发货确认
+      * 供应商发货确认
-     //     * @param request
+      * @param request
-     //     * @return
+      * @return
-     //     */
+      */
     @PostMapping("/supplier_ship_confirm")
     public AjaxResult SupplierShipConfirm(@RequestBody SupplierOrderShipBo request) {
         log.info("========供应商发货确认：{}", JSON.toJSONString(request));

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java

@@ -228,7 +228,7 @@ public class DouOrderServiceImpl extends ServiceImpl<DouOrderMapper, DouOrder>
         order.setCity(confirmBo.getCity());
         order.setTown(confirmBo.getTown());
         order.setOrderTime(douOrder.getCreateTime()!=null?new Date(douOrder.getCreateTime()*1000):new Date());
-        order.setShipper(-1);
+        order.setShipper(0L);
         order.setShipStatus(0);
         order.setCreateTime(new Date());
         order.setCreateBy("手动确认订单");
@@ -256,7 +256,7 @@ public class DouOrderServiceImpl extends ServiceImpl<DouOrderMapper, DouOrder>
             oOrderItem.setQuantity(item.getItemNum());
             oOrderItem.setRefundCount(0);
             oOrderItem.setRefundStatus(1);
-            oOrderItem.setShipper(-1);
+            oOrderItem.setShipper(0L);
             oOrderItem.setShipType(order.getShipType());
             oOrderItem.setShipStatus(0);
             oOrderItem.setCreateTime(new Date());

serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java

@@ -38,22 +38,8 @@ public interface OOrderService extends IService<OOrder> {
      */
     PageResult<OOrder> queryWaitShipmentPageList(OrderSearchRequest bo, PageQuery pageQuery);
 
-    /**
-     * 获取已分配发货的list
-     * @param bo
-     * @param pageQuery
-     * @return
-     */
-    PageResult<OOrder> queryAssignedShipmentList(OrderSearchRequest bo, PageQuery pageQuery);
 
 
-    /**
-     * 已经发货的list
-     * @param bo
-     * @param pageQuery
-     * @return
-     */
-    PageResult<OOrder> queryShippedPageList(OrderSearchRequest bo, PageQuery pageQuery);
 
     List<OOrder> getList(OOrder order);
     PageResult<OOrder> queryPageList(OrderSearchRequest bo, PageQuery pageQuery);

serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java

@@ -270,73 +270,7 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
         return PageResult.build(pages);
     }
 
-    /**
-     * 查询分配给供应商发货的订单list
-     * @param bo
-     * @param pageQuery
-     * @return
-     */
-    @Override
-    public PageResult<OOrder> queryAssignedShipmentList(OrderSearchRequest bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<OOrder> queryWrapper = new LambdaQueryWrapper<OOrder>()
-                .eq(bo.getShopId()!=null,OOrder::getShopId,bo.getShopId())
-                .eq(bo.getShopType()!=null,OOrder::getShopType,bo.getShopType())
-                .ne(OOrder::getShipper,0)//ship_type发货方 0 自己发货1联合发货2供应商发货
-                .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderTime,bo.getStartTime())
-                .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),OOrder::getOrderTime,bo.getEndTime())
-                .eq(org.springframework.util.StringUtils.hasText(bo.getOrderNum()),OOrder::getOrderNum,bo.getOrderNum())
-                ;
-        Page<OOrder> pages = orderMapper.selectPage(pageQuery.build(), queryWrapper);
 
-        // 查询子订单
-        if(pages.getRecords()!=null){
-            for (OOrder order:pages.getRecords()) {
-                order.setItemList(orderItemMapper.selectList(new LambdaQueryWrapper<OOrderItem>()
-                        .eq(OOrderItem::getOrderId, order.getId())
-                        .ne(OOrderItem::getShipper,0)
-                ));
-//                order.setShipmentList(shipmentMapper.selectList(new LambdaQueryWrapper<ErpShipment>().eq(ErpShipment::getOrderId,order.getId())));
-            }
-        }
-
-        return PageResult.build(pages);
-
-    }
-
-    /**
-     * 已经发货的list（去除分配给供应商发货的）
-     * @param bo
-     * @param pageQuery
-     * @return
-     */
-    @Override
-    public PageResult<OOrder> queryShippedPageList(OrderSearchRequest bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<OOrder> queryWrapper = new LambdaQueryWrapper<OOrder>()
-
-                .eq(bo.getShopId()!=null,OOrder::getShopId,bo.getShopId())
-                .eq(bo.getShopType()!=null,OOrder::getShopType,bo.getShopType())
-                .eq(bo.getShipType()!=null,OOrder::getShipType,bo.getShipType())
-                .eq(OOrder::getShipStatus,2)//发货状态 0 待发货 1 已分配供应商发货 2全部发货
-
-                .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),OOrder::getOrderTime,bo.getStartTime())
-                .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),OOrder::getOrderTime,bo.getEndTime())
-                .eq(org.springframework.util.StringUtils.hasText(bo.getOrderNum()),OOrder::getOrderNum,bo.getOrderNum())
-                ;
-        Page<OOrder> pages = orderMapper.selectPage(pageQuery.build(), queryWrapper);
-
-        // 查询子订单
-        if(pages.getRecords()!=null){
-            for (OOrder order:pages.getRecords()) {
-                order.setItemList(orderItemMapper.selectList(new LambdaQueryWrapper<OOrderItem>()
-                        .eq(OOrderItem::getOrderId, order.getId())
-                        .eq(OOrderItem::getShipStatus,2)
-                ));
-//                order.setShipmentList(shipmentMapper.selectList(new LambdaQueryWrapper<ErpShipment>().eq(ErpShipment::getOrderId,order.getId())));
-            }
-        }
-
-        return PageResult.build(pages);
-    }
 
     @Override
     public List<OOrder> getList(OOrder order) {
@@ -761,7 +695,7 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
         update.setId(erpOrder.getId());
         update.setShipType(2);//发货方式2供应商代发0仓库发货
         update.setShipStatus(1);//发货状态 0 待发货 1 已分配供应商发货 2全部发货
-        update.setShipper(shipBo.getSupplierId());//发货人
+        update.setShipper(shipBo.getSupplierId());//发货方
         update.setUpdateTime(new Date());
         update.setUpdateBy("分配供应商发货");
         orderMapper.updateById(update);

serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java

@@ -278,7 +278,7 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
         order.setCity(confirmBo.getCity());
         order.setTown(confirmBo.getTown());
         order.setOrderTime(StringUtils.hasText(pddOrder.getCreatedTime())?DateUtils.dateTime("yyyy-MM-dd HH:mm:ss",pddOrder.getCreatedTime()):new Date());
-        order.setShipper(-1);
+        order.setShipper(0L);
         order.setShipStatus(0);
         order.setCreateTime(new Date());
         order.setCreateBy("手动确认订单");
@@ -307,7 +307,7 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
 
             oOrderItem.setRefundCount(0);
             oOrderItem.setRefundStatus(1);
-            oOrderItem.setShipper(-1);
+            oOrderItem.setShipper(0l);
             oOrderItem.setShipType(order.getShipType());
             oOrderItem.setShipStatus(0);
             oOrderItem.setCreateTime(new Date());

serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java

@@ -281,7 +281,7 @@ public class TaoOrderServiceImpl extends ServiceImpl<TaoOrderMapper, TaoOrder>
         order.setCity(confirmBo.getCity());
         order.setTown(confirmBo.getTown());
         order.setOrderTime(StringUtils.hasText(pddOrder.getCreated())? DateUtils.dateTime("yyyy-MM-dd HH:mm:ss",pddOrder.getCreated()):new Date());
-        order.setShipper(-1);
+        order.setShipper(0l);
         order.setShipStatus(0);
         order.setCreateTime(new Date());
         order.setCreateBy("手动确认订单");
@@ -310,7 +310,7 @@ public class TaoOrderServiceImpl extends ServiceImpl<TaoOrderMapper, TaoOrder>
 
             oOrderItem.setRefundCount(0);
             oOrderItem.setRefundStatus(1);
-            oOrderItem.setShipper(-1);
+            oOrderItem.setShipper(0l);
             oOrderItem.setShipType(order.getShipType());
             oOrderItem.setShipStatus(0);
             oOrderItem.setCreateTime(new Date());

serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java

@@ -206,7 +206,7 @@ public class WeiOrderServiceImpl extends ServiceImpl<WeiOrderMapper, WeiOrder>
         order.setCity(confirmBo.getCity());
         order.setTown(confirmBo.getTown());
         order.setOrderTime(pddOrder.getCreateTime()!=null?new Date(pddOrder.getCreateTime()*1000):new Date());
-        order.setShipper(-1);
+        order.setShipper(0l);
         order.setShipStatus(0);
         order.setCreateTime(new Date());
         order.setCreateBy("手动确认订单");
@@ -235,7 +235,7 @@ public class WeiOrderServiceImpl extends ServiceImpl<WeiOrderMapper, WeiOrder>
 
             oOrderItem.setRefundCount(0);
             oOrderItem.setRefundStatus(1);
-            oOrderItem.setShipper(-1);
+            oOrderItem.setShipper(0l);
             oOrderItem.setShipType(order.getShipType());
             oOrderItem.setShipStatus(0);
             oOrderItem.setCreateTime(new Date());

vue/src/api/order/order.js

@@ -36,38 +36,17 @@ export function listOrderItem(query) {
   })
 }
 
-export function updateErpSkuId(data) {
-  return request({
-    url: '/api/oms-api/order/updateErpSkuId',
-    method: 'post',
-    data: data
-  })
-}
 
 // 查询待自己发货的订单列表（待发货的）
-export function waitSelfShipmentList(query) {
+export function waitShipList(query) {
   return request({
     url: '/api/oms-api/order/waitShipmentList',
     method: 'get',
     params: query
   })
 }
-// 查询已分配给供应商发货的订单
+
-export function assignedShipmentList(query) {
+
-  return request({
-    url: '/api/oms-api/order/assignedShipmentList',
-    method: 'get',
-    params: query
-  })
-}
-// 查询己发货的订单列表(已发货的)
-export function selfShippedList(query) {
-  return request({
-    url: '/api/oms-api/order/shippedList',
-    method: 'get',
-    params: query
-  })
-}
 
 // 分配供应商发货
 export function allocateShipmentOrder(data) {

vue/src/views/order/item_list.vue

@@ -135,16 +135,16 @@
            <el-tag v-if="scope.row.refundStatus === 4">退款成功</el-tag>
         </template>
       </el-table-column>
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-<!--        <template slot-scope="scope">-->
+        <template slot-scope="scope">
-<!--          <el-button-->
+          <el-button
-<!--            size="mini"-->
+            size="mini"
-<!--            type="text"-->
+            type="text"
-<!--            icon="el-icon-edit"-->
+            icon="el-icon-edit"
-<!--            @click="handleEditErpSku(scope.row)"-->
+            @click="handleEditErpSku(scope.row)"
-<!--          >补充ERP SKU</el-button>-->
+          >补充ERP SKU</el-button>
-<!--        </template>-->
+        </template>
-<!--      </el-table-column>-->
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -157,8 +157,8 @@
     <!-- 修改Erp Sku 对话框 -->
     <el-dialog title="修改ERP SKU ID" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="ERP商品skuId" prop="erpSkuId">
+        <el-form-item label="商品库SkuId" prop="erpGoodsSpecId">
-          <el-input type="number" v-model="form.erpSkuId" placeholder="请输入ERP商品skuId" />
+          <el-input type="number" v-model="form.erpGoodsSpecId" placeholder="请输入商品库SkuId" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -170,10 +170,11 @@
 </template>
 
 <script>
-import {listOrderItem, updateErpSkuId} from "@/api/order/order";
+import {listOrderItem, orderItemSpecIdUpdate} from "@/api/order/order";
 import { listShop } from "@/api/shop/shop";
 import Clipboard from "clipboard";
 
+
 export default {
   name: "Order",
   data() {
@@ -215,11 +216,11 @@ export default {
       // 表单参数
       form: {
         id:null,
-        erpSkuId:null
+        erpGoodsSpecId:null
       },
       // 表单校验
       rules: {
-        erpSkuId: [{ required: true, message: "请输入ERP系统商品SkuId", trigger: "change" }],
+        erpGoodsSpecId: [{ required: true, message: "请输入ERP系统商品SkuId", trigger: "change" }],
       }
     };
   },
@@ -308,7 +309,7 @@ export default {
       this.open = false
     },
     handleEditErpSku(row){
-      this.form.id = row.id
+      this.form.orderItemId = row.id
       if(this.form.erpSkuId && this.form.erpSkuId > 0) {
         this.form.erpSkuId = row.erpSkuId
       }
@@ -318,7 +319,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           console.log('====修改参数====',this.form)
-          updateErpSkuId(this.form).then(response => {
+          orderItemSpecIdUpdate(this.form).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();

vue/src/views/shipping/shipment/assigned_list.vue

@@ -1,390 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="printParams" 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="shopId">
-        <el-select v-model="queryParams.shopId" 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 === 3">拼多多</span>
-            <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 5">微信小店</span>
-            <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 9">其他渠道</span>
-          </el-option>
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="供应商" prop="shipSupplierId">-->
-<!--        <el-select clearable-->
-<!--                   v-model="queryParams.shipSupplierId"-->
-<!--                   filterable-->
-<!--                   placeholder="请输入供应商名称">-->
-<!--          <el-option-->
-<!--            v-for="item in supplierList"-->
-<!--            :key="item.id"-->
-<!--            :label="item.name"-->
-<!--            :value="item.id">-->
-<!--          </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="primary"-->
-<!--          plain-->
-<!--          :disabled="single"-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleShip"-->
-<!--        >填写供应商发货物流</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type=""-->
-<!--          plain-->
-<!--          :disabled="single"-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="allocateShipmentToSupplier"-->
-<!--        >分配给供应商发货</el-button>-->
-<!--      </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
-       <el-table-column type="selection" width="55" align="center" />
-<!--      <el-table-column label="ID" align="center" prop="id" />-->
-      <el-table-column label="订单号" align="left" prop="orderNum" width="200">
-        <template slot-scope="scope">
-          <span>{{scope.row.orderNum}}</span>
-          <br/>
-          <el-tag type="info">{{ 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="商品" width="400">
-        <template slot-scope="scope">
-          <el-row v-for="item in scope.row.itemList" :key="item.id" :gutter="20">
-            <div style="float: left;display: flex;align-items: center;" >
-              <image-preview :src="item.goodsImg" :width="40" :height="40"/>
-              <div style="margin-left:10px">
-                <div>{{item.goodsTitle}}</div>
-                <div>
-                  <div>
-                    {{ getSkuValues(item.goodsSpec)}}
-                    数量：<el-tag size="small">x {{item.quantity}}</el-tag>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </el-row>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单金额" align="center" prop="amount" :formatter="amountFormatter"/>
-      <el-table-column label="下单时间" align="center" prop="orderCreateTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderTime) }}</span>
-        </template>
-      </el-table-column>
-
-
-      <el-table-column label="收件人" prop="receiverName" width="200px">
-        <template slot-scope="scope">
-          {{scope.row.receiverName}}&nbsp;
-          {{scope.row.receiverMobile}} <br />
-          {{scope.row.province}} {{scope.row.city}} {{scope.row.town}} <br />
-        </template>
-      </el-table-column>
-      <el-table-column label="订单备注" align="center" >
-        <template slot-scope="scope">
-          <div style="color: #ed5565">{{scope.row.remark}}</div>
-          <div style="color: #ed5565">{{scope.row.buyerMemo}}</div>
-          <div style="color: #ed5565">{{scope.row.sellerMemo}}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="发货状态" align="center" prop="shipStatus" >
-        <template slot-scope="scope">
-<!--          <el-tag type="success" v-if="scope.row.shipStatus === 0" style="margin-bottom: 6px;">待发货</el-tag>-->
-          <el-tag type="success" v-if="scope.row.shipStatus === 1" style="margin-bottom: 6px;">待供应商发货</el-tag>
-          <el-tag type="success" v-if="scope.row.shipStatus === 2" style="margin-bottom: 6px;">已发货</el-tag>
-          <br />
-          <!-- 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 -->
-          <el-tag v-if="scope.row.shipper == 0" type="info">自己发货</el-tag>
-          <el-tag v-if="scope.row.shipper == 1" type="info">联合发货</el-tag>
-          <el-tag v-if="scope.row.shipper == 2" type="info">供应商发货</el-tag>
-        </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="打包发货" :visible.sync="shipOpen" width="1100px" append-to-body>
-
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" >
-        <el-descriptions title="订单信息">
-          <el-descriptions-item label="ID">{{form.id}}</el-descriptions-item>
-          <el-descriptions-item label="订单号">{{form.orderNum}}</el-descriptions-item>
-
-          <el-descriptions-item label="店铺">
-            {{ shopList.find(x=>x.id == form.shopId)?shopList.find(x=>x.id == form.shopId).name:'' }}
-            <el-tag size="small" v-if="form.shopType === 5">微信小店</el-tag>
-
-          </el-descriptions-item>
-          <el-descriptions-item label="买家留言">
-            {{form.buyerMemo}}
-          </el-descriptions-item>
-          <el-descriptions-item label="备注">
-            {{form.remark}}
-          </el-descriptions-item>
-          <el-descriptions-item label="创建时间">
-            {{ parseTime(form.createTime) }}
-          </el-descriptions-item>
-
-          <el-descriptions-item label="订单状态">
-            <el-tag v-if="form.orderStatus === 1" style="margin-bottom: 6px;">待发货</el-tag>
-            <el-tag v-if="form.orderStatus === 2" style="margin-bottom: 6px;">已发货</el-tag>
-            <el-tag v-if="form.orderStatus === 3" style="margin-bottom: 6px;">已签收</el-tag>
-          </el-descriptions-item>
-          <el-descriptions-item label="退款状态">
-            <el-tag v-if="form.refundStatus === 1">无售后或售后关闭</el-tag>
-            <el-tag v-if="form.refundStatus === 2">售后处理中</el-tag>
-            <el-tag v-if="form.refundStatus === 3">退款中</el-tag>
-            <el-tag v-if="form.refundStatus === 4">退款成功</el-tag>
-          </el-descriptions-item>
-          <el-descriptions-item label="">
-<!--            <el-tag v-if="form.shipType === 1"  type="danger">供应商代发</el-tag>-->
-<!--            <el-tag v-if="form.shipType === 0" type="danger">仓库发货</el-tag>-->
-          </el-descriptions-item>
-          <el-descriptions-item label="收件人姓名">{{form.receiverName}}</el-descriptions-item>
-          <el-descriptions-item label="收件人手机号">{{form.receiverMobile}}</el-descriptions-item>
-          <el-descriptions-item label="省市区">{{form.province}}{{form.city}}{{form.town}}</el-descriptions-item>
-          <el-descriptions-item label="详细地址">{{form.address}}</el-descriptions-item>
-
-
-
-        </el-descriptions>
-
-        <el-divider content-position="center">商品明细</el-divider>
-        <el-table :data="form.itemList"  style="margin-bottom: 10px;">
-          <!-- <el-table-column type="selection" width="50" align="center" /> -->
-          <el-table-column label="序号" align="center" type="index" width="50"/>
-
-          <el-table-column label="商品图片" prop="goodsImg" width="80">
-            <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="SKU" prop="goodsSpec" width="150"></el-table-column>
-          <el-table-column label="sku编码" prop="skuNum"></el-table-column>
-          <!--          <el-table-column label="单价" prop="goodsPrice"></el-table-column>-->
-          <el-table-column label="数量" prop="quantity"></el-table-column>
-          <!-- <el-table-column label="商品金额" prop="itemAmount"></el-table-column> -->
-        </el-table>
-        <el-form-item label="包裹尺寸" prop="height">
-          <el-input type="number" v-model.number="form.length" placeholder="长mm" style="width:90px" /> x
-          <el-input type="number"  v-model.number="form.width" placeholder="宽mm" style="width:90px" /> x
-          <el-input type="number" v-model.number="form.height" placeholder="高mm" style="width:90px" />
-        </el-form-item>
-        <el-form-item label="包裹重量" prop="weight">
-          <el-input type="number" v-model.number="form.weight" placeholder="请输入包裹重量（单位g）" style="width:300px" />
-        </el-form-item>
-        <el-row>
-          <el-col>
-            <el-form-item label="物流公司" prop="shippingCompany">
-              <!--              <el-input v-model="form.shippingCompany" placeholder="请输入物流公司" style="width:300px" />-->
-              <el-select v-model="form.shippingCompany" filterable r placeholder="选择快递公司" style="width:300px">
-                <el-option v-for="item in logisticsList" :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" >{{item.number}}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="物流单号" prop="shippingNumber">
-              <el-input v-model="form.shippingNumber" placeholder="请输入物流单号" style="width:300px" />
-            </el-form-item>
-            <el-form-item label="物流费用" prop="shippingCost">
-              <el-input v-model="form.shippingCost" placeholder="请输入物流费用" style="width:300px" />
-            </el-form-item>
-            <el-form-item label="发货人" prop="shippingMan">
-              <el-input v-model="form.shippingMan" placeholder="请输入发货人" style="width:300px" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitShipForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import {assignedShipmentList} from "@/api/order/order";
-
-
-import {listLogisticsStatus} from "@/api/api/logistics";
-import {listShop} from "@/api/shop/shop";
-import {amountFormatter, parseTime} from "@/utils/zhijian";
-
-export default {
-  name: "ShipmentAssigned",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      getCodeOpen: false,
-      // 选中数组
-      ids: [],
-      shopList: [],
-      orderList: [],
-      logisticsList: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      shipOpen: false,
-      allocateShipmentOpen: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        shopType:null,
-        shopId:null,
-      },
-      // 打印参数
-      printParams: {
-        deliver: null,
-        printer: null
-      },
-      // 表单参数
-      form: {
-        weight:0.0
-      },
-      printerList: [],
-      deliverList: [],
-      // 表单校验
-      rules: {
-        height: [{ required: true, message: '不能为空' }],
-        weight: [{ required: true, message: '不能为空' }],
-        shippingNumber: [{ required: true, message: '不能为空' }],
-        shippingCompany: [{ required: true, message: '不能为空' }],
-        shippingCost: [{ required: true, message: '不能为空' }],
-        // shippingMan: [{ required: true, message: '不能为空' }],
-        receiverName: [{ required: true, message: '不能为空' }],
-        receiverMobile: [{ required: true, message: '不能为空' }],
-        address: [{ required: true, message: '不能为空' }],
-      }
-    };
-  },
-  created() {
-
-    listShop().then(response => {
-      this.shopList = response.rows;
-
-      this.getList();
-    });
-
-  },
-  methods: {
-    amountFormatter,
-    parseTime,
-    getSkuValues(spec){
-      try {
-        // 解析 JSON，返回一个数组
-        const parsedSpec = JSON.parse(spec) || [];
-
-        // 使用 map 提取所有 value，使用 join() 用逗号连接
-        return parsedSpec.map(item => item.attr_value).join(', ') || '';
-      } catch (error) {
-        return spec; // 如果 JSON 解析出错，返回空字符串
-      }
-    },
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      assignedShipmentList(this.queryParams).then(response => {
-        this.orderList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.allocateShipmentOpen = false;
-      this.shipOpen = false;
-      this.getCodeOpen = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        erpSkuId: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-
-    // 手动发货表单
-    submitShipForm(){
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-
-        }
-      })
-    },
-
-  }
-};
-</script>

vue/src/views/shipping/shipment/index.vue

@@ -1,45 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="待发货" name="waitShip">
-        <shipment-wait></shipment-wait>
-      </el-tab-pane>
-      <el-tab-pane label="已发货" name="shipped" lazy>
-        <shipment-shipped></shipment-shipped>
-      </el-tab-pane>
-      <el-tab-pane label="已分配供应商发货" name="assigned" lazy>
-        <shipment-assigned></shipment-assigned>
-      </el-tab-pane>
-
-
-    </el-tabs>
-
-  </div>
-</template>
-
-<script>
-import ShipmentWait  from "@/views/shipping/shipment/wait_ship.vue";
-import ShipmentShipped  from "@/views/shipping/shipment/shipped_list.vue";
-import ShipmentAssigned  from "@/views/shipping/shipment/assigned_list.vue";
-
-export default {
-  name: "Shipment",
-  components:{ShipmentWait,ShipmentShipped,ShipmentAssigned},
-  data() {
-    return {
-      activeName: 'waitShip'
-    };
-  },
-  created() {
-
-  },
-  mounted() {
-
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab, event);
-    }
-  }
-};
-</script>

vue/src/views/shipping/shipment/shipped_list.vue

@@ -1,330 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="printParams" 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="shopId">
-        <el-select v-model="queryParams.shopId" 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 === 3">拼多多</span>
-            <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 5">微信小店</span>
-            <span style="float: right; color: #8492a6; font-size: 13px"  v-if="item.type === 9">其他渠道</span>
-          </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-item>
-        <el-select v-model="printParams.printer" placeholder="请选择打印机" clearable>
-          <el-option
-            v-for="item in printerList"
-            :key="item.name"
-            :label="item.name"
-            :value="item.name">
-          </el-option>
-        </el-select>
-
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-time"
-          size="mini"
-          :disabled="single"
-          @click="handleGetEwaybillCode"
-        >修改发货单号</el-button>
-      </el-col>
-
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
-       <el-table-column type="selection" width="55" align="center" />
-<!--      <el-table-column label="ID" align="center" prop="id" />-->
-      <el-table-column label="订单号" align="left" prop="orderNum" width="200">
-        <template slot-scope="scope">
-          <span>{{scope.row.orderNum}}</span>
-          <el-tag>{{ parseTime(scope.row.orderTime) }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="商品" width="400">
-        <template slot-scope="scope">
-          <el-row v-for="item in scope.row.itemList" :key="item.id" :gutter="20">
-            <div style="float: left;display: flex;align-items: center;" >
-              <image-preview :src="item.goodsImg" :width="40" :height="40"/>
-              <div style="margin-left:10px">
-                <div>{{item.goodsTitle}}</div>
-                <div>
-                  <div>
-                    {{ getSkuValues(item.goodsSpec)}}
-                    数量：<el-tag size="small">x {{item.quantity}}</el-tag>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </el-row>
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="下单时间" align="center" prop="orderCreateTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.orderTime) }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <el-table-column label="订单备注" align="center" >
-        <template slot-scope="scope">
-          <div style="color: #ed5565">{{scope.row.remark}}</div>
-          <div style="color: #ed5565">{{scope.row.buyerMemo}}</div>
-          <div style="color: #ed5565">{{scope.row.sellerMemo}}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="收件人" prop="receiverName" width="200px">
-        <template slot-scope="scope">
-          {{scope.row.receiverName}}&nbsp;
-          {{scope.row.receiverMobile}} <br />
-          {{scope.row.province}} {{scope.row.city}} {{scope.row.town}} <br />
-        </template>
-      </el-table-column>
-      <el-table-column label="快递信息" align="left" prop="waybillCode" >
-        <template slot-scope="scope">
-          <el-row v-for="item in scope.row.shipmentList" :key="item.id" :gutter="20">
-            <div style="color: #1c84c6">{{item.shipCompany}}</div>
-            <div style="color: #1c84c6">{{ item.shipCode}}</div>
-            <div>{{ item.shipTime}}</div>
-          </el-row>
-        </template>
-      </el-table-column>
-      <el-table-column label="发货方式" align="center" prop="waybillCompany" >
-        <template slot-scope="scope">
-        <el-tag v-if="scope.row.shipper==0&&scope.row.shipType==1" size="small">电子面单发货</el-tag>
-        <el-tag v-if="scope.row.shipper==0&&scope.row.shipType==2" size="small">手动发货</el-tag>
-        <el-tag v-if="scope.row.shipper==1" size="small">供应商发货</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单金额" align="center" prop="amount" :formatter="amountFormatter"/>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 取号 -->
-    <el-dialog title="取号" :visible.sync="getCodeOpen" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="电子面单账户" prop="accountId">
-          <el-select v-model="form.accountId" placeholder="请选择电子面单账户" clearable>
-            <el-option
-              v-for="item in deliverList"
-              :key="item.id"
-              :label="item.deliveryId"
-              :value="item.id">
-              <span style="float: left">{{ item.deliveryId }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px" >{{item.siteName}}:{{item.available}}</span>
-            </el-option>
-          </el-select>
-
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="getCodeOpenForm">取号并发货</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import {
-selfShippedList
-} from "@/api/order/order";
-
-import {listShop} from "@/api/shop/shop";
-import {parseTime,amountFormatter} from "@/utils/zhijian";
-
-export default {
-  name: "ShipmentShipped",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      getCodeOpen: false,
-      // 选中数组
-      ids: [],
-      shopList: [],
-      orderList: [],
-      logisticsList: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      shipOpen: false,
-      allocateShipmentOpen: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        shopId:null,
-        shipType:2
-      },
-      // 打印参数
-      printParams: {
-        deliver: null,
-        printer: null
-      },
-      // 表单参数
-      form: {
-        weight:0.0
-      },
-      printerList: [],
-      deliverList: [],
-      // 表单校验
-      rules: {
-        height: [{ required: true, message: '不能为空' }],
-        weight: [{ required: true, message: '不能为空' }],
-        shippingNumber: [{ required: true, message: '不能为空' }],
-        shippingCompany: [{ required: true, message: '不能为空' }],
-        shippingCost: [{ required: true, message: '不能为空' }],
-        // shippingMan: [{ required: true, message: '不能为空' }],
-        receiverName: [{ required: true, message: '不能为空' }],
-        receiverMobile: [{ required: true, message: '不能为空' }],
-        address: [{ required: true, message: '不能为空' }],
-      }
-    };
-  },
-  created() {
-    listShop({}).then(response => {
-      this.shopList = response.rows;
-      // if (this.shopList && this.shopList.length > 0) {
-      //   this.queryParams.shopId = this.shopList[0].id
-      // }
-      this.getList();
-    });
-
-  },
-  methods: {
-    amountFormatter,
-    parseTime,
-    getSkuValues(spec){
-      try {
-        // 解析 JSON，返回一个数组
-        const parsedSpec = JSON.parse(spec) || [];
-
-        // 使用 map 提取所有 value，使用 join() 用逗号连接
-        return parsedSpec.map(item => item.attr_value).join(', ') || '';
-      } catch (error) {
-        return spec; // 如果 JSON 解析出错，返回空字符串
-      }
-    },
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      selfShippedList(this.queryParams).then(response => {
-        this.orderList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    // 取号弹窗
-    handleGetEwaybillCode() {
-
-      const ids = this.ids;
-      if (ids) {
-          this.getCodeOpen = true
-      } else {
-        this.$modal.msgError("请选择订单")
-      }
-
-    },
-
-    /** 取号提交按钮 */
-    getCodeOpenForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          const ids = this.ids;
-          console.log('=========3333========', ids)
-          if (ids) {
-            console.log('===请求参数=====', {shopId: this.queryParams.shopId, ids: ids, accountId: this.form.accountId})
-            getWaybillCodeAndSend({
-              shopId: this.queryParams.shopId,
-              ids: ids,
-              accountId: this.form.accountId
-            }).then(response => {
-              this.$modal.msgSuccess("取号成功")
-              this.getList()
-              this.getCodeOpen = false
-            });
-          } else {
-            this.$modal.msgError("请选择订单")
-          }
-        }
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.allocateShipmentOpen = false;
-      this.shipOpen = false;
-      this.getCodeOpen = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        erpSkuId: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-
-
-  }
-};
-</script>

vue/src/views/shipping/stockup/warehouse/index.vue

@@ -1,40 +1,614 @@
 <template>
   <div class="app-container" >
-    <el-tabs v-model="activeName" @tab-click="handleClick" type="card">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-tab-pane label="发货订单" name="stockShip">
+      <el-form-item label="订单号" prop="orderNum">
-        <warehouse-shipment></warehouse-shipment>
+        <el-input
-      </el-tab-pane>
+          v-model="queryParams.orderNum"
-      <el-tab-pane label="发货订单商品" name="stockShipItem" lazy>
+          placeholder="请输入订单号"
-        <warehouse-shipment-item></warehouse-shipment-item>
+          clearable
-      </el-tab-pane>
+          @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>
+              <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="请选择" clearable  @change="handleQuery">
+        <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-tabs>
+    <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"  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>
+        </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="left" >
+        <template slot="header">
+          <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="规格" 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>
+
+            <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" width="55">
+            <template slot-scope="scope">
+              <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="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 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>
 
   </div>
 </template>
 
 <script>
-import warehouseShipment  from "@/views/shipping/stockup/warehouse/order_list.vue";
+import {
-import warehouseShipmentItem  from "@/views/shipping/stockup/warehouse/order_item_list.vue";
+  listShipStockupWarehouse,
-
+  shipStockupCompleteByOrder
+} from "@/api/shipping/shipping";
+import {orderItemSpecIdUpdate} from "@/api/order/order";
+import { listShop } from "@/api/shop/shop";
+import Clipboard from "clipboard";
 
 export default {
-  name: "stocking",
+  name: "ShipStockupOrder",
-  components:{warehouseShipment,warehouseShipmentItem},
+  // computed: {
+  //   supplier() {
+  //     return supplier
+  //   }
+  // },
   data() {
     return {
-      activeName: 'stockShip'
+      // 遮罩层
-    };
+      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,
       },
-  created() {
+      // 表单参数
-
+      form: {
+        ids:[],
+        completeTime:null
+      },
+      form1: {
+        orderItemIds:[]
+      },
+      form2: {
+        orderItemId:null
+      },
+      shopList: [],
+      skuList:[],
+      supplierList:[],
+      // 备货原始数据
+      shippingListOrigin:[],
+      statusList: [
+        {
+          value: '0',
+          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" }],
+      }
+    };
   },
   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: {
-    handleClick(tab, event) {
+    copyActiveCode(event,queryParams) {
-      console.log(tab, event);
+      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;
+      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,
+            skuName:obj.skuName,
+            skuNum:obj.skuNum,
+            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();
+          });
+
+        }
+      });
     }
   }
 };

vue/src/views/shipping/stockup/warehouse/index1.vue

@@ -0,0 +1,41 @@
+<template>
+  <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>
+
+    </el-tabs>
+
+  </div>
+</template>
+
+<script>
+import warehouseShipment  from "@/views/shipping/stockup/warehouse/order_list.vue";
+import warehouseShipmentItem  from "@/views/shipping/stockup/warehouse/order_item_list.vue";
+
+
+export default {
+  name: "stocking",
+  components:{warehouseShipment,warehouseShipmentItem},
+  data() {
+    return {
+      activeName: 'stockShip'
+    };
+  },
+  created() {
+
+  },
+  mounted() {
+
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }
+  }
+};
+</script>

vue/src/views/shipping/wait_ship.vue

@@ -356,7 +356,7 @@ import {
   getOrder,
   manualShipmentOrder,
   allocateShipmentOrder,
-  waitSelfShipmentList
+  waitShipList
 } from "@/api/order/order";
 
 import {listShop} from "@/api/shop/shop";
@@ -453,7 +453,7 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      waitSelfShipmentList(this.queryParams).then(response => {
+      waitShipList(this.queryParams).then(response => {
         this.orderList = response.rows;
         this.total = response.total;
         this.loading = false;