diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue index 8f3be1378..cad02c873 100644 --- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue @@ -34,6 +34,7 @@ const props = defineProps({ rowId: { type: String, default: "" }, fetchDataTable: Function, getSummary: Function, + shortName: {type: String, required: true} }); const modalAdd = ref(false); @@ -105,7 +106,7 @@ const positionExecutiveFieldRef = ref(null); const positionAreaRef = ref(null); const formData = reactive({ - shortName: "สกจ.", + shortName: props.shortName, prefixNo: "", positionNo: "", suffixNo: "", diff --git a/src/modules/02_organizationalNew/components/TreeMain.vue b/src/modules/02_organizationalNew/components/TreeMain.vue index 6c77f9f81..739201d7a 100644 --- a/src/modules/02_organizationalNew/components/TreeMain.vue +++ b/src/modules/02_organizationalNew/components/TreeMain.vue @@ -34,6 +34,7 @@ const { /** props*/ const nodeTEST = defineModel("nodeTree", { default: [] }); const nodeId = defineModel("nodeId", { required: true }); +const shortName = defineModel("shortName", { required: true }); const props = defineProps({ fetchDataTree: { type: Function, @@ -102,6 +103,8 @@ const orgId = ref(""); * @param data ข่อมูล Tree */ function updateSelected(data: DataTree) { + shortName.value = data.orgTreeShortName; + if (!store.treeId || store.treeId != data.orgTreeId) { store.treeId = data.orgTreeId; store.level = data.orgLevel; diff --git a/src/modules/02_organizationalNew/components/TreeTable.vue b/src/modules/02_organizationalNew/components/TreeTable.vue index f5920b4cf..e38f2f398 100644 --- a/src/modules/02_organizationalNew/components/TreeTable.vue +++ b/src/modules/02_organizationalNew/components/TreeTable.vue @@ -43,6 +43,7 @@ const treeId = defineModel("treeId", { required: true }); const reqMaster = defineModel("reqMaster", { required: true }); const totalPage = defineModel("totalPage", { required: true }); const posMaster = defineModel("posMaster", { required: true }); +// const shortName = defineModel("shortName", { required: true }); const props = defineProps({ filterKeyword: { type: Function, require: true, default: () => {} }, fetchDataTable: { @@ -50,6 +51,7 @@ const props = defineProps({ require: true, default: () => {}, }, + shortName: { type: String, required: true }, fetchDataTree: { type: Function, require: true, @@ -757,6 +759,7 @@ async function onClickDownloadReport(val: string, name: string) { diff --git a/src/modules/02_organizationalNew/components/TreeView.vue b/src/modules/02_organizationalNew/components/TreeView.vue index da5977909..bbe910329 100644 --- a/src/modules/02_organizationalNew/components/TreeView.vue +++ b/src/modules/02_organizationalNew/components/TreeView.vue @@ -50,6 +50,7 @@ const reqMaster = reactive({ const totalPage = ref(1); const action1 = ref(false); const posMaster = ref([]); +const shortName = ref(""); /** * function fetch ข้อมูลของ Tree @@ -225,6 +226,7 @@ watch(