Merge branch 'develop' into dev
This commit is contained in:
commit
de4c5a3dda
1 changed files with 2 additions and 4 deletions
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue