From cfc5ec812ab6907e834783a2405a4cbc94d42429 Mon Sep 17 00:00:00 2001
From: Richie <280645618@qq.com>
Date: Sat, 24 May 2025 13:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=BA=BF=E4=B8=8B=E6=B8=A0?=
 =?UTF-8?q?=E9=81=93=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/qihang-oms.sql                           |   3 +-
 .../order/private/shipPrintOrderList.vue      | 526 ++++++++++++++++++
 vue/src/views/order/shopOrder/index.vue       |   7 +-
 .../views/shipping/ewaybillPrint/index.vue    |   8 +-
 vue/src/views/shop/ewaybillAccount/index.vue  |   2 +-
 5 files changed, 538 insertions(+), 8 deletions(-)
 create mode 100644 vue/src/views/order/private/shipPrintOrderList.vue

diff --git a/docs/qihang-oms.sql b/docs/qihang-oms.sql
index 615a558c..61ac447d 100644
--- a/docs/qihang-oms.sql
+++ b/docs/qihang-oms.sql
@@ -1161,6 +1161,7 @@ INSERT INTO `o_shop_platform` VALUES (200, '京东POP', 'JD-POP', '', NULL, 'htt
 INSERT INTO `o_shop_platform` VALUES (300, '拼多多', 'PDD', '', NULL, 'http://www.qihangerp.cn', 'https://gw-api.pinduoduo.com/api/router', 0, 0, 1);
 INSERT INTO `o_shop_platform` VALUES (400, '抖店', 'DOUDIAN', '', '', 'http://www.qihangerp.cn', 'https://openapi-fxg.jinritemai.com/', 0, 0, 1);
 INSERT INTO `o_shop_platform` VALUES (500, '微信小店', 'WEISHOP', '', NULL, 'http://www.qihangerp.cn', 'https://api.weixin.qq.com', 0, 0, 1);
+INSERT INTO `o_shop_platform` VALUES (999, '线下渠道', 'OFFLINE', '', NULL, 'http://www.qihangerp.cn', 'https://api.qihangerp.cn', 0, 0, 1);
 
 -- ----------------------------
 -- Table structure for o_shop_pull_lasttime
@@ -3116,7 +3117,7 @@ INSERT INTO `sys_menu` VALUES (2093, '订单明细', 1, 2, 'order_item_list', 'o
 INSERT INTO `sys_menu` VALUES (2094, '取号&发货', 2087, 1, 'print', 'shipping/ewaybillPrint/index', NULL, 1, 0, 'C', '0', '0', '', 'edit', 'admin', '2024-07-20 11:04:54', 'admin', '2025-05-17 20:17:32', '');
 INSERT INTO `sys_menu` VALUES (2096, '备货清单', 2087, 2, 'stockup', 'shipping/stockup', NULL, 1, 0, 'C', '0', '0', '', 'email', 'admin', '2024-07-20 11:53:24', 'admin', '2024-07-28 20:44:10', '');
 INSERT INTO `sys_menu` VALUES (2097, '物流跟踪', 2087, 5, 'logistics', 'shipping/logistics/logistics', NULL, 1, 0, 'C', '0', '1', '', 'list', 'admin', '2024-07-20 11:54:18', 'admin', '2024-07-30 23:10:13', '');
-INSERT INTO `sys_menu` VALUES (2099, '私域订单管理', 1, 10, 'offline_order_list', 'order/private/index', NULL, 1, 0, 'C', '0', '0', '', 'checkbox', 'admin', '2024-07-27 17:33:03', 'admin', '2025-03-24 11:40:38', '');
+INSERT INTO `sys_menu` VALUES (2099, '私域订单管理', 1, 10, 'offline_order_list', 'order/private/index', NULL, 1, 0, 'C', '0', '1', '', 'checkbox', 'admin', '2024-07-27 17:33:03', 'admin', '2025-03-24 11:40:38', '');
 INSERT INTO `sys_menu` VALUES (2100, '私域售后管理', 2, 3, 'offline_aftersale', 'refund/private/index', NULL, 1, 0, 'C', '0', '0', '', 'code', 'admin', '2024-07-27 17:33:33', 'admin', '2025-03-24 12:29:40', '');
 INSERT INTO `sys_menu` VALUES (2101, '渠道商品管理', 4, 50, 'offline_goods_list', 'offline/goods/index', NULL, 1, 0, 'C', '0', '1', '', 'documentation', 'admin', '2024-07-27 17:33:54', 'admin', '2024-09-07 23:17:59', '');
 INSERT INTO `sys_menu` VALUES (2103, '手动创建私域订单', 1, 49, 'offline_order_create', 'order/private/create', NULL, 1, 0, 'C', '1', '0', '', 'date', 'admin', '2024-07-27 20:30:07', 'admin', '2025-03-24 11:46:51', '');
diff --git a/vue/src/views/order/private/shipPrintOrderList.vue b/vue/src/views/order/private/shipPrintOrderList.vue
new file mode 100644
index 00000000..c737adbc
--- /dev/null
+++ b/vue/src/views/order/private/shipPrintOrderList.vue
@@ -0,0 +1,526 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <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="请选择店铺" 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>
+
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="下单时间" prop="orderTime">
+          <el-date-picker clearable
+            v-model="orderTime" value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="订单状态" prop="orderStatus">
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择状态" clearable @change="handleQuery">
+          <el-option label="待发货" value="1" ></el-option>
+          <el-option label="已发货" value="2"></el-option>
+          <el-option label="已完成" value="3"> </el-option>
+          <el-option label="已取消" value="11"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="收件人姓名" prop="receiverName">
+        <el-input
+          v-model="queryParams.receiverName"
+          placeholder="请输入收件人姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收件人手机号" prop="receiverMobile">
+        <el-input
+          v-model="queryParams.receiverMobile"
+          placeholder="请输入收件人手机号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="快递单号" prop="receiverMobile">
+        <el-input
+          v-model="queryParams.shippingNumber"
+          placeholder="请输入快递单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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="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"
+            @click="handleDetail(scope.row)"
+          >{{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>
+          <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="店铺" align="center" prop="shopId" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ shopList.find(x=>x.id === scope.row.shopId).name  }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="商品明细" align="center" width="750px" >
+        <template slot="header">
+          <table>
+            <th>
+              <td width="50px">图片</td>
+              <td width="250px" align="left">标题</td>
+              <td width="150" align="left">SKU名</td>
+              <td width="200" 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.itemList" :show-header="false" :cell-style="{border:0 + 'px' }"  :row-style="{border:0 + 'px' }" >
+            <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>-->
+                <image-preview :src="scope.row.goodsImg" :width="40" :height="40"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="商品名" align="left" width="250px" prop="goodsTitle" />
+            <el-table-column label="SKU名" align="left" prop="goodsSpec" width="150"  :show-overflow-tooltip="true"/>
+            <el-table-column label="Sku编码" align="left" prop="skuNum" width="200"/>
+<!--            <el-table-column label="平台SkuId" align="left" prop="skuId" width="150"/>-->
+            <el-table-column label="商品数量" align="center" prop="quantity" width="50px">
+              <template slot-scope="scope">
+                <el-tag size="small" type="danger">{{scope.row.quantity}}</el-tag>
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="商品" width="350">-->
+<!--          <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;" >-->
+<!--              <el-image  style="width: 70px; height: 70px;" :src="item.goodsImg"></el-image>-->
+<!--              <div style="margin-left:10px">-->
+<!--              <p>{{item.goodsTitle}}【{{item.goodsSpec}}&nbsp;】</p>-->
+<!--              <p>外部ERP编码：{{item.outerErpSkuId}}-->
+<!--                <el-tag size="small">x {{item.quantity}}</el-tag>-->
+<!--                </p>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--            </el-row>-->
+<!--          </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="订单金额" align="center" prop="amount" :formatter="amountFormatter" >
+        <template slot-scope="scope">
+<!--          <p>商品总额：{{amountFormatter(null,null,scope.row.goodsAmount)}}</p>-->
+          <div>
+<!--            <span style="font-size: 10px">实付：</span>-->
+            <span>{{amountFormatter(null,null,scope.row.payment)}}</span>
+          </div>
+<!--          <div><span style="font-size: 10px">平台优惠：</span>-->
+<!--            <span>{{amountFormatter(null,null,scope.row.platformDiscount)}}</span>-->
+<!--          </div>-->
+<!--          <div><span style="font-size: 10px">商家优惠：</span>-->
+<!--            <span>{{amountFormatter(null,null,scope.row.sellerDiscount)}}</span>-->
+<!--          </div>-->
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="实付金额" align="center" prop="payment" :formatter="amountFormatter" />-->
+<!--      <el-table-column label="订单备注" align="center" prop="remark" :show-overflow-tooltip="true">-->
+<!--        <template slot-scope="scope">-->
+<!--          {{scope.row.buyerMemo}}<br />-->
+<!--          {{scope.row.sellerMemo}}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
+
+      <el-table-column label="收件信息" prop="receiverName" >
+        <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="发货单号" prop="shippingNumber" >
+      </el-table-column>
+<!--      <el-table-column label="发货信息" align="center" prop="shippingNumber" >-->
+<!--        <template slot-scope="scope">-->
+<!--          {{scope.row.shippingNumber}}&nbsp; {{scope.row.shippingCompany}}<br />-->
+<!--          {{ parseTime(scope.row.shippingTime, '{y}-{m}-{d} {h}:{m}:{s}') }}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="下单时间" align="center" prop="orderTime" >
+        <template slot-scope="scope">
+          {{ parseTime(scope.row.orderTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="orderStatus" >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.orderStatus === 0" style="margin-bottom: 6px;">新订单</el-tag>
+          <el-tag v-if="scope.row.orderStatus === 1" style="margin-bottom: 6px;">待发货</el-tag>
+          <el-tag v-if="scope.row.orderStatus === 2" style="margin-bottom: 6px;">已发货</el-tag>
+          <el-tag v-if="scope.row.orderStatus === 3" style="margin-bottom: 6px;">已完成</el-tag>
+          <el-tag v-if="scope.row.orderStatus === 21" style="margin-bottom: 6px;">待付款</el-tag>
+          <el-tag v-if="scope.row.orderStatus === 22" style="margin-bottom: 6px;">锁定</el-tag>
+          <el-tag v-if="scope.row.orderStatus === 29" style="margin-bottom: 6px;">删除</el-tag>
+          <el-tag v-if="scope.row.orderStatus === 11" style="margin-bottom: 6px;">已取消</el-tag>
+          <!--          <br />-->
+          <!--          <el-tag style="margin-bottom: 6px;" v-if="scope.row.omsPushStatus === 0">待推送</el-tag>-->
+          <!--          <el-tag style="margin-bottom: 6px;" v-if="scope.row.omsPushStatus === 1">已推送</el-tag>-->
+
+          <!--          <br />-->
+          <!--           &lt;!&ndash; 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 &ndash;&gt;-->
+          <!--           <el-tag v-if="scope.row.refundStatus === 1">无售后或售后关闭</el-tag>-->
+          <!--           <el-tag v-if="scope.row.refundStatus === 2">售后处理中</el-tag>-->
+          <!--           <el-tag v-if="scope.row.refundStatus === 3">退款中</el-tag>-->
+          <!--           <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">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-view"-->
+<!--            @click="handleDetail(scope.row)"-->
+<!--          >详情</el-button>-->
+<!--&lt;!&ndash;          <div>&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-button&ndash;&gt;-->
+<!--&lt;!&ndash;              size="mini"&ndash;&gt;-->
+<!--&lt;!&ndash;              type="success"&ndash;&gt;-->
+<!--&lt;!&ndash;              icon="el-icon-share"&ndash;&gt;-->
+<!--&lt;!&ndash;              @click="handleShip(scope.row)"&ndash;&gt;-->
+<!--&lt;!&ndash;            >订单发货</el-button>&ndash;&gt;-->
+<!--&lt;!&ndash;          </div>&ndash;&gt;-->
+<!--        </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="detailTitle" :visible.sync="detailOpen" width="1100px" append-to-body>
+      <el-tabs v-model="activeName" >
+        <el-tab-pane label="订单详情" name="orderDetail">
+          <el-form ref="form" :model="form" :rules="rules" label-width="80px" inline>
+            <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-descriptions-item>
+              <el-descriptions-item label="买家留言">
+                {{form.buyerMemo}}
+              </el-descriptions-item>
+              <el-descriptions-item label="卖家留言">
+                {{form.sellerMemo}}
+              </el-descriptions-item>
+
+              <el-descriptions-item label="备注">
+                {{form.remark}}
+              </el-descriptions-item>
+              <el-descriptions-item label="创建时间">
+                {{ parseTime(form.createTime) }}
+                <!-- <el-date-picker
+                disabled
+                  v-model="form.orderCreateTime"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="请选择订单创建时间">
+                </el-date-picker> -->
+              </el-descriptions-item>
+              <el-descriptions-item label="支付时间"> {{ form.payTime }}</el-descriptions-item>
+              <el-descriptions-item label="最后更新时间"> {{ form.updateTime }}</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>
+            <el-descriptions title="付款信息">
+              <el-descriptions-item label="商品总额">{{amountFormatter(null,null,form.goodsAmount,0)}}</el-descriptions-item>
+              <el-descriptions-item label="订单金额">{{amountFormatter(null,null,form.amount,0)}}</el-descriptions-item>
+              <el-descriptions-item label="实际支付金额">{{amountFormatter(null,null,form.payment,0)}}</el-descriptions-item>
+              <el-descriptions-item label="平台优惠金额">{{amountFormatter(null,null,form.platformDiscount,0)}}</el-descriptions-item>
+              <el-descriptions-item label="商家优惠金额">{{amountFormatter(null,null,form.sellerDiscount,0)}}</el-descriptions-item>
+            </el-descriptions>
+
+
+            <el-descriptions title="收货信息">
+              <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-descriptions title="发货信息">
+
+              <el-descriptions-item label="物流公司">{{form.shippingCompany}}</el-descriptions-item>
+              <el-descriptions-item label="物流单号">{{form.shippingNumber}}</el-descriptions-item>
+              <el-descriptions-item label="发货时间">{{form.shippingTime}}</el-descriptions-item>
+            </el-descriptions>
+
+          </el-form>
+
+        </el-tab-pane>
+        <el-tab-pane label="商品列表" name="orderItems" lazy>
+          <el-table :data="form.itemVoList"  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="外部ERP Sku编码" prop="outerErpSkuId"></el-table-column>
+            <el-table-column label="单价" prop="goodsPrice"></el-table-column>
+            <el-table-column label="子订单金额" prop="itemAmount"></el-table-column>
+            <el-table-column label="实付金额" prop="payment"></el-table-column>
+            <el-table-column label="数量" prop="quantity"></el-table-column>
+            <el-table-column label="状态" prop="orderStatus">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.orderStatus === 1">待发货</el-tag>
+                <el-tag v-if="scope.row.orderStatus === 2">已发货</el-tag>
+                <el-tag v-if="scope.row.orderStatus === 3">已完成</el-tag>
+                <el-tag v-if="scope.row.orderStatus === 11">已取消</el-tag>
+              </template>
+            </el-table-column>
+<!--            <el-table-column label="退款状态" prop="refundStatus">-->
+<!--              <template slot-scope="scope">-->
+<!--                &lt;!&ndash; 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 &ndash;&gt;-->
+<!--                <el-tag v-if="scope.row.refundStatus === 1">无售后或售后关闭</el-tag>-->
+<!--                <el-tag v-if="scope.row.refundStatus === 2">售后处理中</el-tag>-->
+<!--                <el-tag v-if="scope.row.refundStatus === 3">退款中</el-tag>-->
+<!--                <el-tag v-if="scope.row.refundStatus === 4">退款成功</el-tag>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="优惠明细" name="orderCou" lazy>
+          <el-table :data="form.discounts"  style="margin-bottom: 10px;">
+            <el-table-column label="序号" align="center" type="index" width="50"/>
+            <el-table-column label="优惠名称" prop="name" ></el-table-column>
+            <el-table-column label="优惠金额" prop="discountAmount"></el-table-column>
+            <el-table-column label="优惠描述" prop="description"></el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="物流单" name="orderLog" lazy>
+
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {listOrder, getOrder, delOrder, addOrder, updateOrder, pushOms} from "@/api/offline/order";
+// import { listShop } from "@/api/offline/shop";
+import { listShop } from "@/api/shop/shop";
+import Clipboard from "clipboard";
+
+export default {
+  name: "printOffline",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      pushLoading: false,
+      // 选中数组
+      ids: [],
+      // 子表选中数据
+      checkedSShopOrderItem: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 店铺订单表格数据
+      orderList: [],
+      // ${subTable.functionName}表格数据
+      sShopOrderItemList: [],
+      shopList:[],
+      // 弹出层标题
+      detailTitle:'订单详情',
+      detailOpen:false,
+      isAudit:false,
+      activeName: 'orderDetail',
+      orderTime: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderNum: null,
+        shopId: null,
+        startTime: null,
+        endTime: null,
+        refundStatus: null,
+        orderStatus: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+
+      }
+    };
+  },
+  created() {
+    listShop({type: 999}).then(response => {
+      this.shopList = response.rows;
+      if (this.shopList && this.shopList.length > 0) {
+        this.queryParams.shopId = this.shopList[0].id
+      }
+      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()
+      })
+    },
+    amountFormatter(row, column, cellValue, index) {
+      return '￥' + parseFloat(cellValue).toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,');
+    },
+
+    /** 查询店铺订单列表 */
+    getList() {
+      console.log('=====搜索条件：=====',this.queryParams)
+      if(this.orderTime){
+        this.queryParams.startTime = this.orderTime[0]
+        this.queryParams.endTime = this.orderTime[1]
+      }else {
+        this.queryParams.startTime = null
+        this.queryParams.endTime = null
+      }
+      this.loading = true;
+      listOrder(this.queryParams).then(response => {
+        this.orderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.orderTime=null
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.orderNum)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+
+    reset(){
+
+    },
+    /** 详情按钮操作 */
+    handleDetail(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getOrder(id).then(response => {
+        this.form = response.data;
+        // this.$nextTick(()=>{
+        //   this.form.shipType = response.data.shipType
+        // })
+        this.detailOpen = true;
+        this.detailTitle = "订单详情";
+      });
+      this.isAudit = false
+    },
+  }
+};
+</script>
diff --git a/vue/src/views/order/shopOrder/index.vue b/vue/src/views/order/shopOrder/index.vue
index 9f43a08c..b235c4c2 100644
--- a/vue/src/views/order/shopOrder/index.vue
+++ b/vue/src/views/order/shopOrder/index.vue
@@ -8,7 +8,7 @@
         <order-pdd v-if="item.id === 300"></order-pdd>
         <order-dou v-if="item.id === 400"></order-dou>
         <order-wei v-if="item.id === 500"></order-wei>
-<!--        <order-offline v-if="item.id === 999"></order-offline>-->
+        <order-offline v-if="item.id === 999"></order-offline>
       </el-tab-pane>
 <!--      <el-tab-pane label="天猫" name="taoOrder">-->
 <!--        <order-tao></order-tao>-->
@@ -34,15 +34,14 @@
 <script>
 import OrderTao  from "@/views/tao/order/index";
 import OrderJd  from "@/views/jd/order/index";
-// import OrderJdVc  from "@/views/jd/order/index-vc.vue";
 import OrderDou  from "@/views/dou/order/index";
 import OrderPdd  from "@/views/pdd/order/index";
 import OrderWei  from "@/views/wei/order/index";
-// import OrderOffline  from "@/views/order/private/index";
+import OrderOffline  from "@/views/order/private/index";
 import {listPlatform} from "@/api/shop/shop";
 export default {
   name: "Order",
-  components:{OrderDou,OrderPdd,OrderWei,OrderTao,OrderJd},
+  components:{OrderDou,OrderPdd,OrderWei,OrderTao,OrderJd,OrderOffline},
   data() {
     return {
       activeName: '',
diff --git a/vue/src/views/shipping/ewaybillPrint/index.vue b/vue/src/views/shipping/ewaybillPrint/index.vue
index 8d916041..1f889929 100644
--- a/vue/src/views/shipping/ewaybillPrint/index.vue
+++ b/vue/src/views/shipping/ewaybillPrint/index.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="线下渠道" name="printOffline">
+        <print-offline></print-offline>
+      </el-tab-pane>
       <el-tab-pane label="淘宝天猫" name="printTao" lazy>
         <print-tao></print-tao>
       </el-tab-pane>
@@ -23,6 +26,7 @@
 </template>
 
 <script>
+import printOffline  from "@/views/order/private/shipPrintOrderList.vue";
 import printWei  from "@/views/wei/ewaybill/index.vue";
 import printTao from "@/views/tao/ewaybill/index.vue";
 import printPdd from "@/views/pdd/ewaybill/index.vue";
@@ -32,10 +36,10 @@ import PrintJd from "@/views/jd/ewaybill/index.vue";
 
 export default {
   name: "print",
-  components:{PrintJd, printWei,printTao,printPdd,printDou},
+  components:{PrintJd, printWei,printTao,printPdd,printDou,printOffline},
   data() {
     return {
-      activeName: 'printTao'
+      activeName: 'printOffline'
     };
   },
   created() {
diff --git a/vue/src/views/shop/ewaybillAccount/index.vue b/vue/src/views/shop/ewaybillAccount/index.vue
index d18f8a05..14b53d0e 100644
--- a/vue/src/views/shop/ewaybillAccount/index.vue
+++ b/vue/src/views/shop/ewaybillAccount/index.vue
@@ -54,7 +54,7 @@ export default {
   },
   mounted() {
     listPlatform({status:0}).then(res => {
-      this.typeList = res.rows;
+      this.typeList = res.rows.filter(item => item.id !== 999);
       this.activeName = this.typeList[0].code
     })
   },