From c6a72438c3bb42a4eb2f07c2fc8443344a4a2ae8 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 28 Aug 2024 18:00:36 +0800
Subject: [PATCH] 1

---
 src/views/store/store_product/index.vue | 12 +++++++++++
 src/views/user/indexList.vue            | 28 ++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/views/store/store_product/index.vue b/src/views/store/store_product/index.vue
index 7705f9be..0edb644d 100644
--- a/src/views/store/store_product/index.vue
+++ b/src/views/store/store_product/index.vue
@@ -31,6 +31,17 @@
                         @change="resetPage"
                     />
                 </el-form-item>
+                <el-form-item label="显示" prop="is_show">
+                    <el-select
+                        v-model="queryParams.is_show"
+                        placeholder="请选择是否显示"
+                        style="width: 240px"
+                        @change="resetPage"
+                    >
+                        <el-option label="显示" value="1" />
+                        <el-option label="不显示" value="0" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -245,6 +256,7 @@ const showCopy = ref(false)
 const queryParams = reactive({
     store_name: '',
     class_all: '',
+    is_show: '',
     bar_code: ''
 })
 
diff --git a/src/views/user/indexList.vue b/src/views/user/indexList.vue
index a89462ae..865470ec 100644
--- a/src/views/user/indexList.vue
+++ b/src/views/user/indexList.vue
@@ -64,6 +64,17 @@
                         />
                     </el-select>
                 </el-form-item>
+                <el-form-item label="" prop="create_time">
+                    <el-date-picker
+                        v-model="startEndTime"
+                        type="daterange"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                        unlink-panels
+                        @change="changeStartEndTime"
+                    />
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -171,6 +182,8 @@ import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import Details from './details.vue'
+import moment from 'moment'
+
 const route = useRoute()
 const detailsRef = ref(null)
 const user_ship_data = ref([])
@@ -184,7 +197,9 @@ const queryParams = reactive({
     account: '',
     mobile: '',
     store_id: route.query.store_id ?? '',
-    user_ship: ''
+    user_ship: '',
+    start_time: '',
+    end_time: ''
 })
 apiUserShipLists([]).then((res) => {
     user_ship_data.value = res.lists
@@ -253,6 +268,17 @@ const remoteMethod = (e = '') => {
             }, 300)
         })
 }
+const startEndTime = ref([new Date(), new Date()])
+const changeStartEndTime = () => {
+    if (startEndTime.value[0] && startEndTime.value[1]) {
+        queryParams.start_time = moment(startEndTime.value[0]).format('YYYY-MM-DD') + ' 00:00:00'
+        queryParams.end_time = moment(startEndTime.value[1]).format('YYYY-MM-DD') + ' 23:59:59'
+    } else {
+        queryParams.start_time = ''
+        queryParams.end_time = ''
+    }
+    getLists()
+}
 onMounted(() => {
     getLists()
 })