From db6e95062dfb57bcd1fb1cacdbb3cb4372c576b0 Mon Sep 17 00:00:00 2001
From: chengxiangling <291105840@qq.com>
Date: 星期三, 14 五月 2025 17:34:00 +0800
Subject: [PATCH] 钣金页面表格样式;

---
 src/views/basicData/calendar/index.vue |   67 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/views/basicData/calendar/index.vue b/src/views/basicData/calendar/index.vue
index a0f174e..6f72c18 100644
--- a/src/views/basicData/calendar/index.vue
+++ b/src/views/basicData/calendar/index.vue
@@ -413,7 +413,7 @@
           <div class="grey_bg">
             <div
               class="flex_holidays_set"
-              v-for="(item, index) in formHolidays"
+              v-for="(item, index) in formHolidays.holidays"
               :key="index"
             >
               <div class="dis_error_wrap">
@@ -429,7 +429,9 @@
                     />
                   </div>
                 </div>
-                <div class="error_text">璇疯緭鍏ヨ妭鍋囨棩鎻忚堪</div>
+                <div class="error_text" v-if="item.describe == ''">
+                  璇疯緭鍏ヨ妭鍋囨棩鎻忚堪
+                </div>
               </div>
               <div class="dis_error_wrap">
                 <div class="flex_item">
@@ -449,7 +451,9 @@
                     </el-date-picker>
                   </div>
                 </div>
-                <div class="error_text">璇疯緭鍏ュ紑濮嬫椂闂�</div>
+                <div class="error_text" v-if="item.startdate == ''">
+                  璇疯緭鍏ュ紑濮嬫椂闂�
+                </div>
               </div>
               <div class="dis_error_wrap">
                 <div class="flex_item">
@@ -469,7 +473,9 @@
                     </el-date-picker>
                   </div>
                 </div>
-                <div class="error_text">璇疯緭鍏ョ粨鏉熸椂闂�</div>
+                <div class="error_text" v-if="item.enddate == ''">
+                  璇疯緭鍏ョ粨鏉熸椂闂�
+                </div>
               </div>
               <div class="dis_error_wrap">
                 <div class="flex_item">
@@ -1031,37 +1037,32 @@
 // };
 // 鎻愪氦鑺傚亣鏃�
 function handleSaveHolidaysForm() {
-  console.log(holidaysRef.value, "琛ㄥ崟dom");
+  const hasValidDates = formHolidays.value.holidays.some(
+    (item) => item.enddate && item.startdate && item.describe
+  );
+  console.log(hasValidDates, "hasValidDates");
   // holidaysRef.value.validate((valid) => {
-  //   console.log(valid,"valid")
-  //   if (valid) {
-  //     proxy.$modal.msgSuccess('submit!');
-  //   } else {
-  //     proxy.$modal.msgSuccess('Form is not valid.');
-  //     return false;
+  //   if (!valid) {
+  //     proxy.$modal.msgSuccess("蹇呭~椤逛笉鑳戒负绌�");
   //   }
-  // })
-  holidaysRef.value.validate((valid) => {
-    if (!valid) {
-      proxy.$modal.msgSuccess("蹇呭~椤逛笉鑳戒负绌�");
-    }
-    if (valid) {
-      updateCalendar({
-        id: form.value.id,
-        holidays: formHolidays.value.holidays.map((item) => {
-          return {
-            startdate: moment(item.startdate).format("YYYY-MM-DD"),
-            enddate: moment(item.enddate).format("YYYY-MM-DD"),
-            describe: item.describe,
-          };
-        }),
-      }).then((response) => {
-        proxy.$modal.msgSuccess("鏂板鎴愬姛");
-        open.value = false;
-        getList();
-      });
-    }
-  });
+  //if (valid) {
+  if (!hasValidDates) {
+    updateCalendar({
+      id: form.value.id,
+      holidays: formHolidays.value.holidays.map((item) => {
+        return {
+          startdate: moment(item.startdate).format("YYYY-MM-DD"),
+          enddate: moment(item.enddate).format("YYYY-MM-DD"),
+          describe: item.describe,
+        };
+      }),
+    }).then((response) => {
+      proxy.$modal.msgSuccess("鏂板鎴愬姛");
+      open.value = false;
+      getList();
+    });
+  }
+  // });
 }
 /** 鎻愪氦鎸夐挳 */
 function submitForm() {

--
Gitblit v1.9.3