From e568074e8466fa090a297144a7442a578516756c Mon Sep 17 00:00:00 2001
From: Dragon <13925835632@139.com>
Date: Tue, 26 Mar 2024 17:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B8=E8=BF=90=E7=A4=BC?=
 =?UTF-8?q?=E7=89=A9=E6=98=8E=E7=BB=86=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lucky/LuckyGiftDetail.vue | 36 ++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/views/lucky/LuckyGiftDetail.vue b/src/views/lucky/LuckyGiftDetail.vue
index 5abb139..22c0648 100644
--- a/src/views/lucky/LuckyGiftDetail.vue
+++ b/src/views/lucky/LuckyGiftDetail.vue
@@ -13,7 +13,7 @@
         </el-option>
       </el-select>
     </div>
-    <div class="inquire" style="display: inline-block; margin-right: 120px">
+    <div class="inquire" style="display: inline-block; margin-right: 20px">
       <span class="demonstration" style="display: inline-block">送礼用户ID</span>
       <el-input
         style="display: inline-block"
@@ -22,6 +22,20 @@
         class="input"
       ></el-input>
     </div>
+    <!-- 查询条件 -->
+    <div class="inquire" style="display: inline-block; margin-right: 120px">
+      <div class="block">
+        <span class="demonstration">日期</span>
+        <el-date-picker
+          v-model="inquire.time"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+    </div>
     <!-- 查询按钮 -->
     <el-button style="" type="primary" @click="getData()">查询</el-button>
     <el-button style="" type="primary" @click="exportDate()">导出</el-button>
@@ -96,6 +110,7 @@ import {
   getRewardList,
   luckyGiftRewardRecordExport,
 } from "@/api/lucky/luckyGiftRangeConfig";
+import { dateFormat } from "@/utils/system-helper";
 import { ElMessage } from "element-plus";
 export default {
   name: "LuckyGiftDetail",
@@ -107,6 +122,7 @@ export default {
         gifts: [],
         giftId: "",
         senUserId: "",
+        time: "",
       },
       // 表格
       tableData: [],
@@ -133,11 +149,19 @@ export default {
     // 查询
     getData() {
       this.loading = true;
+      let startTime = "";
+      let endTime = "";
+      if (this.inquire.time && this.inquire.time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
       getGiftSendPage({
         page: this.currentPage,
         pageSize: this.pageSize,
         giftId: this.inquire.giftId,
         sendErBanNo: this.inquire.senUserId,
+        startTime: startTime,
+        endTime: endTime,
       }).then((res) => {
         this.total = res.data.total;
         this.tableData = res.data.records;
@@ -154,14 +178,24 @@ export default {
     // 导出
     exportDate() {
       var obj = {};
+      let startTime = "";
+      let endTime = "";
+      if (this.inquire.time && this.inquire.time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
       if (this.inquire.giftId == null || this.inquire.giftId == "null") {
         obj = {
           sendErBanNo: this.inquire.senUserId,
+          startTime: dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss"),
+          endTime: dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss"),
         };
       } else {
         obj = {
           giftId: this.inquire.giftId,
           sendErBanNo: this.inquire.senUserId,
+          startTime: dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss"),
+          endTime: dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss"),
         };
       }