From 783acaeb90ded79cc3fc8163d5d9821cf5ea333b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 13 八月 2025 13:34:38 +0800
Subject: [PATCH] fix: s
---
src/views/EnterpriseManage/components/AddOrEditEnterpriseView.vue | 6 +++---
src/constants/task.ts | 2 +-
src/utils/common/common.ts | 31 +++++++++++++++++++++++++++++++
3 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/constants/task.ts b/src/constants/task.ts
index d719abd..c5bad05 100644
--- a/src/constants/task.ts
+++ b/src/constants/task.ts
@@ -50,6 +50,6 @@
};
export const EnumTaskCheckReceiveStatusText = {
- [EnumTaskCheckReceiveStatus.Wait]: '寰呴獙鏀�',
+ [EnumTaskCheckReceiveStatus.WaitSubmit]: '寰呴獙鏀�',
[EnumTaskCheckReceiveStatus.Completed]: '宸查獙鏀�',
};
diff --git a/src/utils/common/common.ts b/src/utils/common/common.ts
index 374c3a8..2a52bc0 100644
--- a/src/utils/common/common.ts
+++ b/src/utils/common/common.ts
@@ -115,3 +115,34 @@
}
return roleName;
}
+
+/**
+ * 鍓旈櫎瀵硅薄涓�间负 ''銆乽ndefined銆乶ull 鐨勯敭锛屾敮鎸佸祵濂楀璞�
+ * @param {Object} obj - 闇�瑕佸鐞嗙殑瀵硅薄
+ * @returns {Object} 澶勭悊鍚庣殑鏂板璞�
+ */
+export function removeEmptyKeys<T extends object>(obj: T) {
+ // 濡傛灉涓嶆槸瀵硅薄鎴栦负null锛岀洿鎺ヨ繑鍥炲師鍊�
+ if (obj === null || typeof obj !== 'object') {
+ return obj;
+ }
+
+ // 澶勭悊鏁扮粍锛堥�掑綊澶勭悊姣忎釜鍏冪礌锛�
+ if (Array.isArray(obj)) {
+ return obj.map((item) => removeEmptyKeys(item));
+ }
+
+ // 澶勭悊瀵硅薄
+ const result = {} as T;
+ for (const key in obj) {
+ if (obj.hasOwnProperty(key)) {
+ //@ts-ignore
+ const value = removeEmptyKeys(obj[key]); // 閫掑綊澶勭悊宓屽瀵硅薄
+ // 鍙繚鐣欓潪绌哄�硷紙鎺掗櫎''銆乽ndefined銆乶ull锛�
+ if (value !== '' && value !== undefined && value !== null) {
+ result[key] = value;
+ }
+ }
+ }
+ return result;
+}
diff --git a/src/views/EnterpriseManage/components/AddOrEditEnterpriseView.vue b/src/views/EnterpriseManage/components/AddOrEditEnterpriseView.vue
index 4002140..b5d4e92 100644
--- a/src/views/EnterpriseManage/components/AddOrEditEnterpriseView.vue
+++ b/src/views/EnterpriseManage/components/AddOrEditEnterpriseView.vue
@@ -203,7 +203,7 @@
import * as enterpriseServices from '@/services/api/enterprise';
import { useRouteView, useGlobalEventContext, GlobalEvent } from '@/hooks';
import _ from 'lodash';
-import { validateFormList, filterCN } from '@/utils';
+import { validateFormList, filterCN, removeEmptyKeys } from '@/utils';
import { Message, BoleRegExp } from '@bole-core/core';
import { useQuery } from '@tanstack/vue-query';
import { AreaType } from '@/constants';
@@ -248,7 +248,7 @@
password: '',
});
-onMounted(async () => {});
+console.log('form: ', form);
const { isLoading } = useQuery({
queryKey: ['enterpriseServices/getEnterprise', id],
@@ -314,7 +314,7 @@
if (isEdit.value) {
params.id = id;
}
- let res = await enterpriseServices.saveEnterprise(params);
+ let res = await enterpriseServices.saveEnterprise(removeEmptyKeys(params));
if (res) {
Message.successMessage(isEdit ? '缂栬緫鎴愬姛' : '鍙戝竷鎴愬姛');
eventContext.emit(isEdit ? 'enterprise:edit' : 'enterprise:add');
--
Gitblit v1.9.1