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 | 156 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 106 insertions(+), 50 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
index 864da48..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-09-25 15:08:58
+ * @LastEditTime: 2024-10-24 01:21:57
*/
import { Ref, h, ref, render, unref } from 'vue';
@@ -13,6 +13,7 @@
GetRoutePTree,
RouteToCust,
RouteToProd,
+ SetDefaultRoute,
} from '/@/api/tigerapi/mes/router';
import { GetEnum, SaveEntity, convertToTree, getEntity } from '/@/api/tigerapi/system';
import { useLocale } from '/@/locales/useLocale';
@@ -28,10 +29,16 @@
import { ContextMenuItem } from '/@/components/TigerTree';
import { useForm } from '/@/components/Form';
import { mesApi } from '/@/api/tigerapi/mes/mesApi';
+import { BAS_LABEL_VAR_WO, MesRotTree } from '/@/api/tigerapi/model/mesModel';
+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();
const { getLocale } = useLocale();
+const useProdRoute = useProdRouteStore();
function _default() {
/* 瀹氫箟鍙橀噺 */
const isNormal = (type: number) => type === 0;
@@ -76,8 +83,8 @@
* @description: 楂樼骇琛ㄥ崟鍜岃鎯呴〉闈㈣繑鍥炰富椤甸潰鐨剈rl
* @return {*}
*/
- GetHomeUrl: () => {
- return `/V_BAS_PROD_R/LC/${encodeURI(JSON.stringify({ ID: 'V_BAS_PROD_R', colSlots: [], crudColSlots: [] }))}`;
+ GetHomeUrl: (params) => {
+ return `/V_BAS_PROD_R/LC/${encodeURI(JSON.stringify({ ID: 'V_BAS_PROD_R', colSlots: [], crudColSlots: [], sName: params['sName'] }))}`;
},
/**
* @description: 鑾峰彇鏍戝舰鏁版嵁
@@ -86,19 +93,27 @@
*/
fetchTreeData: async (type: string, itemCode: string) => {
let data = { title: '', treeData: [] as any[], fieldNames: {} };
- let prodTreeData = await GetRoutePTree({
+ let prodTreeData = (await GetRoutePTree({
prodCode: itemCode,
orgCode: useUserStore().getUserInfo.orgCode,
- });
- // let uniqueArr = prodTreeData.reduce((acc, current) => {
- // if (!acc.some((x) => x.pid == current.pid && x.id == current.id && x.seq == current.seq && x.type == current.type)) {
- // acc.push(current);
- // }
- // return acc;
- // }, [] as V_MES_ROUTE_PTREE[]);
- data.treeData = convertToTree(prodTreeData, 'pid', 'tid', 'root');
+ })) as unknown as MesRotTree[];
+ let _treeData = convertToTree(prodTreeData, 'pid', 'tid', 'root');
data.title = '宸ヨ壓璺嚎';
data.fieldNames = { key: 'tid', title: 'name' };
+ if (
+ !useProdRoute.changeToCPPage ||
+ !useProdRoute.curProdRotTree.some((q) => q.name == itemCode)
+ ) {
+ /* 淇濆瓨宸ヨ壓鏍戝舰鏁版嵁鍒扮姸鎬佺鐞� */
+ useProdRoute.setCurProdRotTree({
+ name: itemCode,
+ treeInfo: _treeData as unknown as MesRotTree[],
+ });
+ }
+ useProdRoute.setItemCode(itemCode);
+ if (useProdRoute.curProdRotTree.some((q) => q.name == itemCode)) {
+ data.treeData = useProdRoute.curProdRotTree.filter((q) => q.name == itemCode)[0].treeInfo;
+ }
return data;
},
/**
@@ -219,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';
@@ -270,6 +283,7 @@
ItemCode: false,
};
}
+ useProdRoute.setcurDtl(result);
resolve(result);
} catch (e) {
reject(e);
@@ -292,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');
@@ -302,6 +319,7 @@
/**
* @description: 寮瑰嚭閫夋嫨妗嗘墦寮�鏂规硶
* @param {Fn} openItemModal
+ * @param {array} args
* @return {*}
*/
OpenSelectItem: (openItemModal: Fn, ...args) => {
@@ -360,6 +378,7 @@
* @description: 寮瑰嚭閫夋嫨妗嗛�夋嫨鎴愬姛杩斿洖
* @param {*} d
* @param {*} u
+ * @param {array} args
* @return {*}
*/
GetSelectSuccess: async (d, u, ...args) => {
@@ -474,7 +493,7 @@
};
},
/**
- * @description: 鑾峰彇妯℃�佹搴旂敤鍒楄〃
+ * @description: 鑾峰彇鍦ㄥ鍒犳敼琛ㄥ崟涓殑妯℃�佹搴旂敤鍒楄〃
* @return {*}
*/
GetUseCrudModals: () => {
@@ -506,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'
@@ -548,6 +569,10 @@
}),
};
},
+ /**
+ * @description: 鑾峰彇琛屼负鎴栬�呰妭鐐圭殑閰嶇疆琛ㄥ崟缁撴瀯锛屼娇鐢╱seForm()
+ * @return {*}
+ */
GetUseForm: () => {
return {
Action: useForm({
@@ -585,6 +610,7 @@
/**
* @description: 鑾峰彇鏍囬淇℃伅
* @param {string} type
+ * @param {*} item
* @return {*}
*/
GetTitle: (type: string, item) => {
@@ -599,7 +625,7 @@
* @param {Ref} selectedNodes
* @return {*}
*/
- SelectNode: (selectedNodes: Ref<any[]>) => {
+ SelectNode: (selectedNodes: Ref<any[]>, code: string) => {
let result = {
showConfig: false,
showNav: false,
@@ -618,16 +644,15 @@
if (selectedNodes.value[0].type == 'Action' || selectedNodes.value[0].type == 'Node') {
result.showNav = false;
result.showConfig = true;
- if (selectedNodes.value[0].type == 'Action') {
- result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: false };
- } else {
- result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: false };
- }
+ result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: false };
}
+ /* 淇濆瓨褰撳墠閫夋嫨鐨勮妭鐐规暟鎹埌鐘舵�佺鐞� */
+ useProdRoute.setCurSelectedNodes({ name: code, SelectedNodes: selectedNodes.value });
return result;
},
/**
* @description: 鑾峰彇瀵艰埅椤�
+ * @param {string} type
* @return {*}
*/
GetNavItems: (type: string) => {
@@ -642,6 +667,7 @@
url: '/addRoute',
action: 'addRoute',
isStep: false,
+ isCustEl: false,
},
{
title: '娣诲姞瀹㈡埛宸ヨ壓璺嚎',
@@ -650,18 +676,29 @@
url: '/addCustomer',
action: 'addCustomer',
isStep: true,
+ isCustEl: false,
},
];
break;
case 'Route':
item = [
{
- title: '缂栬緫宸ヨ壓璺嚎',
- icon: 'clarity:note-edit-line',
+ title: '缂栬緫宸ヨ壓璺嚎', //鏍囬
+ icon: 'clarity:note-edit-line', //鍥炬爣
+ color: '#1fdaca', //瀛椾綋棰滆壊
+ url: '/editRoute', //瀵艰埅鍦板潃
+ action: 'editRoute', //瀵艰埅鎵ц鐨勬柟娉曪紝濡傛灉鎸夎繖涓猘ction鏉ユ墽琛岋紝涓婇潰鐨剈rl灏辨棤鏁�
+ isStep: false, //鏄惁鏄楠�
+ isCustEl: false, //鏄惁鏄嚜瀹氫箟html鍐呭
+ },
+ {
+ title: '璁剧疆榛樿宸ヨ壓璺嚎',
+ icon: '',
color: '#1fdaca',
- url: '/editRoute',
- action: 'editRoute',
+ url: '',
+ action: '',
isStep: false,
+ isCustEl: true,
},
];
break;
@@ -671,12 +708,15 @@
/**
* @description: 瀵艰埅椤甸潰鍒囨崲鎸夐挳鏃惰皟鐢ㄦ柟娉�
* @param {any} action
+ * @param {array} args
* @return {*}
*/
navChangeItem: (action: any, ...args) => {
+ const openRvModal = args[1];
+ const openModal = args[0];
switch (action) {
case 'addRoute':
- args[0](true, {
+ openModal(true, {
title: '宸ヨ壓璺嚎鍒楄〃',
schemas: [
{
@@ -712,12 +752,12 @@
});
break;
case 'addCustomer':
- args[0](true, {
+ openModal(true, {
title: '璇峰畬鎴愪互涓嬫楠�',
});
break;
case 'editRoute':
- args[1](true, {
+ openRvModal(true, {
rotId: args[2][0].id,
slotName: '',
prodCode: args[3],
@@ -791,12 +831,13 @@
param.data.value['BAS_PKG_DTL'].map((x) => {
if (x.PKG_CODE == param.values['PKG_CODE']) {
x.LABEL_CODE = param.values['LABEL_CODE'];
- x.LABEL_ID = param.values['LABEL_CODE'];
+ x.LABEL_ID = param.values['LABEL_CODE'];
}
});
param.data.value['Action'][0]['OPTION_1'] = JSON.stringify(
param.data.value['BAS_PKG_DTL'],
);
+ resolve('OK');
break;
case 'ItemCode':
param.data.value['ItemCode'].map((x) => {
@@ -808,13 +849,28 @@
param.data.value['Action'][0]['OPTION_1'] = JSON.stringify(
param.data.value['ItemCode'],
);
+ 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();
- await AddOrEditLabelVarByWorkOrder(param.values as unknown as BAS_LABEL_VAR_WO);
+ var action = await AddOrEditLabelVarByWorkOrder(
+ param.values as unknown as BAS_LABEL_VAR_WO,
+ );
+ resolve(action);
+ case 'isDefault':
+ /* 璁剧疆榛樿宸ヨ壓璺嚎 */
+ 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;
}
- resolve('OK');
} catch (e) {
reject(e);
}
@@ -1753,7 +1809,6 @@
] as FormSchema[],
};
-
/**
* @description: 妯℃澘缁存姢
* @param {*} args
@@ -1762,7 +1817,8 @@
*/
function handleTemplate(args, params: Recordable) {
const openCrudModal = args[0];
- const OrderNo = args[2];
+ // const OrderNo = args[2];
+ const ProdCode = args[2];
openCrudModal(true, {
isUpdate: true, //鏄惁鏇存柊鎿嶄綔
entityName: 'ProdRouteBinding', //鏄摢涓〉闈�
@@ -1771,20 +1827,14 @@
width: '1024px', //寮瑰嚭妗嗗搴�
ItemColumns: TemplateBasColumn, //寮瑰嚭妗嗕腑琛ㄦ牸瀛楁缁撴瀯
schemas: [], //鏌ヨ鏉′欢瀛楁缁撴瀯
- others: { WORK_ORDER: OrderNo }, //闇�瑕佸甫鍒板脊鍑虹獥鍙ｄ腑鐨勬暟鎹�
+ others: { WORK_ORDER: '', PROD_CODE: ProdCode }, //闇�瑕佸甫鍒板脊鍑虹獥鍙ｄ腑鐨勬暟鎹�
searchInfo: {
TABLE_NAME: 'BAS_LABEL_VAR_WO', //瀹炰綋鍚嶇О
LabelId: params['record'].LABEL_ID, //妯℃澘ID
- WorkOrder: OrderNo, //宸ュ崟鍙�
+ WorkOrder: '', //宸ュ崟鍙�
+ ProdCode: ProdCode,
+ CustCode: '',
apiUrl: mesApi.GetLabelVarByWorkOrder, //鑷畾涔夎幏鍙栨暟鎹垎椤电殑api锛屼笉鐢ㄩ粯璁ょ殑鍩虹鏂规硶
- // sqlcmd: ` (WORK_ORDER = '${OrderNo}' OR WORK_ORDER = '' OR WORK_ORDER IS NULL)`,
- // option:
- // {
- // //鏍规嵁鎹偣鏌ヨ锛屽繀闇�甯﹁繖涓弬鏁�
- // UserId: useUserStore().getUserInfo.userId,
- // ByOrg: true,
- // CurOrg: useUserStore().getUserInfo.orgCode,
- // },
},
values: params['record'], //琛ㄥ崟璁板綍
});
@@ -1803,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,
},
{
@@ -1820,8 +1876,8 @@
{
title: '榛樿鍊�',
dataIndex: 'DEFAULT_VALUE',
- editRow: true,
- editRule: true,
+ // editRow: true,
+ // editRule: true,
},
] as BasicColumn[];
--
Gitblit v1.9.3