From ce374a9f4920a2d0e5ebe81a9872436088db6d55 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 07 三月 2025 15:57:34 +0800
Subject: [PATCH] 高级页面主Form日期字段转换格式，否则出错
---
src/views/tigerprojects/system/lowcode/data.ts | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/data.ts b/src/views/tigerprojects/system/lowcode/data.ts
index a5a84be..f5ac450 100644
--- a/src/views/tigerprojects/system/lowcode/data.ts
+++ b/src/views/tigerprojects/system/lowcode/data.ts
@@ -9,19 +9,21 @@
import { ActionItem, FormSchema, PopConfirm } from '/@/components/Table';
import { useI18n } from '/@/hooks/web/useI18n';
-import { isNullOrEmpty, isNullOrUnDef } from '/@/utils/is';
+import { isArray, isNullOrEmpty, isNullOrUnDef, isTimeViaRegExp8601 } from '/@/utils/is';
import { woCustFn, woformSchema } from '/@/views/components/bizMesWo';
import { useModal } from '/@/components/Modal';
import { Ref, unref } from 'vue';
import { getRouteData, getWoRouteData } from '/@/api/tigerapi/mes/router';
import { buildUUID } from '/@/utils/uuid';
import { useUserStore } from '/@/store/modules/user';
-import { formatToDateTime } from '/@/utils/dateUtil';
+import { dateUtil, formatToDateTime } from '/@/utils/dateUtil';
import { DeleteEntity, getEntity } from '/@/api/tigerapi/system';
import { useGo } from '/@/hooks/web/usePage';
import { useQueryStore } from '/@/store/modules/queryInpage';
import { RouteRecordName } from 'vue-router';
import { cloneDeep } from 'lodash-es';
+import dayjs from 'dayjs';
+import { utils } from 'sortablejs';
const { t } = useI18n();
/**
@@ -216,6 +218,7 @@
d.CREATE_USER = useUserStore().getUserInfo.userId as string;
d.UPDATE_TIME = formatToDateTime(new Date());
d.UPDATE_USER = useUserStore().getUserInfo.userId as string;
+ d.AUTH_ORG = useUserStore().getUserInfo.orgCode as string;
let _data2: any[] = cloneDeep(data.value[item]);
_data2.push(d);
data.value[item] = _data2;
@@ -257,8 +260,13 @@
* @param {*} params
* @return {*}
*/
-export function GenerateActionButton(params: any, buttons: Ref<[]>, openDrawer: Fn, reload: Fn) {
- const actionItem = [] as ActionItem[];
+export function GenerateActionButton(
+ params: any,
+ buttons: Ref<[]>,
+ openDrawer: Fn,
+ reload: Fn,
+ actionItem: ActionItem[],
+) {
buttons.value.map((x) => {
if (x['BUTTON_TYPE'] == 1) {
let url = '';
@@ -283,14 +291,16 @@
};
}
}
- actionItem.push({
- icon: isNullOrEmpty(x['ICON_URL']) ? url : x['ICON_URL'],
- tooltip: _tooltip,
- onClick: _click,
- color: color,
- popConfirm: _popConfirm,
- name: x['DO_METHOD'],
- });
+ if (x['DO_METHOD'] != 'ToPrint') {
+ actionItem.push({
+ icon: isNullOrEmpty(x['ICON_URL']) ? url : x['ICON_URL'],
+ tooltip: _tooltip,
+ onClick: _click,
+ color: color,
+ popConfirm: _popConfirm,
+ name: x['DO_METHOD'],
+ });
+ }
}
});
return actionItem;
@@ -330,7 +340,7 @@
export function goByParams(path: string, params: {}, go) {
if (path.split('/').length > 2 && path.split('/')[2] == 'LC') {
getEntity({
- sqlcmd: `ASSEMBLY_NAME ='${path.split('/')[1]}'`,
+ sqlcmd: `CODE_NAME ='${path.split('/')[1]}'`,
entityName: 'SYS_LOW_CODE',
order: '',
}).then((data) => {
@@ -423,6 +433,19 @@
useQuery.getCurSearchInfo.some((q) => q.name == name)
) {
const curSearchInfo = useQuery.getCurSearchInfo.filter((q) => q.name == name);
- f.setFieldsValue(curSearchInfo[0].searchInfo);
+ const params = cloneDeep(curSearchInfo[0].searchInfo);
+ const Keys = Object.getOwnPropertyNames(params);
+ for (const k in Keys) {
+ if (!isNullOrEmpty(params[Keys[k]]?.length) && isArray(params[Keys[k]])) {
+ if (isTimeViaRegExp8601(params[Keys[k]][0])) {
+ params[Keys[k]][0] = dateUtil(params[Keys[k]][0]);
+ params[Keys[k]][1] = dateUtil(params[Keys[k]][1]);
+ }
+ }
+ if (!isNullOrEmpty(params[Keys[k]]) && isTimeViaRegExp8601(params[Keys[k]])) {
+ params[Keys[k]] = dateUtil(params[Keys[k]]);
+ }
+ }
+ f.setFieldsValue(params);
}
}
--
Gitblit v1.9.3