From 10b606e18a6c6ab7d5c06b364d73516b08664a63 Mon Sep 17 00:00:00 2001
From: "DESKTOP-8FGKA8Q\\chunfen" <vivanyyw@126.com>
Date: Mon, 18 Nov 2024 17:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B1=87=E6=80=BB=E6=95=B0=E6=8D=AE=20=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E8=AE=A2=E5=8D=95=E6=A3=80=E7=B4=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/frontend/src/views/goods/goods.vue  |  11 +-
 .../frontend/src/views/plat/orderList.vue     | 993 ++++++++----------
 .../src/views/supplyChain/dailyStock.vue      |   4 +
 .../src/views/supplyChain/procureCheck.vue    |   2 +-
 .../src/views/supplyChain/procureLog.vue      |   2 +-
 5 files changed, 476 insertions(+), 536 deletions(-)

diff --git a/resources/frontend/src/views/goods/goods.vue b/resources/frontend/src/views/goods/goods.vue
index 2bb302d..5d5deef 100644
--- a/resources/frontend/src/views/goods/goods.vue
+++ b/resources/frontend/src/views/goods/goods.vue
@@ -64,8 +64,11 @@
     <el-card>
       <div>
         <!-- 表格头部操作 -->
-        <div>
-            <span>全部商品(共{{ total }}条)</span>
+        <div style="display: flex;align-items: center;justify-content: space-between;">
+            <div style="display: flex;flex-wrap: wrap;">
+              <span style="margin-right: 20px;">全部商品(共{{ total }}条)</span>
+              <div v-if="sum" style="color: #f00;">销量{{ sum.goods_number }}，实际库存{{ sum.real_stock }}，剩余库存{{ sum.stock }}</div>
+            </div>
             <div class="btn">
               <el-button @click="resetOrderCount" icon="el-icon-refresh">订单重置</el-button>
               <el-button type="primary" @click="petchEditStock" icon="el-icon-edit" :disabled="!chooseList.length">批量更新在售库存</el-button>
@@ -120,7 +123,7 @@
             </el-table-column>
 
             <el-table-column prop="yesterday_num" label="实际库存" align="center"></el-table-column>
-            <el-table-column prop="sale_stock" label="可售库存" sortable="custom">
+            <el-table-column prop="sale_stock" label="可售库存" sortable="custom" width="160">
               <template slot-scope="scope">
                 <div class="titBox" v-if="scope.row.edit">
                   <el-input v-model="scope.row.sale_stock" placeholder="可售库存" size="mini" style="width: 100%;"></el-input>
@@ -408,6 +411,7 @@
         filterTime: [],
         sort_field: '',
         sort_value: '',
+        sum: null
       }
     },
     methods: {
@@ -456,6 +460,7 @@
             sku_code: this.shopsData
           }
           this.is_admin = res.data.manage && res.data.manage.is_admin
