From 6bc434d312094603e1149e0bd8d5bad6701a261b Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 26 Mar 2024 13:05:04 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA?= =?UTF-8?q?=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1=E0=B8=95?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/DialogFormAgency.vue | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/modules/02_organizationalNew/components/DialogFormAgency.vue b/src/modules/02_organizationalNew/components/DialogFormAgency.vue index 86ca5cfc0..13b06dc8d 100644 --- a/src/modules/02_organizationalNew/components/DialogFormAgency.vue +++ b/src/modules/02_organizationalNew/components/DialogFormAgency.vue @@ -218,6 +218,15 @@ watch( () => { if (props.modal === true) { if (actionType.value === "ADD") { + console.log(props.dataNode); + + if (props.dataNode) { + formData.orgCode = + props?.dataNode?.orgLevel !== 0 + ? props?.dataNode.orgTreeCode + : undefined; + } + if (level.value === 0) { formData.orgLevel = "DEPARTMENT"; orgLevelOption.value = orgLevelOptionMain.value; @@ -230,15 +239,17 @@ watch( formData.orgName = props.dataNode.orgTreeName; formData.orgShortName = props.dataNode.orgTreeShortName; formData.orgCode = props.dataNode.orgTreeCode; + formData.orgPhoneEx = props.dataNode.orgTreePhoneEx; formData.orgPhoneIn = props.dataNode.orgTreePhoneIn; formData.orgFax = props.dataNode.orgTreeFax; formData.orgLevel = props.dataNode.orgTreeRank; + formData.orgLevelSub = props.dataNode.orgTreeRankSub; orgLevelOption.value = props.dataNode.orgTreeRank === "DEPARTMENT" ? orgLevelOptionMain.value : orgLevelOptionMain.value.slice(1, 4); - selectOrgLevele(formData.orgLevel); + selectOrgLevele(formData.orgLevel, false); } } } @@ -256,8 +267,8 @@ const tittleName = computed(() => { return name; }); -function selectOrgLevele(val: string) { - formData.orgLevelSub = ""; +function selectOrgLevele(val: string, status: boolean = true) { + formData.orgLevelSub = status ? "" : formData.orgLevelSub; switch (val) { case "OFFICE": orgLevelSubOptionMain.value = [ @@ -339,6 +350,10 @@ function selectOrgLevele(val: string) {