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 | 147 ++++++++++++++++++++++++++++++------------------
1 files changed, 91 insertions(+), 56 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
index 1b8ed42..738d3c6 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
@@ -1,3 +1,5 @@
+/* eslint-disable no-var */
+/* eslint-disable no-fallthrough */
/*
* @Description: 浜у搧宸ヨ壓璺嚎鐩稿叧
* @Author: Ben Lin
@@ -7,13 +9,12 @@
* @LastEditTime: 2024-10-24 01:21:57
*/
-import { Ref, h, ref, render, unref } from 'vue';
+import { Ref, unref } from 'vue';
import {
DeleteProdRoute,
GetRoutePTree,
RouteToCust,
RouteToProd,
- SetDefaultRoute,
} from '/@/api/tigerapi/mes/router';
import { GetEnum, SaveEntity, convertToTree, getEntity } from '/@/api/tigerapi/system';
import { useLocale } from '/@/locales/useLocale';
@@ -92,12 +93,12 @@
* @return {*}
*/
fetchTreeData: async (type: string, itemCode: string) => {
- let data = { title: '', treeData: [] as any[], fieldNames: {} };
- let prodTreeData = (await GetRoutePTree({
+ const data = { title: '', treeData: [] as any[], fieldNames: {} };
+ const prodTreeData = (await GetRoutePTree({
prodCode: itemCode,
orgCode: useUserStore().getUserInfo.orgCode,
})) as unknown as MesRotTree[];
- let _treeData = convertToTree(prodTreeData, 'pid', 'tid', 'root');
+ const _treeData = convertToTree(prodTreeData, 'pid', 'tid', 'root');
data.title = '宸ヨ壓璺嚎';
data.fieldNames = { key: 'tid', title: 'name' };
if (
@@ -111,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;
}
@@ -161,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' },
];
},
/**
@@ -171,14 +173,13 @@
nodeChange: (params: { useForms: Ref<any>; objParams: Ref<any>; selectedNodes: any[] }) =>
new Promise<any>(async (resolve, reject) => {
// params['useForms'].value = methods.GetUseForm();
- let result = { isShow: {} };
+ const result = { isShow: {} };
let sqlcmd = ' 1=1 ';
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'
@@ -248,34 +249,38 @@
}
if (params['selectedNodes'][0].type == 'Node') {
resetFieldsNode();
- setFieldsValueNode({
- 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,
- });
+ 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(res.Data.Items[0], true, 'MES_PROD_OPER');
+
// result['Node'] = res.Data.Items;
result['name'] = 'Node';
result['isShow'] = {
@@ -394,7 +399,7 @@
break;
case 'assyadd':
const items = d.values['val'].split(',');
- let data: any[] = [];
+ const data: any[] = [];
if (!isNullOrEmpty(items) && items.length > 0) {
items.map((x) => {
data.push({
@@ -445,7 +450,7 @@
});
return;
}
- let codes = d.values.id.split(',');
+ const codes = d.values.id.split(',');
var i;
for (i = 0; i < codes.length; i++) {
if (d.which == 'addRoute') {
@@ -463,7 +468,7 @@
});
return;
}
- let rotIds = d.ROT_ID.split(',');
+ const rotIds = d.ROT_ID.split(',');
var i;
for (i = 0; i < rotIds.length; i++) {
RouteToCust({ rotId: rotIds[i], prodCode: args[1]['CODE'], custCode: d.CUST_CODE });
@@ -517,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 },
@@ -626,7 +635,7 @@
* @return {*}
*/
SelectNode: (selectedNodes: Ref<any[]>, code: string) => {
- let result = {
+ const result = {
showConfig: false,
showNav: false,
type: selectedNodes.value[0].type,
@@ -895,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',
},
@@ -1641,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