+          this.sum = params.goods_title ? res.data.sum : null
           this.loading = false
         }).catch(() => {
           this.loading = false
diff --git a/resources/frontend/src/views/plat/orderList.vue b/resources/frontend/src/views/plat/orderList.vue
index 067c95d..69dceb6 100644
--- a/resources/frontend/src/views/plat/orderList.vue
+++ b/resources/frontend/src/views/plat/orderList.vue
@@ -1,555 +1,486 @@
 <template>
-    <div class="conent">
-        <el-card>
-            <el-form ref="form" :inline="true" :model="form">
-                <el-form-item label="所属店铺:">
-                    <el-select v-model="form.shop_id" placeholder="店铺" @change="handleChoose()">
-                        <el-option v-for="item in shops" :key="item.id" :label="item.name" :value="item.id">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
+  <div class="conent">
+    <el-card>
+      <el-form ref="form" :inline="true" label-width="90px">
+        <el-form-item label="所属店铺:">
+          <el-select v-model="filter.shop_id" placeholder="店铺" @change="handleChoose()">
+            <el-option v-for="item in shopsList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        
+        <el-form-item label="发货状态:">
+          <el-select v-model="filter.shipping_status" placeholder="发货状态" @change="handleChoose()">
+            <el-option value="" label="全部"></el-option>
+            <el-option value="0" label="未发货"></el-option>
+            <el-option value="2" label="部分发货"></el-option>
+            <el-option value="1" label="已发货"></el-option>
+          </el-select>
+        </el-form-item>
 
-                <el-form-item label="发货状态:">
-                    <el-select v-model="form.shipping_status" placeholder="发货状态" @change="handleChoose()">
-                        <el-option value="" label="全部"></el-option>
-                        <el-option value="0" label="未发货"></el-option>
-                        <el-option value="2" label="部分发货"></el-option>
-                        <el-option value="1" label="已发货"></el-option>
-                    </el-select>
-                </el-form-item>
+        <el-form-item label="订单类型:">
+          <el-select v-model="filter.is_supplier" placeholder="订单类型" @change="handleChoose()">
+            <el-option value="" label="全部订单"></el-option>
+            <el-option :value="1" label="自卖团订单"></el-option>
+            <el-option :value="0" label="帮卖团订单"></el-option>
+          </el-select>
+        </el-form-item>
 
-                <el-form-item label="订单类型:">
-                    <el-select v-model="form.is_supplier" placeholder="订单类型" @change="handleChoose()">
-                        <el-option value="" label="全部订单"></el-option>
-                        <el-option value="1" label="自卖团订单"></el-option>
-                        <el-option value="0" label="帮卖团订单"></el-option>
-                    </el-select>
-                </el-form-item>
+        <el-form-item label="订单状态:">
+          <el-select v-model="filter.cancel_status" placeholder="订单状态" @change="handleChoose()">
+            <el-option value="" label="全部"></el-option>
+            <el-option :value="0" label="未取消"></el-option>
+            <el-option :value="1" label="已取消"></el-option>
+          </el-select>
+        </el-form-item>
 
-                <el-form-item label="订单状态:">
-                    <el-select v-model="form.cancel_status" placeholder="订单状态" @change="handleChoose()">
-                        <el-option value="" label="全部"></el-option>
-                        <el-option value="0" label="未取消"></el-option>
-                        <el-option value="1" label="已取消"></el-option>
-                    </el-select>
-                </el-form-item>
+        <el-form-item label="售后状态:">
+          <el-select v-model="filter.after_sales_status" placeholder="售后状态" @change="handleChoose()">
+            <el-option value="" label="全部"></el-option>
+            <el-option :value="0" label="未售后"></el-option>
+            <el-option :value="1" label="有售后"></el-option>
+          </el-select>
+        </el-form-item>
+        
+        <el-form-item label="商品数量:">
+          <el-select v-model="filter.goods_sku_num" placeholder="商品数量" @change="handleChoose()">
+            <el-option value="" label="全部"></el-option>
+            <el-option :value="1" label="1个商品"></el-option>
+            <el-option :value="2" label="2-5个商品"></el-option>
+            <el-option :value="6" label="6个以上商品"></el-option>
+          </el-select>
+        </el-form-item>
 
-                <el-form-item label="售后状态:">
-                    <el-select v-model="form.after_sales_status" placeholder="售后状态" @change="handleChoose()">
-                        <el-option value="" label="全部"></el-option>
-                        <el-option value="0" label="未售后"></el-option>
-                        <el-option value="1" label="有售后"></el-option>
-                    </el-select>
-                </el-form-item>
+        <el-form-item label="订单商品:">
+          <el-select v-model="filter.external_sku_ids" multiple filterable remote reserve-keyword placeholder="订单商品"
+            :remote-method="remoteMethod" :loading="searchLoading">
+            <el-option v-for="item in options" :key="item.external_sku_id" :label="item.title"
+                :value="item.external_sku_id">
+            </el-option>
+          </el-select>
+        </el-form-item>
 
-                <el-form-item label="商品数量:">
-                    <el-select v-model="form.goods_sku_num" placeholder="商品数量" @change="handleChoose()">
-                        <el-option value="" label="全部"></el-option>
-                        <el-option value="1" label="1个商品"></el-option>
-                        <el-option value="2" label="2-5个商品"></el-option>
-                        <el-option value="6" label="6个以上商品"></el-option>
-                    </el-select>
-                </el-form-item>
+        <el-form-item label="下单时间:">
+          <el-date-picker v-model="confirmAt" type="datetimerange" range-separator="-" start-placeholder="起"
+            end-placeholder="止" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" @change="handleChoose()">
+          </el-date-picker>
+        </el-form-item>
 
-                <!-- <el-form-item label="打印状态:">
-                    <el-select v-model="form.print_status" placeholder="打印状态">
-                        <el-option value="" label="全部"></el-option>
-                        <el-option value="0" label="未打印"></el-option>
-                        <el-option value="1" label="已打印"></el-option>
-                    </el-select>
-                </el-form-item> -->
+        <el-form-item label="跟团号:">
+          <el-input v-model="filter.pno" placeholder="跟团号" @keyup.enter.native="handleChoose"></el-input>
+        </el-form-item>
 
-                <el-form-item label="订单商品:">
-                    <el-select v-model="form.external_sku_ids" multiple filterable remote reserve-keyword placeholder="订单商品"
-                        :remote-method="remoteMethod" :loading="searchLoading">
-                        <el-option v-for="item in options" :key="item.external_sku_id" :label="item.title"
-                            :value="item.external_sku_id">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleChoose">筛选</el-button>
+          <el-button plain @click="handleReChoose">重置筛选</el-button>
+          <el-button type="primary" @click="print">打印</el-button>
+          <!-- <el-button v-if="form.goods_sku_num === 2" type="primary">配货单导出</el-button> -->
+          <el-button type="warning" :loading="exportLoading" @click="handleExport" icon="el-icon-download">数据导出</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
 
-                <el-form-item label="下单时间:">
-                    <el-date-picker v-model="confirmAt" type="datetimerange" range-separator="-" start-placeholder="起"
-                        end-placeholder="止" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" @change="handleChoose()">
-                    </el-date-picker>
-                </el-form-item>
+    <el-card style="margin-top: 10px">
+      <el-table v-loading="loading" ref="multipleTable" :data="orderList" style="width: 100%" border
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="店铺名称" prop="shop.name" />
+        <el-table-column label="跟团号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.is_supplier ? '自卖团: ' : '帮卖团: ' }}
+            {{ scope.row.is_supplier ? scope.row.participate_no : scope.row.supply_participate_no }}
+          </template>
+        </el-table-column>
 
-                <el-form-item label="跟团号:">
-                    <el-input v-model="form.pno" placeholder="跟团号" @keyup.enter.native="handleChoose">
-                    </el-input>
-                </el-form-item>
-
-                <el-form-item>
-                    <el-button type="primary" @click="handleChoose">筛选</el-button>
-                    <el-button plain @click="handleReChoose">重置筛选</el-button>
-                    <el-button type="primary" @click="print">打印</el-button>
-                    <el-button v-if="form.goods_sku_num === 2" type="primary">配货单导出</el-button>
-                    <el-button type="warning" :loading="exportLoading" @click="handleExport" icon="el-icon-download">数据导出</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-
-        <el-card style="margin-top: 10px">
-            <el-table v-loading="loading" ref="multipleTable" :data="tableData" style="width: 100%" border
-                @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55" align="center">
-                </el-table-column>
-                <el-table-column label="店铺名称">
-                    <template slot-scope="scope">
-                        {{ scope.row.shop.name }}
-                    </template>
-                </el-table-column>
-
-                <el-table-column label="跟团号" align="center">
-                    <template slot-scope="scope">
-                        {{ scope.row.is_supplier ? '自卖团: ' : '帮卖团: ' }}
-                        {{ scope.row.is_supplier ? scope.row.participate_no : scope.row.supply_participate_no }}
-                    </template>
-                </el-table-column>
-
-                <el-table-column label="收件人信息" width="240">
-                    <template slot-scope="scope">
-                        <p>{{ scope.row.receiver_name }}&nbsp;&nbsp;{{ scope.row.receiver_mobile }}</p>
-                        <p>{{ scope.row.receiver_address_province }}/{{ scope.row.receiver_address_city }}/{{
-                            scope.row.receiver_address_district }}</p>
-                        <p>{{ scope.row.receiver_address_detail }}</p>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="shipping_status" label="发货状态" align="center"></el-table-column>
-                <el-table-column prop="cancel_status" label="订单状态" align="center"></el-table-column>
-                <el-table-column prop="after_sales_status" label="售后状态" align="center"></el-table-column>
-                <el-table-column label="商品信息" width="380">
-                    <template slot-scope="scope">
-                        <div v-for="item in scope.row.items" :key="item.id">
-                            {{ item.goods_name }}
-                            <span style="color: red;">+{{ item.goods_number }}</span>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="confirm_at" label="下单时间" width="150" align="center"></el-table-column>
-                <!-- <el-table-column prop="print_status" label="打印次数"></el-table-column> -->
-            </el-table>
-
-            <!-- 分页功能 -->
-            <div class="block">
-                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                    :current-page="current_page" :page-sizes="[15, 50, 100]" :page-size="per_page"
-                    layout="total, sizes, prev, pager, next, jumper" :total="Paginationdata.total">
-                </el-pagination>
+        <el-table-column label="收件人信息" width="240">
+          <template slot-scope="scope">
+            <p>{{ scope.row.receiver_name }}&nbsp;&nbsp;{{ scope.row.receiver_mobile }}</p>
+            <p>{{ scope.row.receiver_address_province }}/{{ scope.row.receiver_address_city }}/{{
+                scope.row.receiver_address_district }}</p>
+            <p>{{ scope.row.receiver_address_detail }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column prop="shipping_status" label="发货状态" align="center"></el-table-column>
+        <el-table-column prop="cancel_status" label="订单状态" align="center"></el-table-column>
+        <el-table-column prop="after_sales_status" label="售后状态" align="center"></el-table-column>
+        <el-table-column label="商品信息" width="380">
+          <template slot-scope="scope">
+            <div v-for="item in scope.row.items" :key="item.id">
+              {{ item.goods_name }}
+              <span style="color: red;">+{{ item.goods_number }}</span>
             </div>
-        </el-card>
-    </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="confirm_at" label="下单时间" width="150" align="center"></el-table-column>
+      </el-table>
+
+      <div class="page-pagination">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="page"
+          :page-sizes="[10, 50, 100]"
+          :page-size="per_page"
+          layout="prev, pager, next, sizes, jumper, total"
+          :total="total">
+        </el-pagination>
+      </div>
+    </el-card>
+  </div>
 </template>
 
 <script>
 import { platOrderList, printOrders, printSuccess, exportOrder } from "@/api/plat";
 import { storeList } from "@/api/shop"
 import { goodsSkusList } from "@/api/goods"
+import dayjs from 'dayjs'
+
 export default {
-    data() {
-        return {
-            form: {
-                shop_id: "",
-                // activity_no: "",
-                shipping_status: "",
-                // is_supplier: "",
-                cancel_status: "0",
-                after_sales_status: "0",
-                // supply_participate_no: "",
-                // participate_no: "",
-                goods_sku_num: "",
-                // print_status: "0",
-                external_sku_ids: [],
-                ids: [],
-                pno: '',
-            },
-            dialogVisible: false,
-            loading: true,
-            searchLoading: false,
-            options: [],
-            tableData: [],
-            Paginationdata: {}, //分页相关数据
-            current_page: 1, //当前页
-            per_page: 10, //每页显示数量
-            shops: [],
-            groupActivity: [],
-            exportForm: {
-                shop_id: "",
-                start_no: "",
-                end_no: "",
-                is_supplier: 1,
-            },
-            exportFormRules: {
-                shop_id: [
-                    { required: true, trigger: 'blur' }
-                ],
-                start_no: [
-                    { required: true, trigger: 'blur' }
-                ],
-                end_no: [
-                    { required: true, trigger: 'blur' }
-                ],
-            },
-            confirmAt: [],
-            print_order_ids: '',
-            print_documents: [],
-            socket: null,
-            lockReconnect: false, //是否真正建立连接
-            timeout: 58 * 1000, //58秒一次心跳
-            timeoutObj: null, //心跳心跳倒计时
-            serverTimeoutObj: null, //心跳倒计时
-            timeoutnum: null, //断开 重连倒计时
-            defaultPrinter: null,
-            taskIDArray: [],
-            requestIDGetGlobalConfig: '',
-            exportLoading: false
-        };
-    },
-    created() {
-        this.initConfirmAt();
-        this.handleChoose();
-        // this.initWebSocket();
-    },
-    mounted() {
-        // 展示店铺列表
-        this.getShopsList();
-    },
-    beforeDestroy() {
-        // 订阅事件记得要取消
-    },
-    destroyed() {
-    },
-    methods: {
-        initConfirmAt() {
-            const nowTimeDate = new Date();
-            nowTimeDate.setHours(0, 0, 0, 0);
-            let start = nowTimeDate.toLocaleString('zh', { hour12: false }).replaceAll('/', '-');
-            nowTimeDate.setHours(23, 59, 59, 999);
-            let end = nowTimeDate.toLocaleString('zh', { hour12: false }).replaceAll('/', '-');
-            this.confirmAt = [start, end]
-        },
-        // 店铺列表
-        getPlatOrderList(params = {}) {
-            params.page = this.current_page;
-            params.per_page = this.per_page;
-
-            platOrderList(params).then((res) => {
-                this.tableData = res.data.data;
-                this.Paginationdata = res.data.meta;
-            });
-        },
-        getShopsList() {
-            let page = {
-                page: 0,
-                per_page: 99,
-            };
-            storeList(page).then((res) => {
-                this.shops = res.data.data;
-            });
-            this.loading = false;
-        },
-        //分页功能
-        handleSizeChange(val) {
-            //当前条数
-            this.current_page = 1;
-            this.per_page = val;
-            this.getPlatOrderList();
-        },
-        handleCurrentChange(val) {
-            //当前页
-            this.current_page = val;
-            this.getPlatOrderList();
-        },
-        // 筛选
-        handleChoose() {
-            let params = {
-                ...this.form,
-                page: 1,
-                per_page: this.per_page,
-                confirm_at_start: this.confirmAt ? this.confirmAt[0] : '',
-                confirm_at_end: this.confirmAt ? this.confirmAt[1] : ''
-            };
-            this.getPlatOrderList(params)
-        },
-        // 重置筛选
-        handleReChoose() {
-            this.form = {
-                shop_id: "",
-                // activity_no: "",
-                shipping_status: "",
-                // is_supplier: "",
-                cancel_status: "0",
-                after_sales_status: "0",
-                // supply_participate_no: "",
-                // participate_no: "",
-                goods_sku_num: '',
-                // print_status: 0,
-                external_sku_ids: [],
-                ids: [],
-                pno: ''
-            };
-            this.getPlatOrderList();
-        },
-        derivation(formName) {
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    window.open("/plat_orders/export?shop_id=" + this.exportForm.shop_id + '&start_no=' + this.exportForm.start_no + '&end_no=' + this.exportForm.end_no + '&is_supplier=' + this.exportForm.is_supplier);
-                } else {
-                    return false;
-                }
-            });
-        },
-        remoteMethod(query) {
-            if (query !== '') {
-                this.searchLoading = true;
-                setTimeout(() => {
-                    this.searchLoading = false;
-                    goodsSkusList(query).then((res) => {
-                        this.options = res.data.filter(item => {
-                            return item.title.toLowerCase().indexOf(query.toLowerCase()) > -1;
-                        });
-                    });
-                }, 200);
-            } else {
-                this.options = [];
-            }
-        },
-        print() {
-            const print_loading = this.$loading({
-                lock: true,
-                text: 'Loading',
-                spinner: 'el-icon-loading',
-                background: 'rgba(0, 0, 0, 0.7)'
-            });
-            printOrders(this.form).then((res) => {
-                this.print_documents = res.data.documents;
-                this.print_order_ids = res.data.order_ids;
-                print_loading.close();
-                this.doPrint();
-            })
-        },
-        handleSelectionChange(val) {
-            let ids = [];
-            val.forEach((item) => {
-                ids.push(item.id);
-            })
-            this.form.ids = ids;
-        },
-        initWebSocket() {
-            //初始化weosocket
-            const wsuri = "ws://127.0.0.1:5000";
-            this.socket = new WebSocket(wsuri);
-            // 客户端接收服务端数据时触发
-            this.socket.onmessage = this.websocketonmessage;
-            // 连接建立时触发
-            this.socket.onopen = this.websocketonopen;
-            // 通信发生错误时触发
-            this.socket.onerror = this.websocketonerror;
-            // 连接关闭时触发
-            this.socket.onclose = this.websocketclose;
-        },
-        // 连接建立时触发
-        websocketonopen() {
-            //开启心跳
-            this.start();
-            if (this.socket.readyState === 1) {
-                // 获取打印机列表
-                this.getPrinters();
-            }
-        },
-        start() {
-            //开启心跳
-            console.log("开启心跳");
-            var self = this;
-            self.timeoutObj && clearTimeout(self.timeoutObj);
-            self.serverTimeoutObj && clearTimeout(self.serverTimeoutObj);
-            self.timeoutObj = setTimeout(function () {
-                //这里发送一个心跳，后端收到后，返回一个心跳消息，
-                if (self.socket.readyState == 1) {
-                    //如果连接正常
-                } else {
-                    //否则重连
-                    self.reconnect();
-                }
-                self.serverTimeoutObj = setTimeout(function () {
-                    //超时关闭
-                    self.socket.close();
-                }, self.timeout);
-            }, self.timeout);
-        },
-        reconnect() {
-            //重新连接
-            var that = this;
-            if (that.lockReconnect) {
-                return;
-            }
-            that.lockReconnect = true;
-            //没连接上会一直重连，设置延迟避免请求过多
-            that.timeoutnum && clearTimeout(that.timeoutnum);
-            that.timeoutnum = setTimeout(function () {
-                //新连接
-                that.initWebSocket();
-                that.lockReconnect = false;
-            }, 5000);
-        },
-        // 通信发生错误时触发
-        websocketonerror() {
-            console.log("出现错误");
-            this.reconnect();
-        },
-        // 客户端接收服务端数据时触发
-        websocketonmessage(e) {
-            console.log(e);
-            if (JSON.parse(e.data).printers !== undefined) {
-                this.defaultPrinter = JSON.parse(e.data).defaultPrinter;
-            }
-            // JSON.parse 用来解析JSON字符串
-            console.log("默认打印机" + this.defaultPrinter)
-
-            if (JSON.parse(e.data).status === 'success') {
-                console.log("打印就绪..")
-            }
-            if (JSON.parse(e.data).status === 'failed') {
-                console.log("打印未就绪..")
-            }
-            if (JSON.parse(e.data).taskStatus === 'printed') {
-                console.log('出纸成功--打印成功')
-                // 打印成功回调
-                printSuccess({ order_ids: this.print_order_ids }).then((res) => {
-                    console.log(res)
-                })
-            }
-            if (JSON.parse(e.data).taskStatus === 'failed') {
-                console.log("打印失败!")
-            }
-            if (JSON.parse(e.data).taskStatus === 'canceled') {
-                console.log("打印取消!")
-            }
-
-            //收到服务器信息，心跳重置
-            this.reset();
-        },
-        reset() {
-            //重置心跳
-            var that = this;
-            //清除时间
-            clearTimeout(that.timeoutObj);
-            clearTimeout(that.serverTimeoutObj);
-            //重启心跳
-            that.start();
-        },
-        websocketsend(Data) {
-            //数据发送
-            this.socket.send(Data);
-        },
-        // 连接关闭时触发
-        websocketclose(e) {
-            //关闭
-            console.log("断开连接", e);
-            //重连
-            this.reconnect();
-        },
-        getPrinters() {
-            var request = this.getRequestObject("getPrinters");
-            this.websocketsend(JSON.stringify(request));
-        },
-        doPrint() {
-            var request = this.getRequestObject("print");
-            request.task = new Object();
-            request.task.taskID = this.getUUID(8, 10);
-            // 把每次打印的任务 taskID 保存到 taskIDArray 数组
-            this.taskIDArray.push(request.task.taskID)
-            // 记录当前打印请求的ID
-            this.requestIDGetGlobalConfig = request.task.taskID
-            request.task.preview = false;
-            request.task.printer = this.defaultPrinter;
-            request.task.documents = this.print_documents;
-            console.log(request.task.documents)
-
-            this.websocketsend(JSON.stringify(request));
-        },
-        getRequestObject(cmd) {
-            var request = new Object();
-            // 必须:请求的ID,用于唯一标识每个请求，每个客户端保证生成唯一的ID
-            request.requestID = this.getUUID(8, 16);
-            //必须: 协议当前版本
-            request.version = "1.0";
-            //必须: 请求命令名称
-            request.cmd = cmd;
-
-            return request;
-        },
-        getUUID(len, radix) {
-            var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
-            var uuid = [], i;
-            radix = radix || chars.length;
-            if (len) {
-                for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
-            } else {
-                var r;
-                uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
-                uuid[14] = '4';
-                for (i = 0; i < 36; i++) {
-                    if (!uuid[i]) {
-                        r = 0 | Math.random() * 16;
-                        uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
-                    }
-                }
-            }
-
-            return uuid.join('');
-        },
-        handleExport() {
-            this.exportLoading = true
-            let params = {
-                ...this.form,
-                page: 1,
-                per_page: this.per_page,
-                confirm_at_start: this.confirmAt[0] ? this.confirmAt[0] : '',
-                confirm_at_end: this.confirmAt[1] ? this.confirmAt[1] : '',
-                is_export: 1
-            }
-            // window.open("/api/plat_orders?" + this.objectToQueryString(params))
-
-            exportOrder(params).then((res) => {
-                this.downLoadXls(res.data)
-                this.$message({ type: 'success', message: '导出成功！' })
-                this.exportLoading = false
-            }).catch(() => {
-                this.exportLoading = false
-            })
-        },
-        downLoadXls(response) {
-            const content = response
-            const blob = new Blob([content])
-            const today = new Date().toLocaleDateString()
-            const fileName = `订单列表${today}.xlsx`
-            if ('download' in document.createElement('a')) {
-                // 非IE下载
-                const elink = document.createElement('a')
-                elink.download = fileName
-                elink.style.display = 'none'
-                elink.href = URL.createObjectURL(blob)
-                document.body.appendChild(elink)
-                elink.click()
-                URL.revokeObjectURL(elink.href) // 释放URL 对象
-                document.body.removeChild(elink)
-            } else {
-                // IE10+下载
-                navigator.msSaveBlob(blob, fileName)
-            }
-        },
-        objectToQueryString(obj) {
-            return Object.keys(obj)
-                .map(key => encodeURIComponent(key) + '=' + (obj[key] ? encodeURIComponent(obj[key]) : ''))
-                .join('&');
-        }
+  data() {
+    return {
+      filter: {
+        shop_id: '',
+        shipping_status: '',
+        is_supplier: '',
+        cancel_status: 0,
+        after_sales_status: 0,
+        goods_sku_num: '',
+        external_sku_ids: '',
+        pno: ''
+      },
+      loading: false,
+      searchLoading: false,
+      options: [],
+      orderList: [],
+      total: 0,
+      page: 1, //当前页
+      per_page: 10, //每页显示数量
+      shopsList: [],
+      confirmAt: [],
+      print_order_ids: '',
+      print_documents: [],
+      socket: null,
+      lockReconnect: false, //是否真正建立连接
+      timeout: 58 * 1000, //58秒一次心跳
+      timeoutObj: null, //心跳心跳倒计时
+      serverTimeoutObj: null, //心跳倒计时
+      timeoutnum: null, //断开 重连倒计时
+      defaultPrinter: null,
+      taskIDArray: [],
+      requestIDGetGlobalConfig: '',
+      exportLoading: false
     }
+  },
+  created() {
+      let start = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
+      let end = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
+      this.confirmAt = [start, end]
+      this.getOrderList()
+      this.getShopsList()
+  },
+  methods: {
+    getOrderList() {
+      this.loading = true
+      let params = {
+        ...this.filter,
+        page: this.page,
+        per_page: this.per_page,
+        confirm_at_start: this.confirmAt ? this.confirmAt[0] : '',
+        confirm_at_end: this.confirmAt ? this.confirmAt[1] : ''
+      }
+      platOrderList(params).then((res) => {
+        this.orderList = res.data.data
+        this.total = res.data.meta.total
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    getShopsList() {
+      let params = {
+        page: 0,
+        per_page: 99
+      }
+      storeList(params).then((res) => {
+        this.shopsList = res.data.data
+      })
+    },
+    handleSizeChange(val) {
+      this.page = 1
+      this.per_page = val
+      this.getOrderList()
+    },
+    handleCurrentChange(val) {
+      this.page = val
+      this.getOrderList()
+    },
+    handleChoose() {
+      this.page = 1
+      this.getOrderList()
+    },
+    handleReChoose() {
+      this.filter = {
+        shop_id: '',
+        shipping_status: '',
+        is_supplier: '',
+        cancel_status: 0,
+        after_sales_status: 0,
+        goods_sku_num: '',
+        external_sku_ids: '',
+        pno: ''
+      }
+      this.page = 1
+      this.getOrderList()
+    },
+    remoteMethod(query) {
+      if (query !== '') {
+        this.searchLoading = true;
+        setTimeout(() => {
+          this.searchLoading = false;
+          goodsSkusList(query).then((res) => {
+            this.options = res.data.filter(item => {
+              return item.title.toLowerCase().indexOf(query.toLowerCase()) > -1;
+            });
+          });
+        }, 200);
+      } else {
+        this.options = [];
+      }
+    },
+    print() {
+      const print_loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+      });
+      printOrders(this.filter).then((res) => {
+          this.print_documents = res.data.documents;
+          this.print_order_ids = res.data.order_ids;
+          print_loading.close();
+          this.doPrint();
+      })
+    },
+    handleSelectionChange(val) {
+      let ids = []
+      val.forEach((item) => {
+          ids.push(item.id)
+      })
+      this.filter.ids = ids
+    },
+    initWebSocket() {
+      //初始化weosocket
+      const wsuri = "ws://127.0.0.1:5000";
+      this.socket = new WebSocket(wsuri);
+      // 客户端接收服务端数据时触发
+      this.socket.onmessage = this.websocketonmessage;
+      // 连接建立时触发
+      this.socket.onopen = this.websocketonopen;
+      // 通信发生错误时触发
+      this.socket.onerror = this.websocketonerror;
+      // 连接关闭时触发
+      this.socket.onclose = this.websocketclose;
+    },
+    // 连接建立时触发
+    websocketonopen() {
+      //开启心跳
+      this.start();
+      if (this.socket.readyState === 1) {
+        // 获取打印机列表
+        this.getPrinters();
+      }
+    },
+    start() {
+      //开启心跳
+      console.log("开启心跳");
+      var self = this;
+      self.timeoutObj && clearTimeout(self.timeoutObj);
+      self.serverTimeoutObj && clearTimeout(self.serverTimeoutObj);
+      self.timeoutObj = setTimeout(function () {
+        //这里发送一个心跳，后端收到后，返回一个心跳消息，
+        if (self.socket.readyState == 1) {
+            //如果连接正常
+        } else {
+            //否则重连
+            self.reconnect();
+        }
+        self.serverTimeoutObj = setTimeout(function () {
+            //超时关闭
+            self.socket.close();
+        }, self.timeout);
+      }, self.timeout);
+    },
+    reconnect() {
+      //重新连接
+      var that = this;
+      if (that.lockReconnect) {
+          return;
+      }
+      that.lockReconnect = true;
+      //没连接上会一直重连，设置延迟避免请求过多
+      that.timeoutnum && clearTimeout(that.timeoutnum);
+      that.timeoutnum = setTimeout(function () {
+          //新连接
+          that.initWebSocket();
+          that.lockReconnect = false;
+      }, 5000);
+    },
+    // 通信发生错误时触发
+    websocketonerror() {
+      console.log("出现错误");
+      this.reconnect();
+    },
+    // 客户端接收服务端数据时触发
+    websocketonmessage(e) {
+      console.log(e);
+      if (JSON.parse(e.data).printers !== undefined) {
+          this.defaultPrinter = JSON.parse(e.data).defaultPrinter;
+      }
+      // JSON.parse 用来解析JSON字符串
+      console.log("默认打印机" + this.defaultPrinter)
+
+      if (JSON.parse(e.data).status === 'success') {
+          console.log("打印就绪..")
+      }
+      if (JSON.parse(e.data).status === 'failed') {
+          console.log("打印未就绪..")
+      }
+      if (JSON.parse(e.data).taskStatus === 'printed') {
+          console.log('出纸成功--打印成功')
+          // 打印成功回调
+          printSuccess({ order_ids: this.print_order_ids }).then((res) => {
+              console.log(res)
+          })
+      }
+      if (JSON.parse(e.data).taskStatus === 'failed') {
+          console.log("打印失败!")
+      }
+      if (JSON.parse(e.data).taskStatus === 'canceled') {
+          console.log("打印取消!")
+      }
+
+      //收到服务器信息，心跳重置
+      this.reset();
+    },
+    reset() {
+      //重置心跳
+      var that = this;
+      //清除时间
+      clearTimeout(that.timeoutObj);
+      clearTimeout(that.serverTimeoutObj);
+      //重启心跳
+      that.start();
+    },
+    websocketsend(Data) {
+      //数据发送
+      this.socket.send(Data);
+    },
+    // 连接关闭时触发
+    websocketclose(e) {
+      //关闭
+      console.log("断开连接", e);
+      //重连
+      this.reconnect();
+    },
+    getPrinters() {
+      var request = this.getRequestObject("getPrinters");
+      this.websocketsend(JSON.stringify(request));
+    },
+    doPrint() {
+      var request = this.getRequestObject("print");
+      request.task = new Object();
+      request.task.taskID = this.getUUID(8, 10);
+      // 把每次打印的任务 taskID 保存到 taskIDArray 数组
+      this.taskIDArray.push(request.task.taskID)
+      // 记录当前打印请求的ID
+      this.requestIDGetGlobalConfig = request.task.taskID
+      request.task.preview = false;
+      request.task.printer = this.defaultPrinter;
+      request.task.documents = this.print_documents;
+      console.log(request.task.documents)
+
+      this.websocketsend(JSON.stringify(request));
+    },
+    getRequestObject(cmd) {
+      var request = new Object();
+      // 必须:请求的ID,用于唯一标识每个请求，每个客户端保证生成唯一的ID
+      request.requestID = this.getUUID(8, 16);
+      //必须: 协议当前版本
+      request.version = "1.0";
+      //必须: 请求命令名称
+      request.cmd = cmd;
+
+      return request;
+    },
+    getUUID(len, radix) {
+      var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+      var uuid = [], i;
+      radix = radix || chars.length;
+      if (len) {
+        for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
+      } else {
+        var r;
+        uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+        uuid[14] = '4';
+        for (i = 0; i < 36; i++) {
+          if (!uuid[i]) {
+            r = 0 | Math.random() * 16;
+            uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+          }
+        }
+      }
+
+      return uuid.join('');
+    },
+    handleExport() {
+      this.exportLoading = true
+      let params = {
+        ...this.form,
+        page: 1,
+        per_page: this.per_page,
+        confirm_at_start: this.confirmAt[0] ? this.confirmAt[0] : '',
+        confirm_at_end: this.confirmAt[1] ? this.confirmAt[1] : '',
+        is_export: 1
+      }
+      // window.open("/api/plat_orders?" + this.objectToQueryString(params))
+
+      exportOrder(params).then((res) => {
+        this.downLoadXls(res.data)
+        this.$message({ type: 'success', message: '导出成功！' })
+        this.exportLoading = false
+      }).catch(() => {
+        this.exportLoading = false
+      })
+    },
+    downLoadXls(response) {
+      const content = response
+      const blob = new Blob([content])
+      const today = new Date().toLocaleDateString()
+      const fileName = `订单列表${today}.xlsx`
+      if ('download' in document.createElement('a')) {
+        // 非IE下载
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'none'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href) // 释放URL 对象
+        document.body.removeChild(elink)
+      } else {
+        // IE10+下载
+        navigator.msSaveBlob(blob, fileName)
+      }
+    },
+    objectToQueryString(obj) {
+      return Object.keys(obj)
+        .map(key => encodeURIComponent(key) + '=' + (obj[key] ? encodeURIComponent(obj[key]) : ''))
+        .join('&');
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
-.block {
-    margin-top: 20px;
-}
+  
 </style>
diff --git a/resources/frontend/src/views/supplyChain/dailyStock.vue b/resources/frontend/src/views/supplyChain/dailyStock.vue
index adc202b..7c8d27b 100644
--- a/resources/frontend/src/views/supplyChain/dailyStock.vue
+++ b/resources/frontend/src/views/supplyChain/dailyStock.vue
@@ -102,6 +102,7 @@
 import { getDailyStock, batchAddDailyStock } from "@/api/supplyChain"
 import axios from "axios"
 import { goodsSkusList } from "@/api/goods"
+import dayjs from 'dayjs'
 
 export default {
   data() {
@@ -240,6 +241,9 @@ export default {
     }
   },
   mounted() {
+    let start = dayjs().subtract(7, 'day').format('YYYY-MM-DD') + ' 00:00:00'
+    let end = dayjs().format('YYYY-MM-DD hh:mm:ss')
+    this.addTime = [start, end]
     this.fetchList()
   }
 }
diff --git a/resources/frontend/src/views/supplyChain/procureCheck.vue b/resources/frontend/src/views/supplyChain/procureCheck.vue
index 1d83b1a..6a79408 100644
--- a/resources/frontend/src/views/supplyChain/procureCheck.vue
+++ b/resources/frontend/src/views/supplyChain/procureCheck.vue
@@ -44,7 +44,7 @@
         <el-table-column prop="cost" label="采购成本" />
         <el-table-column prop="buyer_name" label="采购人名称" />
         <!-- <el-table-column prop="status" label="状态" /> -->
-        <el-table-column prop="expire_time" label="到货时间" />
+        <el-table-column prop="arrived_time" label="到货时间" />
         <el-table-column prop="supplier_name" label="供应商">
           <template slot-scope="scope">
             <span v-if="scope.row.supplier_name">{{ scope.row.supplier_name }}（{{scope.row.supplier_id}}）</span>
diff --git a/resources/frontend/src/views/supplyChain/procureLog.vue b/resources/frontend/src/views/supplyChain/procureLog.vue
index 15e4b4a..715c053 100644
--- a/resources/frontend/src/views/supplyChain/procureLog.vue
+++ b/resources/frontend/src/views/supplyChain/procureLog.vue
@@ -48,7 +48,7 @@
         <el-table-column prop="cost" label="采购成本" />
         <el-table-column prop="buyer_name" label="采购人名称" />
         <!-- <el-table-column prop="status" label="状态" /> -->
-        <el-table-column prop="expire_time" label="到货时间" />
+        <el-table-column prop="arrived_time" label="到货时间" />
         <el-table-column prop="supplier_name" label="供应商">
           <template slot-scope="scope">
             <span v-if="scope.row.supplier_name">{{ scope.row.supplier_name }}（{{scope.row.supplier_id}}）</span>