From 2abb91c893f2eed3761bd09aabe12400460d2863 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 21 六月 2024 00:16:35 +0800
Subject: [PATCH] 产品工艺路线更新
---
src/api/tigerapi/system.ts | 117 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 86 insertions(+), 31 deletions(-)
diff --git a/src/api/tigerapi/system.ts b/src/api/tigerapi/system.ts
index c5651ec..ae1367b 100644
--- a/src/api/tigerapi/system.ts
+++ b/src/api/tigerapi/system.ts
@@ -31,8 +31,7 @@
iSYS_ROLE_PROD,
} from './model/systemModel';
import { defHttp } from '/@/utils/http/axios';
-import { isNullOrEmpty, isTimeType } from '/@/utils/is';
-import { MES_ROUTE_EDGE, MES_ROUTE_NODE } from './model/router';
+import { isArray, isDate, isNullOrEmpty, isTimeType, isTimeViaRegExp8601, isTimeViaRegExpSimple } from '/@/utils/is';
export enum Api {
QueryUrl = '/Base/Query',
@@ -274,6 +273,32 @@
temp = convertToTreeData(data, parentId, id, data[i][id]);
if (temp.length > 0) {
obj.children = temp;
+ }
+ result.push(obj);
+ }
+ }
+ return result;
+}
+
+/**
+ * @description: 鏍戝舰琛ㄧ粨鏋勮浆鏍戝舰Json
+ * @param {T} data
+ * @param {string} parentId
+ * @param {string} id
+ * @param {string} pid
+ * @return {*}
+ */
+export function convertToTree<T>(data: T[], parentId: string, id: string, pid?: string) {
+ const result: T[] = [];
+ let temp: T[] = [];
+ const _pid = isNullOrEmpty(pid) ? '' : pid;
+ for (let i = 0; i < data.length; i++) {
+ const currPid = data[i][parentId] == null ? '' : data[i][parentId];
+ if (currPid === _pid) {
+ const obj = data[i] as {};
+ temp = convertToTree(data, parentId, id, data[i][id]);
+ if (temp.length > 0) {
+ obj['children'] = temp;
}
result.push(obj);
}
@@ -673,7 +698,11 @@
);
};
-/* 閫氱敤鏌ヨ鍒嗛〉 */
+/**
+ * @description: 閫氱敤鏌ヨ鍒嗛〉
+ * @param {T} params
+ * @return {*}
+ */
export async function getListByPage<T>(params: T) {
const Keys = Object.getOwnPropertyNames(params);
let sqlcmd = '1=1 ';
@@ -687,9 +716,10 @@
Keys[k] != 'TABLE_NAME' &&
Keys[k] != 'order' &&
Keys[k] != 'field' &&
- Keys[k] != '0'
+ Keys[k] != '0' &&
+ !Keys[k].toString().endsWith('PSelect_0')
) {
- if (!isNullOrEmpty(params[Keys[k]].length) && isTimeType(params[Keys[k]][0])) {
+ if (!isNullOrEmpty(params[Keys[k]].length) && isTimeViaRegExp8601(params[Keys[k]][0])) {
sqlcmd += ` And ${Keys[k]} > '${params[Keys[k]][0]}'`;
sqlcmd += ` And ${Keys[k]} < '${params[Keys[k]][1]}'`;
} else {
@@ -715,7 +745,7 @@
}
async function getListByPageAsync(params: any) {
const data = await defHttp.post(
- { url: Api.QueryUrl, params },
+ { url: Api.QueryUrl, params,timeout:30000 },
{
isTransformResponse: false,
},
@@ -727,7 +757,7 @@
return model;
}
-export async function SaveEntity<T>(params: T, isUpdate: boolean, entityName: string) {
+export async function SaveEntity<T>(params: T, isUpdate: boolean, entityName: string, ...args) {
let data;
if (isUpdate) {
data = await defHttp.post(
@@ -738,6 +768,12 @@
},
);
} else {
+ var check = await isExist(genAction(entityName, args[0]));
+ if(check.Data){
+ check.IsSuccessed = false;
+ check.Message = '璁板綍宸茬粡瀛樺湪锛屼笉鑳芥柊澧烇紒';
+ return check;
+ }
params.ID = buildUUID(); //鐢熸垚GUID
data = await defHttp.post(
{ url: Api.AddEntity, params: genAction(entityName, params) },
@@ -747,6 +783,17 @@
},
);
}
+ return data;
+}
+
+export async function AddListEntity<T>(params: T, entityName: string) {
+ let data = await defHttp.post(
+ { url: Api.AddListEntity, params: genAction(entityName, params) },
+ {
+ errorMessageMode: 'none',
+ isTransformResponse: false,
+ },
+ );
return data;
}
@@ -761,7 +808,28 @@
);
}
-//鑾峰彇鏈嶅姟鍣↗son鏂囦欢杩斿洖Json鏁版嵁
+/**
+ * @description: 鏍规嵁鏉′欢鍒犻櫎
+ * @param {string} sqlcmd
+ * @param {string} entityName
+ * @return {*}
+ */
+export const DeleteWhere = async (sqlcmd: string, entityName: string) => {
+ const usParams = genAction(entityName, sqlcmd);
+ return await defHttp.post(
+ { url: Api.DeleteWhere, params: usParams },
+ {
+ errorMessageMode: 'none',
+ isTransformResponse: false,
+ },
+ );
+};
+
+/**
+ * @description: 鑾峰彇鏈嶅姟鍣↗son鏂囦欢杩斿洖Json鏁版嵁
+ * @param {string} url
+ * @return {*}
+ */
export async function fetchJson(url: string) {
try {
const response = await fetch(url);
@@ -831,30 +899,17 @@
);
};
-/*
- * 杞崲宸ヨ壓璺嚎涓烘爲褰son
+/**
+ * @description: 鍒ゆ柇淇濆瓨鐨勫�煎鏋滄槸[]鏁扮粍鐨勶紝灏辩洿鎺ュ彇[0]绗竴涓�硷紝涓�鑸拡瀵逛笂浼犳ā鏉跨殑鍦板潃
+ * @param {any} values
+ * @return {*}
*/
-function convertRouteToTreeData(
- nodes: MES_ROUTE_NODE[],
- edges: MES_ROUTE_EDGE[],
- parentId: string,
- id: string,
- pid?: string,
-) {
- const result: treeParamsListItem[] = [];
- let temp: treeParamsListItem[] = [];
- const _pid = pid == undefined ? '' : pid;
- for (let i = 0; i < nodes.length; i++) {
- const currPid = data[i][parentId] == null ? '' : data[i][parentId];
- if (currPid === _pid) {
- const obj: treeParamsListItem = data[i];
- obj.PARAM_TYPE = _pid == '' ? '0' : '1'; //澧炲姞绫诲瀷
- temp = convertToTreeData(data, parentId, id, data[i][id]);
- if (temp.length > 0) {
- obj.children = temp;
- }
- result.push(obj);
+export function formatValues(values: any) {
+ const Keys = Object.getOwnPropertyNames(values);
+ for (const k in Keys) {
+ if (isArray(values[Keys[k]])) {
+ values[Keys[k]] = values[Keys[k]][0];
}
}
- return result;
+ return values;
}
--
Gitblit v1.9.3