From 21a4e09672b1177d40c2bb5b937a8780c5eaa7fb Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 08 三月 2025 15:03:34 +0800
Subject: [PATCH] 一些更新
---
src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts | 98 +++++++++++++++++++++++++++++++-----------------
1 files changed, 63 insertions(+), 35 deletions(-)
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 a7656bb..c121589 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BIZ_MES_WO.ts
@@ -49,31 +49,33 @@
switch (fnName) {
case 'ImportExcel':
action = {
- action: 'importModal', //drawer(鎵撳紑宸︿晶鎶藉眽妗�) | go(璺宠浆鍒版柊鐨勯〉闈�) | modal(鎵撳紑妯℃�佺獥鍙�) | importModal(鎵撳紑瀵煎叆妯℃�佺獥鍙�)
+ action: 'importModal', //drawer(鎵撳紑宸︿晶鎶藉眽妗�) | go(璺宠浆鍒版柊鐨勯〉闈�) | modal(鎵撳紑妯℃�佺獥鍙�) | importModal(鎵撳紑瀵煎叆妯℃�佺獥鍙�) | ToPrint(鎵撳嵃鍔熻兘)
params: {
- tmpHeader: ['宸ュ崟鍙�', '璁″垝鏃ユ湡', '璁″垝鏁伴噺'], /* 涓嬭浇妯℃澘鐨勬爣棰樺瓧娈� */
- filename: '宸ュ崟璁″垝妯℃澘.xlsx', /* 涓嬭浇妯℃澘鐨勬枃浠跺悕 */
- entityName: 'BIZ_MES_WO_BATCH', /* 瀵煎叆琛ㄧ殑琛ㄥ悕 */
- checkJson: ['ORDER_NO', 'PLAN_DATE', 'PLAN_QTY'], /* 瀵煎叆琛ㄩ渶瑕佹鏌ョ殑瀛楁鍒楄〃 */
- where: ['ORDER_NO'], /* 瀵煎叆琛ㄩ渶瑕佹煡璇㈢殑瀛楁鍒楄〃 */
- typeFullName:'Tiger.IBusiness.MES.IImportWoPlan,Tiger.IBusiness.MES', /* 瀵煎叆鐨勬柟娉曞叏鍚嶏紝閫氱敤瀵煎叆鐢ㄨ繖涓細Tiger.IBusiness.ICommonImportExcel,Tiger.IBusiness */
- baseColumns: [ /* 瀵煎叆鏃剁晫闈㈡樉绀烘暟鎹殑瀛楁 */
+ tmpHeader: ['宸ュ崟鍙�', '璁″垝鏃ユ湡', '璁″垝鏁伴噺'] /* 涓嬭浇妯℃澘鐨勬爣棰樺瓧娈� */,
+ filename: '宸ュ崟璁″垝妯℃澘.xlsx' /* 涓嬭浇妯℃澘鐨勬枃浠跺悕 */,
+ entityName: 'BIZ_MES_WO_BATCH' /* 瀵煎叆琛ㄧ殑琛ㄥ悕 */,
+ checkJson: ['ORDER_NO', 'PLAN_DATE', 'PLAN_QTY'] /* 瀵煎叆琛ㄩ渶瑕佹鏌ョ殑瀛楁鍒楄〃 */,
+ where: ['ORDER_NO'] /* 瀵煎叆琛ㄩ渶瑕佹煡璇㈢殑瀛楁鍒楄〃 */,
+ typeFullName:
+ 'Tiger.IBusiness.MES.IImportWoPlan,Tiger.IBusiness.MES' /* 瀵煎叆鐨勬柟娉曞叏鍚嶏紝閫氱敤瀵煎叆鐢ㄨ繖涓細Tiger.IBusiness.ICommonImportExcel,Tiger.IBusiness */,
+ baseColumns: [
+ /* 瀵煎叆鏃剁晫闈㈡樉绀烘暟鎹殑瀛楁 */
{
title: '宸ュ崟鍙�',
dataIndex: 'ORDER_NO',
ifShow: true,
width: 180,
},
- {
- title: '宸ュ崟鎵规鍙�',
- dataIndex: 'BATCH_NO',
- ifShow: true,
- width: 180,
- // customRender: ({ record }) => {
- // record.BATCH_NO = record.ORDER_NO+'-01'
- // return record.BATCH_NO
- // },
- },
+ // {
+ // title: '宸ュ崟鎵规鍙�',
+ // dataIndex: 'BATCH_NO',
+ // ifShow: true,
+ // width: 180,
+ // // customRender: ({ record }) => {
+ // // record.BATCH_NO = record.ORDER_NO+'-01'
+ // // return record.BATCH_NO
+ // // },
+ // },
{
title: '璁″垝鏃ユ湡',
dataIndex: 'PLAN_DATE',
@@ -84,22 +86,22 @@
title: '璁″垝鏁伴噺',
dataIndex: 'PLAN_QTY',
ifShow: true,
- width: 180,
+ width: 100,
},
{
title: '澶勭悊鏂瑰紡',
dataIndex: 'VALIDATION_TYPE',
ifShow: true,
- width: 180,
+ width: 100,
customRender: ({ record }) => {
const status = record.VALIDATION_TYPE;
var text = '';
var color = 'green';
- if (status == '鏁版嵁寮傚父') {
+ if (status == '寮傚父') {
color = 'red';
text = status;
- } else if (status == '淇敼') {
- color = 'yellow';
+ } else if (status == '鏇存柊') {
+ color = 'orange';
text = status;
} else {
text = status;
@@ -108,18 +110,34 @@
},
},
{
- title: '澶勭悊缁撴灉',
+ title: '澶勭悊鎻愮ず',
dataIndex: 'VALIDATION_RESULT',
ifShow: true,
- width: 180,
+ width: 280,
+ customRender: ({ record }) => {
+ const status = record.VALIDATION_TYPE;
+ var text = record.VALIDATION_RESULT;
+ var color = 'green';
+ if (status == '寮傚父') {
+ color = 'red';
+ } else if (status == '鏇存柊') {
+ color = 'orange';
+ }
+ return h(Tooltip, { title: text }, () => h(Tag, { color: color }, () => text));
+ },
},
],
},
};
break;
+ case 'ToPrint':
+ action = {
+ action: 'ToPrint', //drawer(鎵撳紑宸︿晶鎶藉眽妗�) | go(璺宠浆鍒版柊鐨勯〉闈�) | modal(鎵撳紑妯℃�佺獥鍙�) | importModal(鎵撳紑瀵煎叆妯℃�佺獥鍙�) | ToPrint(鎵撳嵃鍔熻兘)
+ };
+ break;
default:
action = {
- action: 'drawer', //drawer(鎵撳紑宸︿晶鎶藉眽妗�) | go(璺宠浆鍒版柊鐨勯〉闈�) | modal(鎵撳紑妯℃�佺獥鍙�)
+ action: 'drawer', //drawer(鎵撳紑宸︿晶鎶藉眽妗�) | go(璺宠浆鍒版柊鐨勯〉闈�) | modal(鎵撳紑妯℃�佺獥鍙�) | importModal(鎵撳紑瀵煎叆妯℃�佺獥鍙�) | ToPrint(鎵撳嵃鍔熻兘)
};
break;
}
@@ -143,10 +161,9 @@
x.onClick = handleRelease.bind(null, args, params);
x.tooltip = '涓嬪彂';
}
- // if (x.name == 'handleTemplate') {
- // x.onClick = handleTemplate.bind(null, args, params);
- // x.tooltip = '妯℃澘缁存姢';
- // }
+ if (x.name == 'ToPrint') {
+ x.tooltip = '鎵撳嵃娴佺▼鍗�';
+ }
});
return data;
},
@@ -346,7 +363,7 @@
*/
GetTitle: () => {
return {
- importTitle: '宸ュ崟璁″垝瀵煎叆', /* 鎵撳紑妯℃�佺獥鍙ｆ樉绀虹殑鏍囬 */
+ importTitle: '宸ュ崟璁″垝瀵煎叆' /* 鎵撳紑妯℃�佺獥鍙ｆ樉绀虹殑鏍囬 */,
};
},
};
@@ -458,10 +475,20 @@
ID: params['record'].ID,
CODE: params['record']['ORDER_NO'],
Name: 'BIZ_MES_WO_BATCH',
- firstTabName: '宸ュ崟鎵规',
- secondTabName: '', //'鏍囩杩囩▼鍙橀噺',
- firstTitle: '鎵规',
- secondTitle: '', //'杩囩▼鍙橀噺',
+ Tabs: [
+ {
+ name: '宸ュ崟鎵规',
+ tableTitle: '鎵规',
+ entityName: 'BIZ_MES_WO_BATCH',
+ key: 'batch'
+ },
+ // {
+ // name: '宸ュ崟鎵规2',
+ // tableTitle: '鎵规2',
+ // entityName: 'BIZ_U9_ASN_DTL',
+ // key: 'batch2'
+ // }
+ ],
pageTitle: '宸ュ崟璇︽儏', //璇︽儏椤甸潰鏍囬
contentStr: '杩欓噷鏄伐鍗曟壒娆＄鐞嗛〉闈紝鍙互鏄剧ず宸ュ崟涓嬪彂鐨勬墍鏈夋壒娆¤鎯�',
detailName: `宸ュ崟[${params['record'].ORDER_NO}]鎵规璇︽儏`,
@@ -499,6 +526,7 @@
'BAS_PKG_DTL',
'ItemCode',
] /* 鑷畾涔夋樉绀哄垪琛ㄧ殑琛ㄥ悕锛岃窡涓婇潰澧炲垹鏀圭殑琛ㄥ悕涓�鑷达紝鏈夊涓氨鏀惧垪琛ㄤ腑 */,
+ record: params['record'],
dense: true,
pageTitle: `宸ュ崟宸ヨ壓缁戝畾`,
pageContent: `杩欓噷鏄鐞嗗伐鍗曠殑宸ヨ壓缁戝畾锛屼竴涓伐鍗曞彲浠ョ粦瀹氫竴涓伐鑹鸿矾绾匡紝骞跺彲浠ヤ繚瀛樹负瀹㈡埛涓撶敤鐨勫伐鑹鸿矾绾縛,
--
Gitblit v1.9.3