From 3a5d7523fb19dced77a9d4e328626207a1e70e30 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Mon, 10 Mar 2025 15:03:03 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cart/components/date-picker-button.vue    |  3 ++-
 src/views/user/goodsManagement/index.vue      |  2 +-
 src/views/user/index.vue                      |  2 +-
 .../components/order-home.vue                 | 26 ++++++++++++++++++-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/views/cart/components/date-picker-button.vue b/src/views/cart/components/date-picker-button.vue
index afe0ce1..90adecd 100644
--- a/src/views/cart/components/date-picker-button.vue
+++ b/src/views/cart/components/date-picker-button.vue
@@ -24,7 +24,8 @@ import { ElDatePicker, ElButton } from 'element-plus'
 const disabledDate = (date) => {
     const today = new Date()
     // 禁用今天之前的日期
-    return date.getTime() < today.getTime()
+    // return date.getTime() < today.getTime()
+    return date.setHours(0, 0, 0, 0) < today.setHours(0, 0, 0, 0);
 }
 
 const props = defineProps({
diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue
index 898c6c8..efb2132 100644
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@@ -1818,7 +1818,7 @@ const getUpdateTimeBgColor = (row: any) => {
                                 v-model="addAndEditForm.person"
                                 placeholder="请输入联系人"
                                 clearable
-                                maxlength="20"
+                                maxlength="10"
                             />
                         </el-form-item>
                     </el-col>
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 0d21d49..3bc61db 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -11,7 +11,7 @@ const userInfo = JSON.parse(localStorage.getItem('main')).userInfo
 // const isAdmin = ref(userInfo.admin)
 // 临时管理员权限
 // console.log('🚀 ~ userInfo:', userInfo)
-const isAdmin = ref(userInfo.userId == 226 || userInfo.userId == 225)
+const isAdmin = ref(userInfo.userId == 226 || userInfo.userId == 225 || userInfo.admin)
 // console.log('🚀 ~ isAdmin:', isAdmin.value)
 
 import imgSrc from '@/assets/img/logo.png'
diff --git a/src/views/user/orderManagementCz/components/order-home.vue b/src/views/user/orderManagementCz/components/order-home.vue
index b68d65a..d096fd7 100644
--- a/src/views/user/orderManagementCz/components/order-home.vue
+++ b/src/views/user/orderManagementCz/components/order-home.vue
@@ -196,6 +196,7 @@ const pickUpCodeOut = ref('');
 const pickUpViewOut = (index: number) => {
   indexPickUpCode.value = index;
   pickUpCodeForm.pickUpCode = '';
+  pickUpCodeForm.orderRemark = '';
   dialogVisiblePickUpCodeOut.value = true;
 };
 const pickUpCodeFormRef = ref()
@@ -208,9 +209,17 @@ const pickUpCodeRules = ref({
             trigger: 'blur',
         }
     ],
+    orderRemark:[
+        {
+            required: true,
+            message: '请输入备注',
+            trigger: 'blur',
+        } 
+    ]
 })
 const pickUpCodeForm = reactive<any>({
     pickUpCode: '',
+    orderRemark: '',
 })
 
 
@@ -789,7 +798,7 @@ const confirmReceipt =  () => {
         })
         .then(() => {
             console.log('xxxxxxxxxxxxxxxx',indexPickUpCode.value,pickUpCodeForm.pickUpCode)
-            return passApi({ orderId: cardList.value[indexPickUpCode.value].orderId, orderStatus: 4,pickupCode:pickUpCodeForm.pickUpCode })
+            return passApi({ orderId: cardList.value[indexPickUpCode.value].orderId, orderStatus: 4,pickupCode:pickUpCodeForm.pickUpCode,orderRemark:pickUpCodeForm.orderRemark })
         })
         .then((res) => {
             if (res.code === 200) {
@@ -2178,6 +2187,21 @@ const confirmReceipt =  () => {
             </el-form-item>
         </el-col>
     </el-row>
+
+    <el-row :gutter="20">
+        <el-col :span="20">
+            <el-form-item label="备注：" prop="orderRemark" label-width="100px" >
+                <el-input
+                    autocomplete="off"
+                    maxlength="20"
+                    v-model="pickUpCodeForm.orderRemark"
+                    clearable
+                    type="textarea"
+                    :rows="3"
+                />
+            </el-form-item>
+        </el-col>
+    </el-row>
     </el-form>
     <div class="button-container">
         <el-button type="primary" class="primary-lease" @click="dialogVisiblePickUpCodeOut=false">