From 697c405ac874da346e74df40266763370355154d Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 08 三月 2025 15:40:25 +0800
Subject: [PATCH] ASN单
---
src/views/tigerprojects/system/lowcode/detail/detail.vue | 21 ++++++----
src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts | 1
src/views/tigerprojects/system/lowcode/entityts/BIZ_U9_ASN.ts | 30 +++++----------
src/views/tigerprojects/system/lowcode/entityts/BIZ_U9_ASN_DTL.ts | 24 ++++++++----
4 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/detail/detail.vue b/src/views/tigerprojects/system/lowcode/detail/detail.vue
index 07ef8e0..4518d72 100644
--- a/src/views/tigerprojects/system/lowcode/detail/detail.vue
+++ b/src/views/tigerprojects/system/lowcode/detail/detail.vue
@@ -128,7 +128,7 @@
GetUseForm,
GetUseModals,
},
- ActionColumn
+ ActionColumn,
] = isNullOrUnDef(custImport.value['default'])
? EntityCustFunction.value
: custImport.value['default']();
@@ -142,22 +142,27 @@
/* 琛ㄥ崟涓彃妲芥覆鏌撴寜閽墦寮�妯℃�佹useModal鏂规硶 */
const modals = GetUseModals && isFunction(GetUseModals) ? GetUseModals() : { useModalData: {} };
const useModalData = ref(modals['useModalData']);
- const CurrTabInfo = objParams['Tabs'].filter(q=>q.entityName == props.entityName)[0];
+ /* 椤电淇℃伅锛岃〃鏍奸渶瑕佹牴鎹〉绛句俊鎭腑瀵瑰簲鐨勫疄浣撳悕鏉ユ煡璇㈠搴旇〃鐨勬暟鎹� */
+ const CurrTabInfo = objParams['Tabs'].filter((q) => q.entityName == props.entityName)[0];
const [registerTable, { getForm, reload, setProps }] = useTable({
title: `${CurrTabInfo.tableTitle}鍒楄〃`,
- api: getListByPage,
- searchInfo: { TABLE_NAME: CurrTabInfo.entityName, ...objParams['keyFieldValues'] },
- columns: GetBaseColumns(CurrTabInfo.entityName),
+ api: getListByPage, //閫氱敤鏌ヨ鏂规硶
+ searchInfo: {
+ TABLE_NAME: CurrTabInfo.entityName,
+ NeedInclude: CurrTabInfo.NeedInclude,
+ ...objParams['keyFieldValues'],
+ }, //鏌ヨ鏉′欢涓殑TABLE_NAME浼犲叆椤电淇℃伅涓搴旂殑瀹炰綋鍚岰urrTabInfo.entityName
+ columns: GetBaseColumns(CurrTabInfo.entityName), //浼犲叆椤电淇℃伅涓搴旂殑瀹炰綋鍚岰urrTabInfo.entityName鑾峰彇琛ㄦ牸瀛楁淇℃伅
formConfig: {
labelWidth: 140,
- schemas: GetSearchForm(CurrTabInfo.entityName),
+ schemas: GetSearchForm(CurrTabInfo.entityName), //浼犲叆椤电淇℃伅涓搴旂殑瀹炰綋鍚岰urrTabInfo.entityName鑾峰彇鏌ヨ琛ㄥ崟鐨勫瓧娈典俊鎭�
},
useSearchForm: true,
showTableSetting: true,
bordered: true,
canResize: true,
showIndexColumn: false,
- actionColumn: ActionColumn
+ actionColumn: ActionColumn
? ActionColumn
: {
width: 120,
@@ -192,7 +197,7 @@
colSlots,
};
const _actionItem: ActionItem[] = [];
- const actionItem = GenerateActionButton(params, buttons, openDrawer, reload,_actionItem);
+ const actionItem = GenerateActionButton(params, buttons, openDrawer, reload, _actionItem);
if (isNullOrUnDef(custImport.value['default'])) {
return actionItem;
}
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts b/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts
index c121589..6c93244 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts
@@ -480,6 +480,7 @@
name: '宸ュ崟鎵规',
tableTitle: '鎵规',
entityName: 'BIZ_MES_WO_BATCH',
+ NeedInclude: false,
key: 'batch'
},
// {
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BIZ_U9_ASN.ts b/src/views/tigerprojects/system/lowcode/entityts/BIZ_U9_ASN.ts
index 019d370..fe8cd04 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BIZ_U9_ASN.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BIZ_U9_ASN.ts
@@ -7,25 +7,16 @@
* @LastEditTime: 2024-10-23 20:48:14
*/
-import { Ref, h, ref, render, unref } from 'vue';
-import { GetEnum, SaveEntity, convertToTree, getEntity } from '/@/api/tigerapi/system';
+import { unref } from 'vue';
+import { GetEnum, getEntity } from '/@/api/tigerapi/system';
import { useLocale } from '/@/locales/useLocale';
import { useI18n } from '/@/hooks/web/useI18n';
-import { useMessage } from '/@/hooks/web/useMessage';
import { useModal } from '/@/components/Modal';
import { ActionItem, BasicColumn, FormSchema } from '/@/components/Table';
-import { useUserStore } from '/@/store/modules/user';
-import { buildUUID } from '/@/utils/uuid';
-import { SaveWoBatchInput } from '/@/api/tigerapi/model/mesModel';
-import { CustModalParams, FunctionType } from '/@/api/tigerapi/model/systemModel';
-import { SaveMesBatchWo } from '/@/api/tigerapi/mes/wo';
+import { CustModalParams } from '/@/api/tigerapi/model/systemModel';
import { useForm } from '/@/components/Form/index';
-import { cloneDeep } from 'lodash-es';
-import { useProdRouteStore } from '/@/store/modules/prodRoute';
-import { Tag, Tooltip } from 'ant-design-vue';
const { t } = useI18n();
-const { createErrorModal } = useMessage();
const { getLocale } = useLocale();
function _default() {
const ActionColumn: BasicColumn = {
@@ -111,8 +102,8 @@
switch (param.cType) {
case 'BIZ_MES_WO':
case 'BIZ_MES_WO_Config':
- return getWoFns[param.FnName](param) as Promise<any>;
- // break;
+ // return getWoFns[param.FnName](param) as Promise<any>;
+ break;
default:
return new Promise((resolve, reject) => {
try {
@@ -287,14 +278,16 @@
name: '閫佽揣鍗�(U9)',
tableTitle: '鏄庣粏',
entityName: 'BIZ_U9_ASN_DTL',
- key: 'BIZ_U9_ASN_DTL'
+ NeedInclude: true,
+ key: 'BIZ_U9_ASN_DTL',
},
{
name: '閫佽揣鍗昐N',
tableTitle: 'SN',
entityName: 'BIZ_U9_ASN_SN',
- key: 'BIZ_U9_ASN_SN'
- }
+ NeedInclude: true,
+ key: 'BIZ_U9_ASN_SN',
+ },
],
pageTitle: '閫佽揣鍗�(U9)璇︽儏', //璇︽儏椤甸潰鏍囬
contentStr: '杩欓噷鏄�佽揣鍗�(U9)鏄庣粏绠＄悊椤甸潰锛屽彲浠ユ樉绀洪�佽揣鍗�(U9)鐨勬墍鏈夋壒娆¤鎯�',
@@ -309,9 +302,6 @@
sessionStorage.setItem(`${id.SessionName}_params`, encodeURI(JSON.stringify(id)));
go(`/BIZ_U9_ASN_DTL/${encodeURI(JSON.stringify({ sName: id.SessionName, Name: id.Name }))}`);
}
-
-
-
const woformSchema: FormSchema[] = [
{
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BIZ_U9_ASN_DTL.ts b/src/views/tigerprojects/system/lowcode/entityts/BIZ_U9_ASN_DTL.ts
index aca384b..bb83fe6 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BIZ_U9_ASN_DTL.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BIZ_U9_ASN_DTL.ts
@@ -84,14 +84,22 @@
sorter: true,
resizable: true,
},
- // {
- // dataIndex: 'BATCH_NO',
- // title: '宸ュ崟鎵规鍙�',
- // ifShow: true,
- // sorter: true,
- // resizable: true,
- // customRender: () => {},
- // },
+ {
+ dataIndex: 'ITEM_CODE',
+ title: '鐗╂枡缂栫爜',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'ITEM_NAME',
+ title: '鐗╂枡鍚嶇О',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
{
dataIndex: 'STATUS',
title: '鐘舵��',
--
Gitblit v1.9.3