Merge branch 'develop' into dev

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-03-05 15:01:54 +07:00
commit de4c5a3dda

View file

@ -59,7 +59,6 @@ const formData = reactive({
const isReadOnly = ref<boolean>(false); //
const workflowRef = ref<any>(null);
const isDeputy = ref<boolean>(false); //
//
const statusOptionMain = ref<DataOption[]>(
@ -88,7 +87,6 @@ async function fetchDataRequest() {
formData.status = data.status;
formData.remark = data.remark;
isDeputy.value = data.isDeputy;
if (data.status !== "PENDING") {
isReadOnly.value = true;
@ -315,7 +313,7 @@ onMounted(async () => {
!isReadOnly) ||
(typeEmp === 'employee' &&
isStaff &&
isDeputy &&
workflowRef?.permission.isUpdate &&
topicConvert(dataRequest.topic) !== '' &&
!isReadOnly)
"
@ -554,7 +552,7 @@ onMounted(async () => {
(typeEmp === 'employee' &&
isStaff &&
!isReadOnly &&
isDeputy)
workflowRef?.permission.isUpdate)
"
>
<q-btn label="บันทึก" color="secondary" type="submit"