From 6a7257f9d8f659c508cf826726126c0fa4363eef Mon Sep 17 00:00:00 2001 From: YangYuGang <1378265336@qq.com> Date: 星期一, 14 四月 2025 17:04:39 +0800 Subject: [PATCH] 盘点单没有数据时一直加载中 --- src/api/tigerapi/system.ts | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletions(-) diff --git a/src/api/tigerapi/system.ts b/src/api/tigerapi/system.ts index 55d337e..be3ba1e 100644 --- a/src/api/tigerapi/system.ts +++ b/src/api/tigerapi/system.ts @@ -29,10 +29,13 @@ EntityList, iSYS_ROLE_PROD, pParams, + ImportEntityValidate, + ImportInput, } from './model/systemModel'; import { defHttp } from '/@/utils/http/axios'; import { isArray, isNullOrEmpty, isTimeViaRegExp8601 } from '/@/utils/is'; import { isNumber } from 'xe-utils'; +import { useUserStore } from '/@/store/modules/user'; export enum Api { QueryUrl = '/Base/Query', @@ -41,6 +44,8 @@ EntityPageList = '/Base/QueryCustomPage', IsAccountExist = '/Base/IsExist', AddAfterDelete = '/Base/AddAfterDelete', + ImportExcel = '/Base/ImportExcel', + BaseValidateTableImport = '/Base/ValidateTableImport', setRoleStatus = '/system/setRoleStatus', MenuList = '/SYS/getMenuListAll', SaveMenu = '/SYS/SaveMenu', @@ -811,6 +816,7 @@ Keys[k] != '0' && Keys[k] != 'apiUrl' && Keys[k] != 'NeedInclude' && + Keys[k] != 'nolike' && !Keys[k].toString().endsWith('PSelect_0') ) { if (!isNullOrEmpty(params[Keys[k]].length) && isArray(params[Keys[k]])) { @@ -822,8 +828,13 @@ } } else if (isNumber(params[Keys[k]])) { sqlcmd += `And ${Keys[k]} = ${params[Keys[k]]}`; + } else if(Keys[k].toString().startsWith('IFEMPTY_')){ + sqlcmd +=params[Keys[k]]=='Y'? `And (${Keys[k].split('IFEMPTY_')[1]} != '' OR ${Keys[k].split('IFEMPTY_')[1]} is not NULL)`: `And (${Keys[k].split('IFEMPTY_')[1]} = '' OR ${Keys[k].split('IFEMPTY_')[1]} is NULL)`; } else { - sqlcmd += `And ${Keys[k]} like '%${params[Keys[k]]}%'`; + sqlcmd += + params['nolike'] == 'Y' + ? `And ${Keys[k]} = '${params[Keys[k]]}'` + : `And ${Keys[k]} like '%${params[Keys[k]]}%'`; } } } @@ -832,6 +843,7 @@ export async function SaveEntity<T>(params: T, isUpdate: boolean, entityName: string, ...args) { let data; + params['AUTH_ORG'] = useUserStore().getUserInfo.orgCode as string; if (isUpdate) { data = await defHttp.post( { url: Api.UpdateEntity, params: genAction(entityName, params) }, @@ -1024,3 +1036,37 @@ isTransformResponse: false, }, ); + + /** + * @desc 瀵煎叆Excel + */ +export async function ImportExcel(entityName: string, items: ImportInput) { + const data = await defHttp.post( + { + url: Api.ImportExcel, + params: genAction(entityName, items), + }, + { + errorMessageMode: 'none', + isTransformResponse: false, + }, + ); + return data; +} + +/** + * @desc 瀵煎叆Excel + */ +export async function ValidateTableImport(entityName: string, items: ImportEntityValidate) { +const data = await defHttp.post( + { + url: Api.BaseValidateTableImport, + params: genAction(entityName, items), + }, + { + errorMessageMode: 'none', + isTransformResponse: false, + }, +); +return data; +} -- Gitblit v1.9.3