From 6a7257f9d8f659c508cf826726126c0fa4363eef Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期一, 14 四月 2025 17:04:39 +0800
Subject: [PATCH] 盘点单没有数据时一直加载中
---
src/views/tigerprojects/system/lowcode/data.ts | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/data.ts b/src/views/tigerprojects/system/lowcode/data.ts
index 217aaf5..f5ac450 100644
--- a/src/views/tigerprojects/system/lowcode/data.ts
+++ b/src/views/tigerprojects/system/lowcode/data.ts
@@ -218,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;
@@ -259,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 = '';
@@ -285,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;
@@ -332,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) => {
@@ -430,10 +438,13 @@
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])
+ 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