From 3d2c48733b86a03fc2e5a1f12ac3667ab0863b80 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 08 十一月 2024 01:03:56 +0800
Subject: [PATCH] 标签模板，主页，默认工艺路线更新
---
src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts | 170 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 108 insertions(+), 62 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
index 970961b..0a11ed7 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
@@ -1,19 +1,20 @@
+/* eslint-disable no-var */
+/* eslint-disable no-fallthrough */
/*
* @Description: 浜у搧宸ヨ壓璺嚎鐩稿叧
* @Author: Ben Lin
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-10-06 16:48:25
+ * @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';
@@ -29,13 +30,16 @@
import { ContextMenuItem } from '/@/components/TigerTree';
import { useForm } from '/@/components/Form';
import { mesApi } from '/@/api/tigerapi/mes/mesApi';
-import { BAS_LABEL_VAR_WO } from '/@/api/tigerapi/model/mesModel';
+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;
@@ -80,8 +84,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: 鑾峰彇鏍戝舰鏁版嵁
@@ -89,20 +93,29 @@
* @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,
- });
- // 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[];
+ const _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);
+ useProdRoute.setname(itemCode);
+ if (useProdRoute.curProdRotTree.some((q) => q.name == itemCode)) {
+ data.treeData = useProdRoute.curProdRotTree.filter((q) => q.name == itemCode)[0].treeInfo;
+ }
return data;
},
/**
@@ -150,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' },
];
},
/**
@@ -160,7 +173,7 @@
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']}'`;
@@ -223,9 +236,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';
@@ -239,7 +250,7 @@
}
if (params['selectedNodes'][0].type == 'Node') {
resetFieldsNode();
- setFieldsValueNode({
+ const values = {
ID: res.Data.Items[0].ID,
OPER_CODE: res.Data.Items[0].OPER_CODE,
ROT_ID: res.Data.Items[0].ROT_ID,
@@ -263,10 +274,18 @@
ALLOW_DFT_IN: isNullOrEmpty(res.Data.Items[0].ALLOW_DFT_IN)
? 'N'
: res.Data.Items[0].ALLOW_DFT_IN,
+ IF_DFT_OFFLINE: isNullOrEmpty(res.Data.Items[0].IF_DFT_OFFLINE)
+ ? 'N'
+ : res.Data.Items[0].IF_DFT_OFFLINE,
REMARK: res.Data.Items[0].REMARK,
PROD_CODE: params['objParams'].value['CODE'],
CUST_CODE: params['selectedNodes'][0].cust,
- });
+ };
+ setFieldsValueNode(values);
+
+ /* 榛樿淇濆瓨 */
+ SaveEntity(values, true, 'MES_PROD_OPER');
+
// result['Node'] = res.Data.Items;
result['name'] = 'Node';
result['isShow'] = {
@@ -274,6 +293,7 @@
ItemCode: false,
};
}
+ useProdRoute.setcurDtl(result);
resolve(result);
} catch (e) {
reject(e);
@@ -296,6 +316,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');
@@ -381,7 +404,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({
@@ -432,7 +455,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') {
@@ -450,7 +473,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 });
@@ -512,11 +535,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,8 +635,8 @@
* @param {Ref} selectedNodes
* @return {*}
*/
- SelectNode: (selectedNodes: Ref<any[]>) => {
- let result = {
+ SelectNode: (selectedNodes: Ref<any[]>, code: string) => {
+ const result = {
showConfig: false,
showNav: false,
type: selectedNodes.value[0].type,
@@ -631,6 +656,8 @@
result.showConfig = true;
result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: false };
}
+ /* 淇濆瓨褰撳墠閫夋嫨鐨勮妭鐐规暟鎹埌鐘舵�佺鐞� */
+ useProdRoute.setCurSelectedNodes({ name: code, SelectedNodes: selectedNodes.value });
return result;
},
/**
@@ -835,29 +862,24 @@
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,
);
resolve(action);
- case 'isDefault' /* 璁剧疆榛樿宸ヨ壓璺嚎 */:
- var action = await SetDefaultRoute({
- rotCode: param.others['code'],
- prodCode: param.keyCode,
- rotId: '',
- options: {
- //鏍规嵁鎹偣鏌ヨ锛屽繀闇�甯﹁繖涓弬鏁�
- UserId: useUserStore().getUserInfo.userId as string,
- ByOrg: true,
- CurOrg: useUserStore().getUserInfo.orgCode as string,
- ByProd: false,
- ByWh: false,
- OrgCode: useUserStore().getUserInfo.orgCode as string,
- },
- isDefault: param.others['isDefault'],
- });
+ 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;
}
} catch (e) {
reject(e);
@@ -883,7 +905,7 @@
label: '鍒犻櫎',
handler: () => {
console.log('鐐瑰嚮浜嗗垹闄�', node);
- DeleteProdRoute({ rotId: node.id, rotCode: node.code, prodCode: args[1] }).then(
+ DeleteProdRoute({ rotId: node.id, rotCode: node.code, prodCode: args[1], custCode: node.cust }).then(
(action) => {
if (action.IsSuccessed) {
emit('deletenode', node);
@@ -1629,6 +1651,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',
@@ -1805,7 +1850,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', //鏄摢涓〉闈�
@@ -1814,20 +1860,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'], //琛ㄥ崟璁板綍
});
@@ -1846,8 +1886,14 @@
title: '宸ュ崟鍙�',
dataIndex: 'WORK_ORDER',
width: 280,
- editRow: true,
+ // editRow: true,
// editable: true,
+ ifShow: false,
+ },
+ {
+ title: '宸ュ崟鍙�',
+ dataIndex: 'PROD_CODE',
+ width: 280,
ifShow: false,
},
{
@@ -1863,8 +1909,8 @@
{
title: '榛樿鍊�',
dataIndex: 'DEFAULT_VALUE',
- editRow: true,
- editRule: true,
+ // editRow: true,
+ // editRule: true,
},
] as BasicColumn[];
--
Gitblit v1.9.3