From dc63cd71100864be7486b2a4e947017e0880880e Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 17 十二月 2024 22:39:37 +0800
Subject: [PATCH] 一些更新
---
src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts | 127 ++++++++++++++++++++++++++----------------
1 files changed, 78 insertions(+), 49 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
index 4d08d9f..738d3c6 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
@@ -112,6 +112,7 @@
});
}
useProdRoute.setItemCode(itemCode);
+ useProdRoute.setname(itemCode);
if (useProdRoute.curProdRotTree.some((q) => q.name == itemCode)) {
data.treeData = useProdRoute.curProdRotTree.filter((q) => q.name == itemCode)[0].treeInfo;
}
@@ -162,7 +163,7 @@
{ name: 'auditadd', icon: 'search|svg' },
{ name: 'printadd', icon: 'search|svg' },
{ name: 'pkgadd', icon: 'search|svg' },
- { name: 'labeladd', icon: 'search|svg' },
+ { name: 'labeladd', icon: 'template|svg' },
];
},
/**
@@ -177,9 +178,8 @@
if (!isNullOrEmpty(params['objParams'].value['CODE'])) {
sqlcmd += `And PROD_CODE = '${params['objParams'].value['CODE']}'`;
}
- if (!isNullOrEmpty(params['selectedNodes'][0].cust)) {
- sqlcmd += `And CUST_CODE = '${params['selectedNodes'][0].cust}'`;
- }
+ sqlcmd += `And ISNULL(CUST_CODE, '') = ISNULL('${params['selectedNodes'][0].cust}', '')`;
+
if (!isNullOrEmpty(params['selectedNodes'][0].id)) {
sqlcmd +=
params['selectedNodes'][0].type == 'Action'
@@ -249,38 +249,37 @@
}
if (params['selectedNodes'][0].type == 'Node') {
resetFieldsNode();
- const values = {
- ID: res.Data.Items[0].ID,
- OPER_CODE: res.Data.Items[0].OPER_CODE,
- ROT_ID: res.Data.Items[0].ROT_ID,
- NODE_ID: res.Data.Items[0].NODE_ID,
- NODE_NAME: res.Data.Items[0].NODE_NAME,
- IS_ACTIVE: isNullOrEmpty(res.Data.Items[0].IS_ACTIVE)
- ? 'N'
- : res.Data.Items[0].IS_ACTIVE,
- IS_CALC_FPY: isNullOrEmpty(res.Data.Items[0].IS_CALC_FPY)
- ? 'N'
- : res.Data.Items[0].IS_CALC_FPY,
- CAN_SKIP: isNullOrEmpty(res.Data.Items[0].CAN_SKIP)
- ? 'N'
- : res.Data.Items[0].CAN_SKIP,
- IS_INPUT: isNullOrEmpty(res.Data.Items[0].IS_INPUT)
- ? 'N'
- : res.Data.Items[0].IS_INPUT,
- IS_OUTPUT: isNullOrEmpty(res.Data.Items[0].IS_OUTPUT)
- ? 'N'
- : res.Data.Items[0].IS_OUTPUT,
- ALLOW_DFT_IN: isNullOrEmpty(res.Data.Items[0].ALLOW_DFT_IN)
- ? 'N'
- : res.Data.Items[0].ALLOW_DFT_IN,
- REMARK: res.Data.Items[0].REMARK,
- PROD_CODE: params['objParams'].value['CODE'],
- CUST_CODE: params['selectedNodes'][0].cust,
- };
- setFieldsValueNode(values);
-
+ if(isNullOrEmpty(res.Data.Items[0].IS_ACTIVE)){
+ res.Data.Items[0].IS_ACTIVE = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].IS_CALC_FPY)){
+ res.Data.Items[0].IS_CALC_FPY = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].CAN_SKIP)){
+ res.Data.Items[0].CAN_SKIP = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].IS_INPUT)){
+ res.Data.Items[0].IS_INPUT = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].IS_OUTPUT)){
+ res.Data.Items[0].IS_OUTPUT = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].ALLOW_DFT_IN)){
+ res.Data.Items[0].ALLOW_DFT_IN = 'N'
+ }
+ if(isNullOrEmpty(res.Data.Items[0].IF_DFT_OFFLINE)){
+ res.Data.Items[0].IF_DFT_OFFLINE = 'N'
+ }
+ if(!isNullOrEmpty(params['objParams'].value['CODE'])){
+ res.Data.Items[0].PROD_CODE = params['objParams'].value['CODE']
+ }
+ if(!isNullOrEmpty(params['selectedNodes'][0].cust)){
+ res.Data.Items[0].CUST_CODE = params['selectedNodes'][0].cust
+ }
+ setFieldsValueNode(res.Data.Items[0]);
+
/* 榛樿淇濆瓨 */
- SaveEntity(values, true, 'MES_PROD_OPER');
+ SaveEntity(res.Data.Items[0], true, 'MES_PROD_OPER');
// result['Node'] = res.Data.Items;
result['name'] = 'Node';
@@ -523,13 +522,17 @@
* @return {*}
*/
GetUseTables: (data: Ref<{}>, ...args) => {
- // data.value['Table'] = [];
+ let sortData = isNullOrUnDef(data.value['BAS_PKG_DTL'])
+ ? data.value['BAS_PKG_DTL']
+ : data.value['BAS_PKG_DTL'].sort((a, b) => {
+ return a.PKG_LEVEL - b.PKG_LEVEL;
+ });
return {
BAS_PKG_DTL: useTable({
title: '鍒楄〃淇℃伅',
// api: getListByPage,
// searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' },
- dataSource: data.value['BAS_PKG_DTL'],
+ dataSource: sortData,
columns: GetBaseColumns('BAS_PKG_DTL', args[0], data),
// maxHeight: 520,
// scroll: { y: window.screen.width == 1366? 400: 450 },
@@ -901,18 +904,21 @@
label: '鍒犻櫎',
handler: () => {
console.log('鐐瑰嚮浜嗗垹闄�', node);
- DeleteProdRoute({ rotId: node.id, rotCode: node.code, prodCode: args[1] }).then(
- (action) => {
- if (action.IsSuccessed) {
- emit('deletenode', node);
- } else {
- createErrorModal({
- title: t('sys.api.errorTip'),
- content: t(action.LocaleMsg),
- });
- }
- },
- );
+ DeleteProdRoute({
+ rotId: node.id,
+ rotCode: node.code,
+ prodCode: args[1],
+ custCode: node.cust,
+ }).then((action) => {
+ if (action.IsSuccessed) {
+ emit('deletenode', node);
+ } else {
+ createErrorModal({
+ title: t('sys.api.errorTip'),
+ content: t(action.LocaleMsg),
+ });
+ }
+ });
},
icon: 'bx:bxs-folder-open',
},
@@ -1647,6 +1653,29 @@
},
},
{
+ field: 'IF_DFT_OFFLINE',
+ label: '鍒ゆ柇涓嶈壇鍚庢槸鍚︿笅绾�',
+ required: true,
+ defaultValue: 'N',
+ component: 'Select',
+ colProps: { span: 12 },
+ componentProps: {
+ options: [
+ {
+ label: '鏄�',
+ value: 'Y',
+ key: 'Y',
+ },
+ {
+ label: '鍚�',
+ value: 'N',
+ key: 'N',
+ },
+ ],
+ },
+ ifShow: ({ values }) => values.OPER_CODE == 'TestNode',
+ },
+ {
field: 'REMARK',
label: '澶囨敞',
component: 'Input',
--
Gitblit v1.9.3