hrms-bangkok/hrms-mgt
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 2m57s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-06-22 09:29:08 +07:00
commit c4fe629cd2
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/18_command/components/Step/1_Detail.vue
View file

@ -122,8 +122,7 @@ async function onSubmit() {
if ( if (
store.isIdofficer && store.isIdofficer &&
formData.isBangkok !== "BANGKOK" && formData.isBangkok !== "BANGKOK" &&
formData.isBangkok !== "OFFICE" && formData.isBangkok !== "OFFICE"
commandCode.value !== "C-PM-47"
) { ) {
dialogMessageNotify($q, "กรุณาเลือกคำสั่ง"); dialogMessageNotify($q, "กรุณาเลือกคำสั่ง");
return; return;
@ -224,6 +223,8 @@ onMounted(async () => {
formData.commandExcecuteDate = props.formCommandList.commandExcecuteDate; formData.commandExcecuteDate = props.formCommandList.commandExcecuteDate;
formData.isBangkok = !store.isIdofficer formData.isBangkok = !store.isIdofficer
? null ? null
: props.formCommandList.commandCode === "C-PM-47"
? "OFFICE"
: props.formCommandList.isBangkok; : props.formCommandList.isBangkok;
commandCode.value = props.formCommandList.commandCode; commandCode.value = props.formCommandList.commandCode;
const [volume, chapter] = props.formCommandList.commandNo.split("/"); const [volume, chapter] = props.formCommandList.commandNo.split("/");
@ -485,12 +486,9 @@ onMounted(async () => {
/> />
</div> </div>
<div <div class="col-12 q-gutter-sm" v-if="store.isIdofficer">
class="col-12 q-gutter-sm"
v-if="store.isIdofficer && commandCode !== 'C-PM-47'"
>
<q-radio <q-radio
:disable="store.readonly" :disable="store.readonly || commandCode === 'C-PM-47'"
keep-color keep-color
color="primary" color="primary"
dense dense
@ -500,7 +498,7 @@ onMounted(async () => {
/> />
<q-radio <q-radio
:disable="store.readonly" :disable="store.readonly || commandCode === 'C-PM-47'"
keep-color keep-color
color="primary" color="primary"
dense dense