Merge branch 'develop' into nice_dev

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-01-29 13:14:35 +07:00
commit 46bee070f7
4 changed files with 303 additions and 6 deletions

View file

@ -12,7 +12,8 @@ import StructureView from "@/modules/02_organizationalNew/components/structureVi
import DialogFormNewStructure from "@/modules/02_organizationalNew/components/DialogNewStructure.vue";
import DialogDateTime from "@/modules/02_organizationalNew/components/DialogFormDateTime.vue";
import DialogHistory from "@/modules/02_organizationalNew/components/DialogHistory.vue";
import DialogStructureDetail from "@/modules/02_organizationalNew/components/StructureDetail.vue";
import DialogPositionDetail from "@/modules/02_organizationalNew/components/PositionDetail.vue";
/** importStore*/
import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
import { useCounterMixin } from "@/stores/mixin";
@ -20,6 +21,10 @@ import { useCounterMixin } from "@/stores/mixin";
const $q = useQuasar();
const { showLoader, hideLoader, messageError } = useCounterMixin();
const modalNewStructure = ref<boolean>(false);
const modalStructureDetail = ref<boolean>(false);
const modalPositionDetail = ref<boolean>(false);
const stroe = useOrganizational();
const isStatusData = ref<boolean>(false);
@ -76,7 +81,6 @@ async function fetchOrganizationActive() {
});
}
const modalNewStructure = ref<boolean>(false);
const typeStructure = ref<string>("");
function ocClickAddStructure(type: string) {
modalNewStructure.value = !modalNewStructure.value;
@ -236,6 +240,16 @@ onMounted(async () => {
<!-- ประวโครงสราง -->
<DialogHistory :modal="modalHistory" :close="onClickHistory" />
<!-- รายละเอยดโครงสราง -->
<DialogStructureDetail
v-model:structure-detail="modalStructureDetail"
/>
<!-- รายละเอยดตำแหน -->
<DialogPositionDetail
v-model:position-detail="modalPositionDetail"
/>
</template>
<style scoped></style>