From 40156cbae622671684543e0899c381f0b22a4bb4 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期五, 25 四月 2025 20:05:41 +0800
Subject: [PATCH] 提交新内容和修正

---
 src/views/basicData/calendar/index.vue |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/basicData/calendar/index.vue b/src/views/basicData/calendar/index.vue
index 3cb4745..073b58d 100644
--- a/src/views/basicData/calendar/index.vue
+++ b/src/views/basicData/calendar/index.vue
@@ -102,6 +102,10 @@
               <span v-if="item.work==='y'" status="success" class="mart5">{{item.chineseName}}: 宸ヤ綔鏃�;&nbsp;</span>
               <span v-if="item.work==='n'" status="info" class="mart5">{{item.chineseName}}: 闈炲伐浣滄棩;&nbsp;</span>
             </span>
+            <!-- <div v-for="(item, index) in JSON.parse(row.content.value).weekdays" :key="index">
+              <vxe-tag v-if="item.work==='y'" status="success" class="mart5">{{item.chineseName}}: 宸ヤ綔鏃�;&nbsp;</vxe-tag>
+              <vxe-tag v-if="item.work==='n'" status="info" class="mart5">{{item.chineseName}}: 闈炲伐浣滄棩;&nbsp;</vxe-tag>
+            </div> -->
         </div>
         <div v-if="row.type === '2'">
             <div>{{JSON.parse(row.content.value).holidays.startdate}}鑷硔{JSON.parse(row.content.value).holidays.enddate}}</div>
@@ -424,26 +428,26 @@
   {
     title: "鏃ュ巻绫诲瀷",
     field: "type",
-    width: 150,
+    width: 200,
     align: "center",
     slots: { default: "status" },
   },
   {
     title: "鏃ュ巻鐢熸晥鏃堕棿",
     field: "effectiveDate",
-    width: 100,
+    width: 200,
     align: "center",
   },
   {
     title: "鏃ュ巻澶辨晥鏃堕棿",
     field: "expiringDate",
-    width: 150,
+    width: 200,
     align: "center",
   },
   {
     title: "鏃ュ巻鍐呭",
     field: "content",
-    width: 200,
+    width: 230,
     align: "center",
     slots: { default: "mark" },
   },
@@ -470,7 +474,7 @@
   {
     title: '閫傜敤杞﹂棿',
     field: 'applicableWorkshop',
-    width: 150,
+    width: 200,
     align: 'center',
     formatter: (({ cellValue, row, column }) => {
      
@@ -488,19 +492,19 @@
   {
     title: "閫傜敤宸ュ簭",
     field: "applicableProcess",
-    width: 90,
+    width: 200,
     align: "center",
   },
   {
     title: "鍒涘缓鑰�",
     field: "createBy",
-    width: 90,
+    width: 200,
     align: "center",
   },
   {
     title: "鍒涘缓鏃堕棿",
     field: "createTime",
-    width: 90,
+    width: 200,
     align: "center",
   },
   { title: '鎿嶄綔', width: 100, fixed:"right", slots: { default: 'buttons' }, align: 'center' }

--
Gitblit v1.9.3