From 771ff12693496b58358d68abb9ecbb89c6a8f2e7 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 17 Jan 2025 18:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=AE=A2=E6=88=B7=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=88=B0=E6=9C=9F=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Pricesystem/ListOfPriceSystems.vue | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/views/Pricesystem/ListOfPriceSystems.vue b/src/views/Pricesystem/ListOfPriceSystems.vue
index c268b3f1..6e0894c5 100644
--- a/src/views/Pricesystem/ListOfPriceSystems.vue
+++ b/src/views/Pricesystem/ListOfPriceSystems.vue
@@ -117,7 +117,6 @@
      
       >
         <el-date-picker
-           :disabled="!loadstate"
           v-model="details.form.effectiveTime"
           type="date"
           placeholder="请选择生效时间"
@@ -126,7 +125,7 @@
           value-format="YYYY-MM-DD"
         />
       </el-form-item>
-      <!-- <el-form-item
+      <el-form-item
         label="到期时间"
         :rules="{ required: true, message: '请选择到期时间', trigger: ['change', 'blur'] }"
         prop="expiryTime"
@@ -139,7 +138,7 @@
           :shortcuts="shortcuts"
           value-format="YYYY-MM-DD"
         />
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item
         label="价格体系模板"
         :rules="{ required: true, message: '请选择体系模板', trigger: ['change', 'blur'] }"
@@ -389,10 +388,10 @@ const ImportTemplate = () => {
   dialogTemp.value = true;
 };
 /** 生效时间 -- 生效时间不能大于到期时间 */
-// const time1 = time => {
-//   if (!details.form.expiryTime) return false;
-//   return time.getTime() > new Date(details.form.expiryTime).getTime();
-// };
+const time1 = time => {
+  if (!details.form.expiryTime) return false;
+  return time.getTime() > new Date(details.form.expiryTime).getTime();
+};
 
 /** 到期时间 -- 到期时间不能小于生效时间 */
 const time2 = time => {