hrms-bangkok/hrms-user
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m5s
Details

Browse source 
* develop:
  ปิดตารางประวัติตำแหน่งไปก่อน
This commit is contained in:
Warunee Tamkoo 2026-01-27 16:49:05 +07:00
commit c4fbbd535e
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/modules/10_registry/02_Government/07_Position.vue
View file

@ -27,7 +27,7 @@ const {
} = useCounterMixin(); } = useCounterMixin();
const checkType = ref<boolean>( const checkType = ref<boolean>(
dataPerson.officerType == "OFFICER" ? true : false dataPerson.officerType == "OFFICER" ? true : false,
); // เช็คประเภทผู้ใช้งาน ); // เช็คประเภทผู้ใช้งาน
const mode = ref<boolean>($q.screen.gt.xs); // เช็คขนาดหน้าจอ ถ้าเป็นขนาดใหญ่กว่า xs จะเป็นโหมดแสดงตาราง const mode = ref<boolean>($q.screen.gt.xs); // เช็คขนาดหน้าจอ ถ้าเป็นขนาดใหญ่กว่า xs จะเป็นโหมดแสดงตาราง
const isLoading = reactive({ const isLoading = reactive({
@ -320,25 +320,25 @@ const columns = computed<QTableColumn[]>(() => {
(column) => (column) =>
column.name !== "positionExecutive" && column.name !== "positionExecutive" &&
column.name !== "lastUpdateFullName" && column.name !== "lastUpdateFullName" &&
column.name !== "lastUpdatedAt" column.name !== "lastUpdatedAt",
); );
} }
} }
return baseColumns.value.filter( return baseColumns.value.filter(
(e: QTableColumn) => (e: QTableColumn) =>
e.name !== "lastUpdateFullName" && e.name !== "lastUpdatedAt" e.name !== "lastUpdateFullName" && e.name !== "lastUpdatedAt",
); );
}); });
const visibleColumns = ref<String[]>( const visibleColumns = ref<String[]>(
baseVisibleColumns.value.filter( baseVisibleColumns.value.filter(
(e: string) => e !== "lastUpdateFullName" && e !== "lastUpdatedAt" (e: string) => e !== "lastUpdateFullName" && e !== "lastUpdatedAt",
) ),
); );
const columnsHistory = computed<QTableColumn[]>(() => { const columnsHistory = computed<QTableColumn[]>(() => {
if (!checkType.value) { if (!checkType.value) {
if (baseColumns.value) { if (baseColumns.value) {
return baseColumns.value.filter( return baseColumns.value.filter(
(column) => column.name !== "positionExecutive" (column) => column.name !== "positionExecutive",
); );
} }
} }
@ -445,7 +445,7 @@ function onSearch() {
rows.value = onSearchDataTable( rows.value = onSearchDataTable(
filter.value, filter.value,
rowsData.value, rowsData.value,
columns.value ? columns.value : [] columns.value ? columns.value : [],
); );
} }
@ -491,7 +491,7 @@ onMounted(async () => {
</div> </div>
</div> </div>
<div class="row col-12"> <!-- <div class="row col-12">
<q-space /> <q-space />
<q-input <q-input
v-if="mode" v-if="mode"
@ -522,9 +522,9 @@ onMounted(async () => {
:options="columns" :options="columns"
:display-value="$q.lang.table.columns" :display-value="$q.lang.table.columns"
/> />
</div> </div> -->
<div class="col-12 q-mt-sm"> <!-- <div class="col-12 q-mt-sm">
<d-table <d-table
flat flat
dense dense
@ -649,7 +649,7 @@ onMounted(async () => {
</div> </div>
</template> </template>
</d-table> </d-table>
</div> </div> -->
</div> </div>
<DialogHistory <DialogHistory

2
src/modules/10_registry/tabs/02_government.vue
View file

@ -31,7 +31,7 @@ const router = useRouter();
<div :class="`row q-my-sm ${$q.screen.gt.xs ? '' : 'mobileClass'}`"> <div :class="`row q-my-sm ${$q.screen.gt.xs ? '' : 'mobileClass'}`">
<Government /> <Government />
<!-- <Position /> --> <Position />
<Actposition /> <Actposition />
<Assistance /> <Assistance />
<Discipline /> <Discipline />