zhang_li 11 months ago
parent
commit
9324891325
  1. 1
      src/components/TableHead/src/TableHead.vue
  2. 6
      src/components/rowDrop/index.vue
  3. 2
      src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts

1
src/components/TableHead/src/TableHead.vue

@ -62,7 +62,6 @@ import rowDrop from "@/components/rowDrop/index.vue"
default: null default: null
} }
}) })
const buttonsLeft = ref([]) const buttonsLeft = ref([])
const buttonsRight = ref([]) const buttonsRight = ref([])
const tableNavBtnsContent_Ref = ref() const tableNavBtnsContent_Ref = ref()

6
src/components/rowDrop/index.vue

@ -133,7 +133,7 @@ const initSelectSta = () => {
JSON.parse(res).forEach((item, index) => { JSON.parse(res).forEach((item, index) => {
// //
// //
if (index != 0) { if (!item.fixed) {
if (item.field != 'action') { if (item.field != 'action') {
checkedDataList.value.push(item.label) checkedDataList.value.push(item.label)
_showTableColumns.push(_myTableColumns.find(myItem => (myItem.label == item.label))) _showTableColumns.push(_myTableColumns.find(myItem => (myItem.label == item.label)))
@ -145,7 +145,7 @@ const initSelectSta = () => {
_myTableColumns?.forEach((myTableItem, index) => { _myTableColumns?.forEach((myTableItem, index) => {
// //
// //
if (index != 0) { if (!myTableItem.fixed) {
if (myTableItem.field != 'action') { if (myTableItem.field != 'action') {
if (allData.value.indexOf(myTableItem.label) == -1) { if (allData.value.indexOf(myTableItem.label) == -1) {
allData.value.push(myTableItem.label) allData.value.push(myTableItem.label)
@ -175,7 +175,7 @@ const initSelectSta = () => {
_myTableColumns?.forEach((item, index) => { _myTableColumns?.forEach((item, index) => {
// //
// //
if (index != 0) { if (!item.fixed) {
if (item.field != 'action') { if (item.field != 'action') {
checkedDataList.value.push(item.label) checkedDataList.value.push(item.label)
allData.value.push(item.label) allData.value.push(item.label)

2
src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts

@ -21,7 +21,7 @@ export const Accountcalendar = useCrudSchemas(reactive<CrudSchema[]>([
style: {width:'100%'}, style: {width:'100%'},
type: 'year', type: 'year',
dateFormat: 'YYYY', dateFormat: 'YYYY',
valueFormat: 'x', valueFormat: 'YYYY',
} }
}, },
}, },

Loading…
Cancel
Save