From 63dc65eafbd50029a5236e6eeb1cf6443a9d5446 Mon Sep 17 00:00:00 2001
From: lzhizhao <790086754@qq.com>
Date: Tue, 3 Jun 2025 23:00:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation-management/commodity/index.vue  | 19 +++++++++++++++----
 .../presale/products/popup/add-or-update.vue  | 17 +++++++++++++++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/operation-management/commodity/index.vue b/src/views/modules/operation-management/commodity/index.vue
index 962cac0..af7abed 100644
--- a/src/views/modules/operation-management/commodity/index.vue
+++ b/src/views/modules/operation-management/commodity/index.vue
@@ -55,6 +55,15 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="是否预售商品">
+              <el-select
+                v-model="formInline.isAdvanceSell"
+                placeholder="请选择是否预售"
+              >
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="$refs.oTable.reload()"
                 >查询</el-button
@@ -163,7 +172,8 @@ export default {
       formInline: {
         name: '',
         marketId: '',
-        shopId: ''
+        shopId: '',
+        isAdvanceSell: 0
       },
       tableProp: {
         'auto-resize': true,
@@ -181,7 +191,8 @@ export default {
     this.formInline = {
       name: '',
       marketId: this.marketId,
-      shopId: this.shopId
+      shopId: this.shopId,
+      isAdvanceSell: 0
     }
     this.$nextTick(() => {
       this.$refs.oTable.reload()
@@ -257,7 +268,8 @@ export default {
       this.formInline = {
         name: '',
         marketId: this.marketId,
-        shopId: this.shopId
+        shopId: this.shopId,
+        isAdvanceSell: 0
       }
       this.$refs.oTable.reload()
     },
@@ -508,4 +520,3 @@ export default {
   margin-bottom: 5px;
 }
 </style>
-
diff --git a/src/views/modules/presale/products/popup/add-or-update.vue b/src/views/modules/presale/products/popup/add-or-update.vue
index 00ea79d..5652593 100644
--- a/src/views/modules/presale/products/popup/add-or-update.vue
+++ b/src/views/modules/presale/products/popup/add-or-update.vue
@@ -682,6 +682,19 @@ export default {
                     )
                     return
                   }
+                  if (
+                    dayjs(this.ruleForm.estimatedStartDeliveryTime).format(
+                      'YYYY-MM-DD'
+                    ) ===
+                    dayjs(this.ruleForm.estimatedEndDeliveryTime).format(
+                      'YYYY-MM-DD'
+                    )
+                  ) {
+                    this.$message.error(
+                      '可预约发货时间必须跨天'
+                    )
+                    return
+                  }
                   if (
                     this.ruleForm.productList &&
                     this.ruleForm.productList.length === 0
@@ -835,7 +848,7 @@ export default {
       text-align: center;
       width: 50%;
       height: 40px;
-      line-height:40px;
+      line-height: 40px;
       font-size: 14px;
       background: white;
       z-index: 100;
@@ -848,7 +861,7 @@ export default {
       text-align: center;
       top: 0;
       height: 40px;
-      line-height:40px;
+      line-height: 40px;
       right: 0;
       width: 50%;
       font-size: 14px;