From 12d51d8e3109bfa7289cec1996154866e6e611d8 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 17 Jan 2025 14:24:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8E=BB=E6=8E=89=E5=88=B0=E6=9C=9F=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=EF=BC=8C=E7=BC=96=E8=BE=91=E7=A6=81=E6=AD=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=A5=9E=E6=95=88=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/Pricesystem/index.js              |  2 +-
 src/views/Pricesystem/ListOfPriceSystems.vue | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/option/Pricesystem/index.js b/src/option/Pricesystem/index.js
index e56e95ab..5d191dce 100644
--- a/src/option/Pricesystem/index.js
+++ b/src/option/Pricesystem/index.js
@@ -118,7 +118,7 @@ export const columnList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '200',
+    width: '300',
     checkarr: [],
     fixed: 'right',
     sortable: false,
diff --git a/src/views/Pricesystem/ListOfPriceSystems.vue b/src/views/Pricesystem/ListOfPriceSystems.vue
index 9d021271..c268b3f1 100644
--- a/src/views/Pricesystem/ListOfPriceSystems.vue
+++ b/src/views/Pricesystem/ListOfPriceSystems.vue
@@ -114,8 +114,10 @@
         label="生效时间"
         :rules="{ required: true, message: '请选择生效时间', trigger: ['change', 'blur'] }"
         prop="effectiveTime"
+     
       >
         <el-date-picker
+           :disabled="!loadstate"
           v-model="details.form.effectiveTime"
           type="date"
           placeholder="请选择生效时间"
@@ -124,7 +126,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"
@@ -137,7 +139,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'] }"
@@ -257,6 +259,7 @@ const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
 const dialogTemp = ref(false);
+const loadstate=ref(true);//tru新增
 const Historical = reactive({
   popUpShow: false, //历史版本弹窗
   data: [], //历史版本数据
@@ -386,10 +389,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 => {
@@ -652,6 +655,7 @@ const deletetails = row => {
 /** 设置客户 */
 const handleClient = async row => {
   try {
+    loadstate.value = false;
     details.loadingObj.pageLoading = true;
     let _data = {
       brandId: row.brandId,
@@ -696,6 +700,7 @@ const addition = async () => {
     });
     return;
   }
+  loadstate.value = true;
   console.log(details.selectionList, 'details.selectionList');
   let _row = details.selectionList[0];
   console.log(_row, '_row');

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 2/2] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=BB=B7=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 => {