|
@@ -163,6 +163,7 @@ const organizationId = ref(''); // 所选部门ID
|
|
|
const clientNameStr = ref('');
|
|
const clientNameStr = ref('');
|
|
|
const { proxy } = getCurrentInstance(); //访问this
|
|
const { proxy } = getCurrentInstance(); //访问this
|
|
|
const parentOrganizationAdditionHql = ref('');
|
|
const parentOrganizationAdditionHql = ref('');
|
|
|
|
|
+const parentFieldValue = ref({});
|
|
|
const parentOrganizationFieldValue = ref({
|
|
const parentOrganizationFieldValue = ref({
|
|
|
displayValue: [],
|
|
displayValue: [],
|
|
|
fieldType: 'Key',
|
|
fieldType: 'Key',
|
|
@@ -280,6 +281,7 @@ const editOrganization = (flag, id) => {
|
|
|
fieldType: 'Key',
|
|
fieldType: 'Key',
|
|
|
id: success.data.parentId,
|
|
id: success.data.parentId,
|
|
|
};
|
|
};
|
|
|
|
|
+ parentFieldValue.value = parentOrganizationFieldValue.value;
|
|
|
clientFieldValue.value = {
|
|
clientFieldValue.value = {
|
|
|
displayValue: [success.data.clientName],
|
|
displayValue: [success.data.clientName],
|
|
|
fieldType: 'Key',
|
|
fieldType: 'Key',
|
|
@@ -321,13 +323,8 @@ const updateOrganization = () => {
|
|
|
success => {
|
|
success => {
|
|
|
if (success.errorCode == 0) {
|
|
if (success.errorCode == 0) {
|
|
|
if (success.data) {
|
|
if (success.data) {
|
|
|
- Notify.success(
|
|
|
|
|
- proxy.$t('lang.Notify.success'),
|
|
|
|
|
- proxy.$t('lang.OrganizationEditPanel.describe6'),
|
|
|
|
|
- true,
|
|
|
|
|
- );
|
|
|
|
|
|
|
+ message.success(proxy.$t('lang.OrganizationEditPanel.describe6'));
|
|
|
organization.value = {};
|
|
organization.value = {};
|
|
|
-
|
|
|
|
|
organization.value.clientId = clientFieldValue.value.id;
|
|
organization.value.clientId = clientFieldValue.value.id;
|
|
|
parentOrganizationFieldValue.value = {
|
|
parentOrganizationFieldValue.value = {
|
|
|
displayValue: [],
|
|
displayValue: [],
|
|
@@ -368,11 +365,7 @@ const deleteOrganization = id => {
|
|
|
deleteDepartment(params).then(
|
|
deleteDepartment(params).then(
|
|
|
success => {
|
|
success => {
|
|
|
if (success.errorCode == 0) {
|
|
if (success.errorCode == 0) {
|
|
|
- Notify.success(
|
|
|
|
|
- proxy.$t('lang.Notify.success'),
|
|
|
|
|
- proxy.$t('lang.OrganizationEditPanel.describe3'),
|
|
|
|
|
- true,
|
|
|
|
|
- );
|
|
|
|
|
|
|
+ message.success(proxy.$t('lang.OrganizationEditPanel.describe3'));
|
|
|
organization.value = undefined;
|
|
organization.value = undefined;
|
|
|
getOrganization();
|
|
getOrganization();
|
|
|
} else {
|
|
} else {
|
|
@@ -430,9 +423,9 @@ const parentOrganizationValueChanged = newFieldValue => {
|
|
|
if (organizationId.value == newFieldValue.id) {
|
|
if (organizationId.value == newFieldValue.id) {
|
|
|
message.warning('不能将自己作为上级部门!');
|
|
message.warning('不能将自己作为上级部门!');
|
|
|
parentOrganizationFieldValue.value = {
|
|
parentOrganizationFieldValue.value = {
|
|
|
- displayValue: [],
|
|
|
|
|
|
|
+ displayValue: [parentFieldValue.value.displayValue[0]],
|
|
|
fieldType: 'Key',
|
|
fieldType: 'Key',
|
|
|
- id: null,
|
|
|
|
|
|
|
+ id: parentFieldValue.value.id,
|
|
|
};
|
|
};
|
|
|
} else {
|
|
} else {
|
|
|
parentOrganizationFieldValue.value = newFieldValue;
|
|
parentOrganizationFieldValue.value = newFieldValue;
|