diff --git a/src/components/Workflow/DialogApprove.vue b/src/components/Workflow/DialogApprove.vue new file mode 100644 index 0000000..f075cc4 --- /dev/null +++ b/src/components/Workflow/DialogApprove.vue @@ -0,0 +1,113 @@ + + + diff --git a/src/components/DialogWorkflow.vue b/src/components/Workflow/DialogSelectPerson.vue similarity index 72% rename from src/components/DialogWorkflow.vue rename to src/components/Workflow/DialogSelectPerson.vue index 28cbca1..d392c62 100644 --- a/src/components/DialogWorkflow.vue +++ b/src/components/Workflow/DialogSelectPerson.vue @@ -12,11 +12,9 @@ const $q = useQuasar(); const { dialogConfirm } = useCounterMixin(); const modal = defineModel("modal", { required: true }); -const operator = defineModel("operator", { - default: "officer", -}); /** table*/ +const selected = ref([]); const rows = ref([ { fullName: "นายศรัณย์ ศิลาดี", @@ -25,7 +23,6 @@ const rows = ref([ organization: "", }, ]); -const selected = ref([]); const columns = ref([ { name: "fullName", @@ -65,25 +62,16 @@ const columns = ref([ }, ]); +const isAcknowledge = ref(false); +const isConsider = ref(false); +const isComment = ref(false); + function fetchLists() {} function onSubmit() { dialogConfirm($q, () => {}); } -function convertLabelBtn(name: string) { - switch (name) { - case "officer": - return "การเจ้าหน้าที่"; - case "personnelOfficer": - return "สำนักงานการเจ้าหน้าที่"; - case "commander": - return "ผู้บังคับบัญชา"; - case "authority": - return "ผู้มีอำนาจ"; - } -} - function onCloseModal() { modal.value = false; selected.value = []; @@ -115,7 +103,6 @@ watch(modal, (val) => { :paging="true" dense :rows-per-page-options="[10, 25, 50, 100]" - class="tableTb" selection="single" v-model:selected="selected" > @@ -152,19 +139,51 @@ watch(modal, (val) => { - + +
+
+ +
+
+ +
+
+ +
+
+ - {{ convertLabelBtn(operator) }} diff --git a/src/components/Workflow/Main.vue b/src/components/Workflow/Main.vue new file mode 100644 index 0000000..3451940 --- /dev/null +++ b/src/components/Workflow/Main.vue @@ -0,0 +1,172 @@ + + + diff --git a/src/modules/02_transfer/views/AddTransfer.vue b/src/modules/02_transfer/views/AddTransfer.vue index 55f63d8..134edd8 100644 --- a/src/modules/02_transfer/views/AddTransfer.vue +++ b/src/modules/02_transfer/views/AddTransfer.vue @@ -9,13 +9,15 @@ import { useCounterMixin } from "@/stores/mixin"; import type { QForm } from "quasar"; +import Workflow from "@/components/Workflow/Main.vue"; + const $q = useQuasar(); const route = useRoute(); const router = useRouter(); const mixin = useCounterMixin(); const { success, messageError, showLoader, hideLoader, dialogConfirm } = mixin; -const id = ref(""); //id path +const id = ref(route.params.id.toString()); //id path const files = ref(); //ไฟล์ const tranferOrg = ref(""); //ชื่อหน่วยงานที่ขอโอนไป const noteReason = ref(""); //เหตุผล @@ -89,7 +91,6 @@ function fileOpen(url: string) { */ onMounted(() => { if (route.params.id !== undefined) { - id.value = route.params.id.toString(); fecthDataTransfer(id.value); } }); @@ -119,9 +120,9 @@ onMounted(() => { @validation-success="saveData" > -
-
-
+ +
+
+ +
{
+
{
+ + +
+ +
-
+
+ - - - + +