From 9324891325bd9fbdcd9fcd94f908c3054eb26844 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 2 Jan 2024 08:54:28 +0800
Subject: [PATCH] bug

---
 src/components/TableHead/src/TableHead.vue                  | 1 -
 src/components/rowDrop/index.vue                            | 6 +++---
 .../systemSetting/accountcalendar/accountcalendar.data.ts   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/TableHead/src/TableHead.vue b/src/components/TableHead/src/TableHead.vue
index 9fbe9fcbd..e99426886 100644
--- a/src/components/TableHead/src/TableHead.vue
+++ b/src/components/TableHead/src/TableHead.vue
@@ -62,7 +62,6 @@ import rowDrop from "@/components/rowDrop/index.vue"
       default: null
     }
   })
-
   const buttonsLeft = ref([])
   const buttonsRight = ref([])
   const tableNavBtnsContent_Ref = ref()
diff --git a/src/components/rowDrop/index.vue b/src/components/rowDrop/index.vue
index 6dafda506..72c2fb400 100644
--- a/src/components/rowDrop/index.vue
+++ b/src/components/rowDrop/index.vue
@@ -133,7 +133,7 @@ const initSelectSta = () => {
       JSON.parse(res).forEach((item, index) => {
         // 列表字段第一个不能参与排序及显隐操作（详情弹窗必备）
         // 列表字段操作列不能参与排序及显隐操作
-        if (index != 0) {
+        if (!item.fixed) {
           if (item.field != 'action') {
             checkedDataList.value.push(item.label)
             _showTableColumns.push(_myTableColumns.find(myItem => (myItem.label == item.label)))
@@ -145,7 +145,7 @@ const initSelectSta = () => {
       _myTableColumns?.forEach((myTableItem, index) => {
         // 列表字段第一个不能参与排序及显隐操作（详情弹窗必备）
         // 列表字段操作列不能参与排序及显隐操作
-        if (index != 0) {
+        if (!myTableItem.fixed) {
           if (myTableItem.field != 'action') {
             if (allData.value.indexOf(myTableItem.label) == -1) {
               allData.value.push(myTableItem.label)
@@ -175,7 +175,7 @@ const initSelectSta = () => {
       _myTableColumns?.forEach((item, index) => {
         // 列表字段第一个不能参与排序及显隐操作（详情弹窗必备）
         // 列表字段操作列不能参与排序及显隐操作
-        if (index != 0) {
+        if (!item.fixed) {
           if (item.field != 'action') {
             checkedDataList.value.push(item.label)
             allData.value.push(item.label)
diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts
index 4c809839f..da0482d2d 100644
--- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts
@@ -21,7 +21,7 @@ export const Accountcalendar = useCrudSchemas(reactive<CrudSchema[]>([
         style: {width:'100%'},
         type: 'year',
         dateFormat: 'YYYY',
-        valueFormat: 'x',
+        valueFormat: 'YYYY',
       }
     },
   },