From 6abf4c703ebcdd4f856cb9cfe39bd7f0027dd6ac Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 15 六月 2024 22:49:28 +0800
Subject: [PATCH] 工艺行为更新
---
src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue | 1 +
src/views/tigerprojects/system/lowcode/normal/basDefectGrp.ts | 1 +
src/views/tigerprojects/system/lowcode/detail/basLabelVar.ts | 1 +
src/views/tigerprojects/system/lowcode/normal/basReasonGrp.ts | 1 +
src/views/tigerprojects/system/lowcode/data.ts | 2 ++
src/views/tigerprojects/mes/eng/route/components/PostProps.vue | 1 +
src/views/components/data.ts | 5 +++--
src/views/tigerprojects/mes/prod/biz_mes_wo/WoDrawer.vue | 1 +
src/views/components/bizMesWo.ts | 3 ++-
src/views/components/NormalModal.vue | 5 ++++-
src/views/tigerprojects/mes/eng/route/components/ActionItemProps.vue | 7 ++++---
11 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/views/components/NormalModal.vue b/src/views/components/NormalModal.vue
index ed304a2..83a8732 100644
--- a/src/views/components/NormalModal.vue
+++ b/src/views/components/NormalModal.vue
@@ -26,6 +26,7 @@
import { BasicTable, BasicColumn, TableAction, useTable } from '/@/components/Table';
import { useI18n } from '/@/hooks/web/useI18n';
import { getListByPage } from '/@/api/tigerapi/system';
+import { isNullOrEmpty } from '/@/utils/is';
const { t } = useI18n();
const title = ref('');
@@ -36,6 +37,7 @@
//鍒楄〃
const ItemColumns = ref([] as BasicColumn[]);
+ const searchInfo = ref({});
const emit = defineEmits(['success', 'register']);
const checkedKeys = ref<Array<string | number>>([]);
@@ -43,7 +45,7 @@
const [registerTable, { reload, getForm }] = useTable({
title: '鍒楄〃淇℃伅',
api: getListByPage,
- searchInfo: { TABLE_NAME: tableName },
+ searchInfo: searchInfo,
columns: ItemColumns,
formConfig: {
labelWidth: 120,
@@ -89,6 +91,7 @@
// field2: data.data,
// field1: data.info,
// });
+ searchInfo.value = data?.searchInfo;
title.value = data?.title;
schemas.value = data?.schemas;
ItemColumns.value = data?.ItemColumns;
diff --git a/src/views/components/bizMesWo.ts b/src/views/components/bizMesWo.ts
index 8a50584..180edf1 100644
--- a/src/views/components/bizMesWo.ts
+++ b/src/views/components/bizMesWo.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-05 16:10:24
* @LastEditors: your name
- * @LastEditTime: 2024-06-13 14:46:20
+ * @LastEditTime: 2024-06-15 22:43:55
*/
/* 宸ュ崟鐩稿叧鑷畾涔夋柟娉� */
import { FunctionType } from '/@/api/tigerapi/model/systemModel';
@@ -509,6 +509,7 @@
tableName: 'MES_ROUTE',
rowKey: 'ROT_CODE',
returnFieldName: 'ROUTE_CODE', //杩斿洖鍊艰璧嬪�肩殑瀛楁鍚嶇О
+ searchInfo: {TABLE_NAME: 'MES_ROUTE' }
});
break;
case 'set':
diff --git a/src/views/components/data.ts b/src/views/components/data.ts
index 2213193..0240bc3 100644
--- a/src/views/components/data.ts
+++ b/src/views/components/data.ts
@@ -3,8 +3,8 @@
* @Author: Ben Lin
* @version:
* @Date: 2024-06-05 15:50:59
- * @LastEditors: Ben Lin
- * @LastEditTime: 2024-06-10 23:55:12
+ * @LastEditors: your name
+ * @LastEditTime: 2024-06-15 22:44:19
*/
import {
getWoFns,
@@ -138,6 +138,7 @@
],
tableName: 'BAS_ITEM',
rowKey: 'ITEM_CODE',
+ searchInfo: {TABLE_NAME: 'BAS_ITEM'} //searchInfo: {TABLE_NAME: 'MES_CUSTOM_ACT', ACT_TYPE: routeConfig.currentAct.ACT_TYPE}
});
break;
}
diff --git a/src/views/tigerprojects/mes/eng/route/components/ActionItemProps.vue b/src/views/tigerprojects/mes/eng/route/components/ActionItemProps.vue
index c22111e..b1a56f0 100644
--- a/src/views/tigerprojects/mes/eng/route/components/ActionItemProps.vue
+++ b/src/views/tigerprojects/mes/eng/route/components/ActionItemProps.vue
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-05-01 17:18:49
* @LastEditors: your name
- * @LastEditTime: 2024-06-15 21:24:19
+ * @LastEditTime: 2024-06-15 22:15:02
-->
<!--
* @Description: 琛ㄥ崟椤瑰睘鎬э紝鎺т欢灞炴�ч潰鏉�
@@ -73,11 +73,11 @@
const needSetupOptions = ref<SelectTypes['options']>([
{
value: 'Y',
- label: '蹇呴渶璁剧疆鍙笅鍙�',
+ label: '蹇呴渶璁剧疆',
},
{
value: 'N',
- label: '涓嶈缃彲涓嬪彂',
+ label: '鏃犻渶璁剧疆',
},
]);
const actTypeLable = unref(getLocale) == 'zh_CN' ? 'Desc' : 'Name';
@@ -174,6 +174,7 @@
],
tableName: 'MES_CUSTOM_ACT',
rowKey: 'ACT_CODE',
+ searchInfo: {TABLE_NAME: 'MES_CUSTOM_ACT', ACT_TYPE: routeConfig.currentAct.ACT_TYPE}
});
}
diff --git a/src/views/tigerprojects/mes/eng/route/components/PostProps.vue b/src/views/tigerprojects/mes/eng/route/components/PostProps.vue
index ace0ddc..e35a37e 100644
--- a/src/views/tigerprojects/mes/eng/route/components/PostProps.vue
+++ b/src/views/tigerprojects/mes/eng/route/components/PostProps.vue
@@ -133,6 +133,7 @@
],
tableName: 'MES_POSITION',
rowKey: 'POST_CODE',
+ searchInfo: {TABLE_NAME: 'MES_POSITION'}
});
}
diff --git a/src/views/tigerprojects/mes/prod/biz_mes_wo/WoDrawer.vue b/src/views/tigerprojects/mes/prod/biz_mes_wo/WoDrawer.vue
index b684a87..ccd186f 100644
--- a/src/views/tigerprojects/mes/prod/biz_mes_wo/WoDrawer.vue
+++ b/src/views/tigerprojects/mes/prod/biz_mes_wo/WoDrawer.vue
@@ -112,6 +112,7 @@
],
tableName: 'BAS_ITEM',
rowKey: 'ITEM_CODE',
+ searchInfo: {TABLE_NAME: 'BAS_ITEM'}
});
}
diff --git a/src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue b/src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue
index acd731b..f312b1d 100644
--- a/src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue
+++ b/src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue
@@ -447,6 +447,7 @@
],
tableName: 'BAS_ITEM',
rowKey: 'ITEM_CODE',
+ searchInfo: {TABLE_NAME: 'BAS_ITEM'}
});
}
diff --git a/src/views/tigerprojects/system/lowcode/data.ts b/src/views/tigerprojects/system/lowcode/data.ts
index 29d3ef9..ac40fc1 100644
--- a/src/views/tigerprojects/system/lowcode/data.ts
+++ b/src/views/tigerprojects/system/lowcode/data.ts
@@ -344,6 +344,7 @@
],
tableName: 'BAS_ITEM',
rowKey: 'ITEM_CODE',
+ searchInfo: {TABLE_NAME: 'BAS_ITEM'}
});
break;
}
@@ -418,6 +419,7 @@
],
tableName: 'BAS_ITEM',
rowKey: 'ITEM_CODE',
+ searchInfo: {TABLE_NAME: 'BAS_ITEM'}
});
break;
}
diff --git a/src/views/tigerprojects/system/lowcode/detail/basLabelVar.ts b/src/views/tigerprojects/system/lowcode/detail/basLabelVar.ts
index 7a5d0ad..29b56df 100644
--- a/src/views/tigerprojects/system/lowcode/detail/basLabelVar.ts
+++ b/src/views/tigerprojects/system/lowcode/detail/basLabelVar.ts
@@ -225,6 +225,7 @@
],
tableName: 'BAS_LABEL_PV',
rowKey: 'VAR_CODE',
+ searchInfo: {TABLE_NAME: 'BAS_LABEL_PV'}
});
}
diff --git a/src/views/tigerprojects/system/lowcode/normal/basDefectGrp.ts b/src/views/tigerprojects/system/lowcode/normal/basDefectGrp.ts
index ea50ef5..b22ff4f 100644
--- a/src/views/tigerprojects/system/lowcode/normal/basDefectGrp.ts
+++ b/src/views/tigerprojects/system/lowcode/normal/basDefectGrp.ts
@@ -194,6 +194,7 @@
],
tableName: 'BAS_ITEM',
rowKey: 'ITEM_CODE',
+ searchInfo: {TABLE_NAME: 'BAS_ITEM'}
});
}
diff --git a/src/views/tigerprojects/system/lowcode/normal/basReasonGrp.ts b/src/views/tigerprojects/system/lowcode/normal/basReasonGrp.ts
index f2626dc..f397489 100644
--- a/src/views/tigerprojects/system/lowcode/normal/basReasonGrp.ts
+++ b/src/views/tigerprojects/system/lowcode/normal/basReasonGrp.ts
@@ -152,6 +152,7 @@
],
tableName: 'BAS_REASON_GRP',
rowKey: 'RSNG_CODE',
+ searchInfo: {TABLE_NAME: 'BAS_REASON_GRP'}
});
}
--
Gitblit v1.9.3