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

ปรับ icon ออกคำสั่ง

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-09-06 10:13:57 +07:00
parent 01fcaa31e4
commit 9196885cc2
2 changed files with 43 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/07_insignia/components/5_Borrow/Main.vue
View file

@ -39,7 +39,6 @@ const fecthRound = async () => {
.then(async (res) => { .then(async (res) => {
let data = res.data.result; let data = res.data.result;
if (data.length !== 0) { if (data.length !== 0) {
await fecthInsigniaType();
selectRoundAllOption.value = [ selectRoundAllOption.value = [
{ {
name: "ทั้งหมด", name: "ทั้งหมด",
@ -63,6 +62,9 @@ const fecthRound = async () => {
selectRound.value = data[0].id; selectRound.value = data[0].id;
yearRound.value = data[0].year; yearRound.value = data[0].year;
roundYear.value = data[0].year; roundYear.value = data[0].year;
if (roundYear.value !== "") {
await fecthInsigniaType();
}
} }
}) })
.catch((err) => { .catch((err) => {

78
src/modules/10_order/components/Main.vue
View file

@ -333,7 +333,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="row col-12 q-col-gutter-sm"> <div class="row col-12 q-col-gutter-sm">
<q-select <q-select
class="col-xs-12 col-sm-3 col-md-2" class="col-xs-12 col-sm-3 col-md-"
v-model="fiscalyear" v-model="fiscalyear"
label="ปีงบประมาณ" label="ปีงบประมาณ"
dense dense
@ -404,44 +404,46 @@ const paginationLabel = (start: string, end: string, total: string) => {
<div class="col-12"> <div class="col-12">
<q-card bordered class="col-12 filter-card q-pa-sm"> <q-card bordered class="col-12 filter-card q-pa-sm">
<div class="row col-12 q-col-gutter-sm"> <div class="row col-12 q-col-gutter-sm">
<q-select <div class="col-xs-12 col-sm-3 col-md-4">
class="col-xs-12 col-sm-3 col-md-2" <q-select
v-model="OrderType" v-model="OrderType"
label="ประเภท" label="ประเภท"
dense dense
emit-value emit-value
map-options map-options
option-label="name" option-label="name"
:options="OrderTypeOption" :options="OrderTypeOption"
option-value="name" option-value="name"
lazy-rules lazy-rules
hide-bottom-space hide-bottom-space
:readonly="false" :readonly="false"
:borderless="false" :borderless="false"
:outlined="true" :outlined="true"
:hide-dropdown-icon="false" :hide-dropdown-icon="false"
@update:model-value="searchFilterTable" @update:model-value="searchFilterTable"
/> />
<q-select </div>
class="col-xs-12 col-sm-3 col-md-2" <div class="col-xs-12 col-sm-3 col-md-2">
v-model="OrderStatus" <q-select
label="สถานะ" v-model="OrderStatus"
dense label="สถานะ"
emit-value dense
map-options emit-value
option-label="name" map-options
:options="OrderStatusOption" option-label="name"
option-value="name" :options="OrderStatusOption"
lazy-rules option-value="name"
hide-bottom-space lazy-rules
:readonly="false" hide-bottom-space
:borderless="false" :readonly="false"
:outlined="true" :borderless="false"
:hide-dropdown-icon="false" :outlined="true"
@update:model-value="searchFilterTable" :hide-dropdown-icon="false"
/> @update:model-value="searchFilterTable"
/>
</div>
<q-space /> <q-space />
<PopupHistory :OrderTypeOption="OrderTypeOption" /> <div><PopupHistory :OrderTypeOption="OrderTypeOption" /></div>
</div> </div>
</q-card> </q-card>
</div> </div>