Merge branch 'nice_dev' into develop
This commit is contained in:
commit
3e59d5489b
1 changed files with 18 additions and 3 deletions
|
|
@ -218,6 +218,15 @@ watch(
|
||||||
() => {
|
() => {
|
||||||
if (props.modal === true) {
|
if (props.modal === true) {
|
||||||
if (actionType.value === "ADD") {
|
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) {
|
if (level.value === 0) {
|
||||||
formData.orgLevel = "DEPARTMENT";
|
formData.orgLevel = "DEPARTMENT";
|
||||||
orgLevelOption.value = orgLevelOptionMain.value;
|
orgLevelOption.value = orgLevelOptionMain.value;
|
||||||
|
|
@ -230,15 +239,17 @@ watch(
|
||||||
formData.orgName = props.dataNode.orgTreeName;
|
formData.orgName = props.dataNode.orgTreeName;
|
||||||
formData.orgShortName = props.dataNode.orgTreeShortName;
|
formData.orgShortName = props.dataNode.orgTreeShortName;
|
||||||
formData.orgCode = props.dataNode.orgTreeCode;
|
formData.orgCode = props.dataNode.orgTreeCode;
|
||||||
|
|
||||||
formData.orgPhoneEx = props.dataNode.orgTreePhoneEx;
|
formData.orgPhoneEx = props.dataNode.orgTreePhoneEx;
|
||||||
formData.orgPhoneIn = props.dataNode.orgTreePhoneIn;
|
formData.orgPhoneIn = props.dataNode.orgTreePhoneIn;
|
||||||
formData.orgFax = props.dataNode.orgTreeFax;
|
formData.orgFax = props.dataNode.orgTreeFax;
|
||||||
formData.orgLevel = props.dataNode.orgTreeRank;
|
formData.orgLevel = props.dataNode.orgTreeRank;
|
||||||
|
formData.orgLevelSub = props.dataNode.orgTreeRankSub;
|
||||||
orgLevelOption.value =
|
orgLevelOption.value =
|
||||||
props.dataNode.orgTreeRank === "DEPARTMENT"
|
props.dataNode.orgTreeRank === "DEPARTMENT"
|
||||||
? orgLevelOptionMain.value
|
? orgLevelOptionMain.value
|
||||||
: orgLevelOptionMain.value.slice(1, 4);
|
: orgLevelOptionMain.value.slice(1, 4);
|
||||||
selectOrgLevele(formData.orgLevel);
|
selectOrgLevele(formData.orgLevel, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -256,8 +267,8 @@ const tittleName = computed(() => {
|
||||||
return name;
|
return name;
|
||||||
});
|
});
|
||||||
|
|
||||||
function selectOrgLevele(val: string) {
|
function selectOrgLevele(val: string, status: boolean = true) {
|
||||||
formData.orgLevelSub = "";
|
formData.orgLevelSub = status ? "" : formData.orgLevelSub;
|
||||||
switch (val) {
|
switch (val) {
|
||||||
case "OFFICE":
|
case "OFFICE":
|
||||||
orgLevelSubOptionMain.value = [
|
orgLevelSubOptionMain.value = [
|
||||||
|
|
@ -339,6 +350,10 @@ function selectOrgLevele(val: string) {
|
||||||
</div>
|
</div>
|
||||||
<div class="col-2">
|
<div class="col-2">
|
||||||
<q-input
|
<q-input
|
||||||
|
:readonly="
|
||||||
|
(actionType === 'ADD' && props?.dataNode?.orgLevel !== 0) ||
|
||||||
|
(actionType === 'EDIT' && props?.dataNode?.orgLevel > 1)
|
||||||
|
"
|
||||||
mask="##"
|
mask="##"
|
||||||
v-model="formData.orgCode"
|
v-model="formData.orgCode"
|
||||||
ref="orgCodeRef"
|
ref="orgCodeRef"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue