From 775fd1060d212e5d120449c1755d790fef53df90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=8F?= <1978476055@qq.com>
Date: Thu, 11 Jul 2024 14:44:20 +0800
Subject: [PATCH] 1

---
 .env.development          |  4 ++--
 src/views/order/index.vue | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index f10a58d..9bd1cda 100644
--- a/.env.development
+++ b/.env.development
@@ -2,11 +2,11 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://192.168.1.24:8080'
+VUE_APP_BASE_API = 'http://192.168.1.12:8080'
 # VUE_APP_BASE_API = 'https://plus.hwms.shop'
 
 # socket 连接地址
-VUE_APP_WS_URL = 'ws://192.168.1.24:8080'
+VUE_APP_WS_URL = 'ws://192.168.1.12:8080'
 # VUE_APP_WS_URL = 'ws://plus.hwms.shop'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 7ce103b..cf858e4 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -17,6 +17,20 @@
         <el-form-item label="时间选择：">
           <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" />
         </el-form-item>
+        <el-form-item label="完成时间：">
+          <el-date-picker
+            v-model="finishTime"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            size="small"
+            type="datetimerange"
+            placement="bottom-end"
+            placeholder="自定义时间"
+            style="width: 280px;"
+            :picker-options="pickerOptions"
+            @change="onchangeFinishTime"
+          />
+        </el-form-item>
         <!-- <el-form-item label="发货方式：" prop="filter_delivery">
           <el-select
             v-model="tableFrom.filter_delivery"
@@ -559,6 +573,7 @@ export default {
       ], // 商品类型
       orderChartType: {},
       timeVal: [],
+      finishTime: [],
       fromList: {
         title: '选择时间',
         custom: true,
@@ -734,10 +749,20 @@ export default {
     /** 重置 */
     searchReset() {
       this.timeVal = []
+      this.finishTime = []
+      this.tableFrom.finish_time = ""
       this.tableFrom.date = ''
       this.$refs.searchForm.resetFields()
       this.getList(1)
     },
+    // 具体日期
+    onchangeFinishTime(e) {
+      this.finishTime = e;
+      this.tableFrom.finish_time = e ? this.finishTime.join("-") : "";
+      this.tableFrom.page = 1;
+      this.getCardList()
+      this.getList(1);
+    },
     // 回
     limitCount(row) {
       if (row.stock > row.product_num)row.stock = row.product_num