From 5a813f3b28f3cbf1db3a3657ccf83267c6e0d315 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 24 十月 2024 11:22:02 +0800
Subject: [PATCH] 工艺路线相关优化
---
src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts | 61 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
index 8b9522a..1b8ed42 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-10-16 00:10:37
+ * @LastEditTime: 2024-10-24 01:21:57
*/
import { Ref, h, ref, render, unref } from 'vue';
@@ -33,6 +33,7 @@
import { buildUUID } from '/@/utils/uuid';
import { AddOrEditLabelVarByWorkOrder } from '/@/api/tigerapi/mes/wo';
import { useProdRouteStore } from '/@/store/modules/prodRoute';
+import { useWebSocketStore } from '/@/store/modules/websocket';
const { t } = useI18n();
const { createErrorModal } = useMessage();
@@ -99,10 +100,20 @@
let _treeData = convertToTree(prodTreeData, 'pid', 'tid', 'root');
data.title = '宸ヨ壓璺嚎';
data.fieldNames = { key: 'tid', title: 'name' };
- /* 淇濆瓨宸ヨ壓鏍戝舰鏁版嵁鍒扮姸鎬佺鐞� */
- useProdRoute.setCurProdRotTree(_treeData as unknown as MesRotTree[]);
+ if (
+ !useProdRoute.changeToCPPage ||
+ !useProdRoute.curProdRotTree.some((q) => q.name == itemCode)
+ ) {
+ /* 淇濆瓨宸ヨ壓鏍戝舰鏁版嵁鍒扮姸鎬佺鐞� */
+ useProdRoute.setCurProdRotTree({
+ name: itemCode,
+ treeInfo: _treeData as unknown as MesRotTree[],
+ });
+ }
useProdRoute.setItemCode(itemCode);
- data.treeData = useProdRoute.getCurProdRotTree;
+ if (useProdRoute.curProdRotTree.some((q) => q.name == itemCode)) {
+ data.treeData = useProdRoute.curProdRotTree.filter((q) => q.name == itemCode)[0].treeInfo;
+ }
return data;
},
/**
@@ -223,9 +234,7 @@
? ents.Data.Items
: JSON.parse(res.Data.Items[0].OPTION_1);
/* 濡傛灉OPTION_1瀛楁涓虹┖灏辨妸鍖呰淇℃伅杞琂SON瀛樺埌OPTION_1瀛楁 */
- res.Data.Items[0].OPTION_1 = isNullOrEmpty(res.Data.Items[0].OPTION_1)
- ? JSON.stringify(ents.Data.Items)
- : res.Data.Items[0].OPTION_1;
+ res.Data.Items[0].OPTION_1 = JSON.stringify(result['BAS_PKG_DTL']);
} /* 濡傛灉鏄粍瑁呬笂鏂� */
if (res.Data.Items[0].ACT_TYPE == 2) {
result['name'] = 'ItemCode';
@@ -274,6 +283,7 @@
ItemCode: false,
};
}
+ useProdRoute.setcurDtl(result);
resolve(result);
} catch (e) {
reject(e);
@@ -296,6 +306,9 @@
}
values.AUTH_ORG = useUserStore().getUserInfo.orgCode;
values.AUTH_PROD = useUserStore().getUserInfo.prodCode;
+ if (type == 'Action') {
+ values.OPTION_1 = JSON.stringify(useProdRoute.getcurDtl['BAS_PKG_DTL']);
+ }
SaveEntity(values, true, entityName).then((action) => {
if (action.IsSuccessed) {
emit('success');
@@ -512,11 +525,13 @@
// searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' },
dataSource: data.value['BAS_PKG_DTL'],
columns: GetBaseColumns('BAS_PKG_DTL', args[0], data),
- maxHeight: 520,
+ // maxHeight: 520,
+ // scroll: { y: window.screen.width == 1366? 400: 450 },
+ isCanResizeParent: true,
useSearchForm: false,
showTableSetting: false,
bordered: true,
- canResize: true,
+ // canResize: false,
showIndexColumn: false,
// rowSelection: {
// type: 'radio', //'checkbox'
@@ -610,9 +625,7 @@
* @param {Ref} selectedNodes
* @return {*}
*/
- SelectNode: (selectedNodes: Ref<any[]>) => {
- /* 淇濆瓨褰撳墠閫夋嫨鐨勮妭鐐规暟鎹埌鐘舵�佺鐞� */
- useProdRoute.setCurSelectedNodes(selectedNodes.value);
+ SelectNode: (selectedNodes: Ref<any[]>, code: string) => {
let result = {
showConfig: false,
showNav: false,
@@ -633,6 +646,8 @@
result.showConfig = true;
result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: false };
}
+ /* 淇濆瓨褰撳墠閫夋嫨鐨勮妭鐐规暟鎹埌鐘舵�佺鐞� */
+ useProdRoute.setCurSelectedNodes({ name: code, SelectedNodes: selectedNodes.value });
return result;
},
/**
@@ -837,7 +852,7 @@
resolve('OK');
break;
case 'BAS_LABEL_VAR_WO':
- param.values['WORK_ORDER'] = param.others['WORK_ORDER'];
+ param.values['PROD_CODE'] = param.others['PROD_CODE'];
param.values['ID'] = buildUUID();
var action = await AddOrEditLabelVarByWorkOrder(
param.values as unknown as BAS_LABEL_VAR_WO,
@@ -847,6 +862,14 @@
/* 璁剧疆榛樿宸ヨ壓璺嚎 */
var action = await useProdRoute.setDefaulRoute(param);
resolve(action);
+ case 'delete':
+ const webSocketStore = useWebSocketStore();
+ if (webSocketStore.GetSocketState == 1) {
+ webSocketStore.sendMessage(
+ `wsGetNew ${param.values['LABEL_ID']}_#_${param.values['PROD_CODE']}`,
+ );
+ }
+ break;
}
} catch (e) {
reject(e);
@@ -1830,8 +1853,14 @@
title: '宸ュ崟鍙�',
dataIndex: 'WORK_ORDER',
width: 280,
- editRow: true,
+ // editRow: true,
// editable: true,
+ ifShow: false,
+ },
+ {
+ title: '宸ュ崟鍙�',
+ dataIndex: 'PROD_CODE',
+ width: 280,
ifShow: false,
},
{
@@ -1847,8 +1876,8 @@
{
title: '榛樿鍊�',
dataIndex: 'DEFAULT_VALUE',
- editRow: true,
- editRule: true,
+ // editRow: true,
+ // editRule: true,
},
] as BasicColumn[];
--
Gitblit v1.9.3