From 28a53fe81cdb551d2bf2023167487a3060e0f180 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 30 十月 2024 00:35:51 +0800
Subject: [PATCH] 一些更改
---
src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts | 773 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 635 insertions(+), 138 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
index 7bfc72b..2e30e85 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts
@@ -1,17 +1,17 @@
/*
- * @Description: 浜у搧宸ヨ壓璺嚎鐩稿叧
+ * @Description: 宸ュ崟宸ヨ壓璺嚎鐩稿叧
* @Author: Ben Lin
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-08-05 00:43:08
+ * @LastEditTime: 2024-10-23 23:55:56
*/
-import { Ref, h, ref, render, unref } from 'vue';
+import { Ref, unref } from 'vue';
import {
DeleteWoRoute,
GetWoPTree,
- SP_MES_PROD2WO,
+ ProdRouteToWo,
SP_MES_WO2CUST,
} from '/@/api/tigerapi/mes/router';
import { GetEnum, SaveEntity, convertToTree, getEntity } from '/@/api/tigerapi/system';
@@ -21,17 +21,25 @@
import { NavItem } from '/@/api/tigerapi/model/basModel';
import { useMessage } from '/@/hooks/web/useMessage';
import { useModal } from '/@/components/Modal';
-import { BasicColumn, FormSchema, useTable } from '/@/components/Table';
+import { ActionItem, BasicColumn, FormSchema, useTable } from '/@/components/Table';
import { CustModalParams } from '/@/api/tigerapi/model/systemModel';
import { useUserStore } from '/@/store/modules/user';
import { EventDataNode } from 'ant-design-vue/lib/tree';
import { ContextMenuItem } from '/@/components/TigerTree';
-import { UpdateWoStatus } from '/@/api/tigerapi/mes/wo';
+import { AddOrEditLabelVarByWorkOrder, UpdateWoStatus } from '/@/api/tigerapi/mes/wo';
import { useForm } from '/@/components/Form';
+import { BAS_LABEL_VAR_WO, MesRotTree } from '/@/api/tigerapi/model/mesModel';
+import { buildUUID } from '/@/utils/uuid';
+import { mesApi } from '/@/api/tigerapi/mes/mesApi';
+import { useProdRouteStore } from '/@/store/modules/prodRoute';
+import { useWebSocketStore } from '/@/store/modules/websocket';
+import { useGlobSetting } from '/@/hooks/setting';
const { t } = useI18n();
const { createErrorModal } = useMessage();
+const useProdRoute = useProdRouteStore();
const { getLocale } = useLocale();
+const globSetting = useGlobSetting();
function _default() {
/* 瀹氫箟鍙橀噺 */
const isNormal = (type: number) => type === 0;
@@ -87,15 +95,9 @@
fetchTreeData: async (type: string, wo: string) => {
let data = { title: '', treeData: [] as any[], fieldNames: {} };
let prodTreeData = await GetWoPTree({ wo: wo });
- // 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');
- if (data.treeData.length == 0) {
- data.treeData.push({
+ let _treeData = convertToTree(prodTreeData, 'pid', 'tid', 'root');
+ if (_treeData.length == 0) {
+ _treeData.push({
pid: 'root',
tid: '',
id: '',
@@ -103,10 +105,36 @@
prod: '',
name: wo,
type: 'WorkOrder',
+ cust: '',
+ code: '',
+ seq: 0,
});
}
data.title = '宸ュ崟宸ヨ壓璺嚎';
data.fieldNames = { key: 'tid', title: 'name' };
+ if (!useProdRoute.changeToCPPage || !useProdRoute.curProdRotTree.some((q) => q.name == wo)) {
+ /* 淇濆瓨宸ヨ壓鏍戝舰鏁版嵁鍒扮姸鎬佺鐞� */
+ useProdRoute.setCurProdRotTree({
+ name: wo,
+ treeInfo: _treeData as unknown as MesRotTree[],
+ });
+ }
+ if (useProdRoute.curProdRotTree.some((q) => q.name == wo)) {
+ data.treeData = useProdRoute.curProdRotTree.filter((q) => q.name == wo)[0].treeInfo;
+ }
+ return data;
+ },
+ /**
+ * @description: 鎿嶄綔瀛楁鑷畾涔夋寜閽紝蹇呴渶瑕佹湁鐨勬柟娉�
+ * @return {*}
+ */
+ ActionItem: (params: Recordable<any>, data, ...args): ActionItem[] => {
+ data.push({
+ icon: 'template|svg',
+ tooltip: '妯℃澘缁存姢',
+ onClick: handleTemplate.bind(null, args, params),
+ name: '妯℃澘缁存姢',
+ });
return data;
},
/**
@@ -123,7 +151,7 @@
case 'Node':
form = nodeFormShema;
break;
- case 'BAS_PKG_DTL':
+ default:
form = crudForms[type];
break;
}
@@ -134,7 +162,15 @@
* @return {*}
*/
GetCrudColSlots: () => {
- return ['scanadd', 'assyadd', 'testadd', 'auditadd', 'printadd', 'pkgadd'];
+ return [
+ { name: 'scanadd', icon: 'search|svg' },
+ { name: 'assyadd', icon: 'search|svg' },
+ { name: 'testadd', icon: 'search|svg' },
+ { name: 'auditadd', icon: 'search|svg' },
+ { name: 'printadd', icon: 'search|svg' },
+ { name: 'pkgadd', icon: 'search|svg' },
+ { name: 'labeladd', icon: 'template|svg' },
+ ];
},
/**
* @description: 鑾峰彇琛ㄦ牸use鍒楄〃
@@ -144,17 +180,42 @@
*/
GetUseTables: (data: Ref<{}>, ...args) => {
return {
- Table: useTable({
+ BAS_PKG_DTL: useTable({
title: '鍒楄〃淇℃伅',
// api: getListByPage,
// searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' },
- dataSource: data.value['Table'],
- columns: GetBaseColumns('', args[0], data),
- maxHeight: 520,
+ dataSource: data.value['BAS_PKG_DTL'],
+ columns: GetBaseColumns('BAS_PKG_DTL', args[0], data),
+ // maxHeight: 520,
useSearchForm: false,
showTableSetting: false,
bordered: true,
- canResize: true,
+ isCanResizeParent: true,
+ // canResize: true,
+ showIndexColumn: false,
+ // rowSelection: {
+ // type: 'radio', //'checkbox'
+ // },
+ actionColumn: {
+ width: 100,
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ slots: { customRender: 'action' },
+ fixed: 'right',
+ }, //鑷畾涔夋搷浣滃垪
+ }),
+ ItemCode: useTable({
+ title: '鍒楄〃淇℃伅',
+ // api: getListByPage,
+ // searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' },
+ dataSource: data.value['ItemCode'],
+ columns: GetBaseColumns('ItemCode', args[0], data),
+ // maxHeight: 520,
+ useSearchForm: false,
+ showTableSetting: false,
+ bordered: true,
+ isCanResizeParent: true,
+ // canResize: true,
showIndexColumn: false,
// rowSelection: {
// type: 'radio', //'checkbox'
@@ -209,7 +270,7 @@
*/
nodeChange: (params: { useForms: Ref<any>; objParams: Ref<any>; selectedNodes: any[] }) =>
new Promise<any>(async (resolve, reject) => {
- let result = {};
+ let result = { isShow: {} };
let sqlcmd = ' 1=1 ';
if (!isNullOrEmpty(params['objParams'].value['CODE'])) {
sqlcmd += `And WORK_ORDER = '${params['objParams'].value['CODE']}'`;
@@ -252,42 +313,87 @@
CUST_CODE: params['selectedNodes'][0].cust,
PROD_CODE: params['selectedNodes'][0].prod,
OPTION_1: res.Data.Items[0].OPTION_1,
+ OPTION_2: res.Data.Items[0].OPTION_2,
});
- result['isShow'] = isNullOrEmpty(res.Data.Items[0].PKG_CODE) ? false : true;
- const ents = await getEntity({
- sqlcmd: `RULE_CODE ='${res.Data.Items[0].PKG_CODE}'`,
- entityName: 'V_BAS_PKG_DTL',
- order: '',
- });
- result['Table'] = isNullOrEmpty(res.Data.Items[0].OPTION_1)
- ? 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;
+ /* 濡傛灉鏄寘瑁呰鍒� */
+ if (res.Data.Items[0].ACT_TYPE == 6) {
+ result['name'] = 'BAS_PKG_DTL';
+ result['isShow'] = {
+ BAS_PKG_DTL: isNullOrEmpty(res.Data.Items[0].PKG_CODE) ? false : true,
+ ItemCode: false,
+ };
+ const ents = await getEntity({
+ sqlcmd: `RULE_CODE ='${res.Data.Items[0].PKG_CODE}'`,
+ entityName: 'V_BAS_PKG_DTL',
+ order: '',
+ });
+ result['BAS_PKG_DTL'] = isNullOrEmpty(res.Data.Items[0].OPTION_1)
+ ? ents.Data.Items
+ : JSON.parse(res.Data.Items[0].OPTION_1);
+ /* 濡傛灉OPTION_1瀛楁涓虹┖灏辨妸鍖呰淇℃伅杞琂SON瀛樺埌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';
+ result['ItemCode'] = JSON.parse(res.Data.Items[0].OPTION_1);
+ result['isShow'] = {
+ BAS_PKG_DTL: false,
+ ItemCode: true,
+ };
+ }
result['Action'] = res.Data.Items;
}
if (params['selectedNodes'][0].type == 'Node') {
resetFieldsNode();
- setFieldsValueNode({
+ const wonode = await getEntity({
+ sqlcmd: `WORK_ORDER ='${params['objParams'].value['CODE']}' AND ID = '${res.Data.Items[0].NODE_ID}'`,
+ entityName: 'MES_WO_NODE',
+ order: '',
+ });
+ 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: res.Data.Items[0].IS_ACTIVE,
- IS_CALC_FPY: res.Data.Items[0].IS_CALC_FPY,
- CAN_SKIP: res.Data.Items[0].CAN_SKIP,
- IS_INPUT: res.Data.Items[0].IS_INPUT,
- IS_OUTPUT: res.Data.Items[0].IS_OUTPUT,
- ALLOW_DFT_IN: res.Data.Items[0].ALLOW_DFT_IN,
+ 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:
+ wonode.Data.Items[0].IS_FIRST_NODE == 'Y'
+ ? 'Y'
+ : 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,
WORK_ORDER: params['objParams'].value['CODE'],
CUST_CODE: params['selectedNodes'][0].cust,
PROD_CODE: params['selectedNodes'][0].prod,
- });
+ };
+ setFieldsValueNode(values);
+ /* 榛樿淇濆瓨 */
+ SaveEntity(values, true, 'MES_WO_OPER');
+
+ result['name'] = 'Node';
+ result['isShow'] = {
+ BAS_PKG_DTL: false,
+ ItemCode: false,
+ };
}
+ useProdRoute.setcurDtl(result);
resolve(result);
} catch (e) {
reject(e);
@@ -309,6 +415,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');
@@ -322,6 +431,9 @@
*/
OpenSelectItem: (openItemModal: Fn, ...args) => {
let config = {};
+ const openCrudModal = args[1];
+ const record = args[2];
+ const OrderNo = args[3];
switch (args[0]) {
case 'scanadd':
config = ruleModalCfg;
@@ -339,7 +451,35 @@
config = pkgModalCfg;
break;
}
- openItemModal(true, config);
+ if (args[0] == 'labeladd') {
+ openCrudModal(true, {
+ isUpdate: true, //鏄惁鏇存柊鎿嶄綔
+ entityName: 'WoRouteBinding', //鏄摢涓〉闈�
+ ctype: 'BAS_LABEL_VAR_WO', //瀹炰綋鍚嶇О
+ title: '妯℃澘缁存姢', //鏍囬
+ width: '1024px', //寮瑰嚭妗嗗搴�
+ ItemColumns: TemplateBasColumn, //寮瑰嚭妗嗕腑琛ㄦ牸瀛楁缁撴瀯
+ schemas: [], //鏌ヨ鏉′欢瀛楁缁撴瀯
+ others: { WORK_ORDER: OrderNo }, //闇�瑕佸甫鍒板脊鍑虹獥鍙ｄ腑鐨勬暟鎹�
+ searchInfo: {
+ TABLE_NAME: 'BAS_LABEL_VAR_WO', //瀹炰綋鍚嶇О
+ LabelId: record.LABEL_CODE, //妯℃澘ID
+ WorkOrder: OrderNo, //宸ュ崟鍙�
+ 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: record, //琛ㄥ崟璁板綍
+ });
+ } else {
+ openItemModal(true, config);
+ }
},
/**
* @description: 寮瑰嚭閫夋嫨妗嗛�夋嫨鎴愬姛杩斿洖
@@ -355,15 +495,29 @@
value: {
RULE_CODE: d.values['val'],
},
- isShow: false,
+ isShow: { BAS_PKG_DTL: false, ItemCode: false },
};
break;
case 'assyadd':
+ const items = d.values['val'].split(',');
+ let data: any[] = [];
+ if (!isNullOrEmpty(items) && items.length > 0) {
+ items.map((x) => {
+ data.push({
+ ITEM_CODE: x,
+ RULE_CODE: '',
+ IsBatchItem: 'N',
+ QTY: 1,
+ });
+ });
+ }
value = {
value: {
ITEM_CODE: d.values['val'],
},
- isShow: false,
+ isShow: { BAS_PKG_DTL: false, ItemCode: true },
+ data: data,
+ name: 'ItemCode',
};
break;
case 'printadd':
@@ -371,8 +525,10 @@
value: {
LABEL_CODE: d.values['val'],
},
- isShow: false,
+ isShow: { BAS_PKG_DTL: false, ItemCode: false },
};
+ break;
+ case 'labeladd':
break;
case 'pkgadd':
const ents = await getEntity({
@@ -384,8 +540,9 @@
value: {
PKG_CODE: d.values['val'],
},
- isShow: true,
+ isShow: { BAS_PKG_DTL: true, ItemCode: false },
data: ents.Data.Items,
+ name: 'BAS_PKG_DTL',
};
break;
case 'addRoute':
@@ -397,29 +554,18 @@
return;
}
/* 鏇存柊宸ュ崟鐘舵�佸苟鐢熸垚宸ュ崟鐨勫伐鑹鸿矾绾� */
- UpdateWoStatus({
- UserId: useUserStore().getUserInfo.userId as string,
- WorkOrder: args[1]['CODE'],
- Status: -1,
- RouteStatus: 1,
+ ProdRouteToWo({
+ rotId: d.values.id, wo: args[1]['CODE'],
+ rotCode: '',
+ options: {
+ //鏍规嵁鎹偣鏌ヨ锛屽繀闇�甯﹁繖涓弬鏁�
+ UserId: useUserStore().getUserInfo.userId,
+ ByOrg: true,
+ CurOrg: useUserStore().getUserInfo.orgCode,
+ }
}).then((action) => {
if (action.IsSuccessed) {
- SP_MES_PROD2WO({ rotId: d.values.id, wo: args[1]['CODE'] }).then((action) => {
- if (action.IsSuccessed) {
- args[2]();
- } else {
- UpdateWoStatus({
- UserId: useUserStore().getUserInfo.userId as string,
- WorkOrder: args[1]['CODE'],
- Status: -1,
- RouteStatus: 0,
- });
- createErrorModal({
- title: t('sys.api.errorTip'),
- content: t(action.LocaleMsg),
- });
- }
- });
+ args[2]();
} else {
createErrorModal({
title: t('sys.api.errorTip'),
@@ -457,6 +603,25 @@
testadd: useModal(),
auditadd: useModal(),
printadd: useModal(),
+ labeladd: useModal(),
+ pkgadd: useModal(),
+ };
+ },
+ /**
+ * @description: 鑾峰彇妯℃�佹搴旂敤鍒楄〃
+ * @return {*}
+ */
+ GetUseCrudModals: () => {
+ return {
+ addRoute: useModal(),
+ addCustomer: useModal(),
+ editRoute: useModal(),
+ scanadd: useModal(),
+ assyadd: useModal(),
+ testadd: useModal(),
+ auditadd: useModal(),
+ printadd: useModal(),
+ labeladd: useModal(),
pkgadd: useModal(),
};
},
@@ -465,11 +630,11 @@
* @param {string} type
* @return {*}
*/
- GetTitle: (type: string) => {
+ GetTitle: (type: string, item) => {
return {
configTitle: type == 'Action' ? '琛屼负閰嶇疆' : '宸ュ簭閰嶇疆',
navTitle: type == 'Product' ? '娣诲姞宸ヨ壓璺嚎' : '宸ヨ壓璺嚎缁存姢',
- tableTitle: type == 'Action' ? '鍖呰灞傜骇鍒楄〃' : '',
+ tableTitle: type == 'Action' ? (item == 'ItemCode' ? '涓婃枡鍒楄〃' : '鍖呰灞傜骇鍒楄〃') : '',
};
},
/**
@@ -477,13 +642,13 @@
* @param {Ref} selectedNodes
* @return {*}
*/
- SelectNode: (selectedNodes: Ref<any[]>) => {
+ SelectNode: (selectedNodes: Ref<any[]>, code: string) => {
let result = {
showConfig: false,
showNav: false,
type: selectedNodes.value[0].type,
nodes: selectedNodes.value,
- showOtherTable: false,
+ showOtherTable: { BAS_PKG_DTL: false, ItemCode: false },
};
if (isNullOrUnDef(selectedNodes)) {
return result;
@@ -491,17 +656,18 @@
if (selectedNodes.value[0].type == 'WorkOrder' || selectedNodes.value[0].type == 'Route') {
result.showNav = true;
result.showConfig = false;
- result.showOtherTable = false;
+ result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: false };
}
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 = true;
+ result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: false };
} else {
- result.showOtherTable = false;
+ result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: false };
}
}
+ useProdRoute.setCurSelectedNodes({ name: code, SelectedNodes: selectedNodes.value });
return result;
},
/**
@@ -520,6 +686,7 @@
url: '/addRoute',
action: 'addRoute',
isStep: false,
+ isCustEl: false,
},
// {
// title: '娣诲姞瀹㈡埛宸ヨ壓璺嚎',
@@ -540,6 +707,7 @@
url: '/editRoute',
action: 'editRoute',
isStep: false,
+ isCustEl: false,
},
];
break;
@@ -600,7 +768,13 @@
SP_MES_WO2CUST({ wo: args[2][0]['wo'] });
break;
case 'editRoute':
- args[1](true, { rotId: args[2][0].wo, slotName: '', rotType: 'Wo' });
+ args[1](true, {
+ rotId: args[2][0].wo,
+ slotName: '',
+ rotType: 'Wo',
+ prodCode: args[3],
+ custCode: args[2][0].cust,
+ });
break;
}
},
@@ -656,12 +830,66 @@
* @return {*}
*/
CustFunc: async (param: CustModalParams) => {
- param.data.value['Table'].map((x) => {
- if (x.PKG_CODE == param.values['PKG_CODE']) {
- x.LABEL_CODE = param.values['LABEL_CODE'];
+ return new Promise<any>(async (resolve, reject) => {
+ try {
+ switch (param['ctype']) {
+ case 'BAS_PKG_DTL':
+ // const ents = await getEntity({
+ // sqlcmd: `PKG_RULE_ID ='${param.values['PKG_RULE_ID']}'`,
+ // entityName: 'V_BAS_PKG_DTL',
+ // order: '',
+ // });
+ // param.data.value['Table'] = ents.Data.Items;
+ 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'];
+ }
+ });
+ param.data.value['Action'][0]['OPTION_1'] = JSON.stringify(
+ param.data.value['BAS_PKG_DTL'],
+ );
+ break;
+ case 'ItemCode':
+ param.data.value['ItemCode'].map((x) => {
+ if (x.ITEM_CODE == param.values['ITEM_CODE']) {
+ x.IsBatchItem = param.values['IsBatchItem'];
+ x.RULE_CODE = param.values['RULE_CODE'];
+ }
+ });
+ param.data.value['Action'][0]['OPTION_1'] = JSON.stringify(
+ param.data.value['ItemCode'],
+ );
+ break;
+ case 'BAS_LABEL_VAR_WO':
+ param.values['WORK_ORDER'] = param.others['WORK_ORDER'];
+ param.values['ID'] = buildUUID();
+
+ const apiaction = await AddOrEditLabelVarByWorkOrder(
+ param.values as unknown as BAS_LABEL_VAR_WO,
+ );
+ if (apiaction.IsSuccessed) {
+ const webSocketStore = useWebSocketStore();
+ if (webSocketStore.GetSocketState == 1) {
+ webSocketStore.sendMessage(
+ `wsGetNew ${param.values['LABEL_ID']}_#_${param.values['WORK_ORDER']}`,
+ );
+ }
+ }
+ case 'delete':
+ const webSocketStore = useWebSocketStore();
+ if (webSocketStore.GetSocketState == 1) {
+ webSocketStore.sendMessage(
+ `wsGetNew ${param.values['LABEL_ID']}_#_${param.values['WORK_ORDER']}`,
+ );
+ }
+ break;
+ }
+ resolve('OK');
+ } catch (e) {
+ reject(e);
}
});
- param.data.value['Action'][0]['OPTION_1'] = JSON.stringify(param.data.value['Table']);
},
/**
* @description: 鑾峰彇鍙抽敭鑿滃崟鍒楄〃
@@ -709,56 +937,155 @@
* @return {*}
*/
function GetBaseColumns(type: string, emit, data: Ref<{}>) {
- columns = [
- {
- dataIndex: 'PKG_RULE_ID',
- title: '鍖呰瑙勫垯ID',
- ifShow: false,
- sorter: true,
- resizable: true,
- },
- {
- dataIndex: 'PKG_CODE',
- title: '鍖呰缂栫爜',
- ifShow: false,
- sorter: true,
- resizable: true,
- customRender: () => {},
- },
- {
- dataIndex: 'PKG_NAME',
- title: '鍖呰鍚嶇О',
- ifShow: true,
- sorter: true,
- resizable: true,
- customRender: () => {},
- },
- {
- dataIndex: 'PKG_QTY',
- title: '鍖呰鏁伴噺',
- ifShow: true,
- sorter: true,
- resizable: true,
- customRender: () => {},
- },
- {
- dataIndex: 'PKG_LEVEL',
- title: '鍖呰灞傜骇',
- ifShow: true,
- sorter: true,
- resizable: true,
- customRender: () => {},
- },
- {
- dataIndex: 'LABEL_CODE',
- title: '鏍囩妯℃澘缂栫爜',
- ifShow: true,
- sorter: true,
- resizable: true,
- },
- ];
+ switch (type) {
+ case 'BAS_PKG_DTL':
+ columns = [
+ {
+ dataIndex: 'PKG_RULE_ID',
+ title: '鍖呰瑙勫垯ID',
+ ifShow: false,
+ sorter: true,
+ resizable: true,
+ },
+ {
+ dataIndex: 'PKG_CODE',
+ title: '鍖呰缂栫爜',
+ ifShow: false,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'PKG_NAME',
+ title: '鍖呰鍚嶇О',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'PKG_QTY',
+ title: '鍖呰鏁伴噺',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'PKG_LEVEL',
+ title: '鍖呰灞傜骇',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'LABEL_CODE',
+ title: '鏍囩妯℃澘缂栫爜',
+ // edit: true,
+ // editRule: true,
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ // editComponent: 'Input',
+ // editComponentProps: (column) => {
+ // return {
+ // onClick: (event) => {
+ // console.log(column);
+ // },
+ // };
+ // },
+ // customCell: (record, rowIndex) => {
+ // return {
+ // onClick: (event) => {
+ // console.log(record);
+ // },
+ // };
+ // },
+ },
+ {
+ dataIndex: 'LABEL_ID',
+ title: '鏍囩妯℃澘ID',
+ ifShow: false,
+ customRender: () => {},
+ },
+ ] as BasicColumn[];
+ break;
+ case 'ItemCode':
+ /*
+ public string ITEM_CODE { get; set; }
+ public string RULE_CODE { get; set; }
+ /// <summary>
+ /// 鏄惁鎵规鐗╂枡
+ /// </summary>
+ public bool IsBatchItem { get; set; }
+ /// <summary>
+ /// 涓婃枡鏁伴噺
+ /// </summary>
+ public int QTY { get; set; }
+ */
+ columns = [
+ {
+ dataIndex: 'ITEM_CODE',
+ title: '鐗╂枡缂栫爜',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ },
+ {
+ dataIndex: 'RULE_CODE',
+ title: '瑙勫垯缂栫爜',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'IsBatchItem',
+ title: '鏄惁鎵规鐗╂枡',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ {
+ dataIndex: 'QTY',
+ title: '涓婃枡鏁伴噺',
+ ifShow: true,
+ sorter: true,
+ resizable: true,
+ customRender: () => {},
+ },
+ // {
+ // dataIndex: 'LABEL_CODE',
+ // title: '鏍囩妯℃澘缂栫爜',
+ // // edit: true,
+ // // editRule: true,
+ // ifShow: true,
+ // sorter: true,
+ // resizable: true,
+ // // editComponent: 'Input',
+ // // editComponentProps: (column) => {
+ // // return {
+ // // onClick: (event) => {
+ // // console.log(column);
+ // // },
+ // // };
+ // // },
+ // // customCell: (record, rowIndex) => {
+ // // return {
+ // // onClick: (event) => {
+ // // console.log(record);
+ // // },
+ // // };
+ // // },
+ // },
+ ] as BasicColumn[];
+ break;
+ }
return columns;
}
+
/**
* @description: 寮瑰嚭閫夋嫨妗�-鐗╂枡閫夋嫨妗嗛厤缃�
* @return {*}
@@ -1013,7 +1340,7 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 1, pull: 1 },
+ colProps: { span: 1, pull: window.screen.width == 1366 ? -1 : 1 },
ifShow: ({ values }) => isScan(values.ACT_TYPE),
colSlot: 'scanadd',
},
@@ -1029,7 +1356,7 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 1, pull: 1 },
+ colProps: { span: 1, pull: window.screen.width == 1366 ? -1 : 1 },
ifShow: ({ values }) => isAssy(values.ACT_TYPE),
colSlot: 'assyadd',
},
@@ -1045,7 +1372,7 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 1, pull: 1 },
+ colProps: { span: 1, pull: window.screen.width == 1366 ? -1 : 1 },
ifShow: ({ values }) => isTest(values.ACT_TYPE),
colSlot: 'testadd',
},
@@ -1061,14 +1388,14 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 1, pull: 1 },
+ colProps: { span: 1, pull: window.screen.width == 1366 ? -1 : 1 },
ifShow: ({ values }) => isAudit(values.ACT_TYPE),
colSlot: 'auditadd',
},
{
field: 'LABEL_CODE',
label: '鏍囩鎵撳嵃',
- colProps: { span: 11 },
+ colProps: { span: 9 },
component: 'Input',
ifShow: ({ values }) => isPrint(values.ACT_TYPE),
},
@@ -1077,14 +1404,23 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 1, pull: 1 },
+ colProps: { span: 2 }, //{ span: 2, pull: window.screen.width == 1366 ? -1 : 1 },
ifShow: ({ values }) => isPrint(values.ACT_TYPE),
colSlot: 'printadd',
},
{
+ field: 'print1',
+ label: '1',
+ defaultValue: '',
+ component: 'Input',
+ colProps: { span: 1, pull: window.screen.width == 1366 ? -1 : 1 },
+ ifShow: ({ values }) => isPrint(values.ACT_TYPE),
+ colSlot: 'labeladd',
+ },
+ {
field: 'PKG_CODE',
label: '鍖呰瑙勫垯',
- colProps: { span: 11 },
+ colProps: window.screen.width == 2560 ? { span: 10 } : { span: 11 },
component: 'Input',
ifShow: ({ values }) => isPackage(values.ACT_TYPE),
},
@@ -1093,9 +1429,34 @@
label: '1',
defaultValue: '',
component: 'Input',
- colProps: { span: 1, pull: 1 },
+ colProps:
+ window.screen.width == 2560
+ ? { span: 2, pull: 1 }
+ : { span: 1, pull: window.screen.width == 1366 ? -1 : 1 },
ifShow: ({ values }) => isPackage(values.ACT_TYPE),
colSlot: 'pkgadd',
+ },
+ {
+ field: 'OPTION_2',
+ label: '鏄惁绉伴噸',
+ required: true,
+ component: 'Select',
+ colProps: { span: 12 },
+ ifShow: ({ values }) => isPackage(values.ACT_TYPE),
+ componentProps: {
+ options: [
+ {
+ label: '鏄�',
+ value: 'Y',
+ key: 'Y',
+ },
+ {
+ label: '鍚�',
+ value: 'N',
+ key: 'N',
+ },
+ ],
+ },
},
{
field: 'REMARK',
@@ -1403,8 +1764,144 @@
show: false,
},
] as FormSchema[],
+ ItemCode: [
+ {
+ label: '鐗╂枡缂栫爜',
+ field: 'ITEM_CODE',
+ component: 'Input',
+ colProps: {
+ span: 24,
+ },
+ dynamicDisabled: ({ values }) => {
+ return false;
+ },
+ },
+ {
+ field: 'RULE_CODE',
+ label: '瑙勫垯缂栫爜',
+ component: 'Input',
+ colProps: {
+ span: 22,
+ },
+ dynamicDisabled: ({ values }) => {
+ return false;
+ },
+ },
+ {
+ field: 'BAS_CODE_RULE1PSelect_0', //鎸変綆浠ｇ爜閰嶇疆鐨勮鍒欙紝瀹炰綋鍚�+搴忓彿+PSelect_0锛屽簭鍙风敤鏉ュ尯鍒嗗涓殑鏃跺�欙紝PSelect_0杩欐槸涓浐瀹氬悗缂�
+ label: '1',
+ defaultValue: 'BAS_CODE_RULE',
+ component: 'Input',
+ colProps: { span: 2 },
+ colSlot: 'BAS_CODE_RULE1add', //鎸変綆浠ｇ爜閰嶇疆鐨勮鍒欙紝瀹炰綋鍚�+搴忓彿+add锛屽簭鍙风敤鏉ュ尯鍒嗗涓殑鏃跺�欙紝add杩欐槸涓浐瀹氬悗缂�
+ },
+ {
+ label: '鏄惁鎵规鐗╂枡',
+ field: 'IsBatchItem',
+ colProps: {
+ span: 24,
+ },
+ component: 'Select',
+ componentProps: {
+ options: [
+ {
+ label: '鏄�',
+ value: 'Y',
+ key: 'Y',
+ },
+ {
+ label: '鍚�',
+ value: 'N',
+ key: 'N',
+ },
+ ],
+ },
+ },
+ {
+ label: '涓婃枡鏁伴噺',
+ field: 'QTY',
+ component: 'Input',
+ colProps: {
+ span: 24,
+ },
+ dynamicDisabled: ({ values }) => {
+ return false;
+ },
+ },
+ ] as FormSchema[],
};
+ /**
+ * @description: 妯℃澘缁存姢
+ * @param {*} args
+ * @param {Recordable} params
+ * @return {*}
+ */
+ function handleTemplate(args, params: Recordable) {
+ const openCrudModal = args[0];
+ const OrderNo = args[2];
+ openCrudModal(true, {
+ isUpdate: true, //鏄惁鏇存柊鎿嶄綔
+ entityName: 'WoRouteBinding', //鏄摢涓〉闈�
+ ctype: 'BAS_LABEL_VAR_WO', //瀹炰綋鍚嶇О
+ title: '妯℃澘缁存姢', //鏍囬
+ width: '1024px', //寮瑰嚭妗嗗搴�
+ ItemColumns: TemplateBasColumn, //寮瑰嚭妗嗕腑琛ㄦ牸瀛楁缁撴瀯
+ schemas: [], //鏌ヨ鏉′欢瀛楁缁撴瀯
+ others: { WORK_ORDER: OrderNo }, //闇�瑕佸甫鍒板脊鍑虹獥鍙ｄ腑鐨勬暟鎹�
+ searchInfo: {
+ TABLE_NAME: 'BAS_LABEL_VAR_WO', //瀹炰綋鍚嶇О
+ LabelId: params['record'].LABEL_ID, //妯℃澘ID
+ WorkOrder: OrderNo, //宸ュ崟鍙�
+ 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'], //琛ㄥ崟璁板綍
+ });
+ }
+
+ /* 涓嬪彂鐣岄潰涓殑琛ㄥ崟鍒楄〃 */
+ const TemplateBasColumn = [
+ {
+ dataIndex: 'LABEL_ID',
+ title: '鏍囩妯℃澘ID',
+ ifShow: false,
+ sorter: true,
+ resizable: true,
+ },
+ {
+ title: '宸ュ崟鍙�',
+ dataIndex: 'WORK_ORDER',
+ width: 280,
+ editRow: true,
+ // editable: true,
+ ifShow: false,
+ },
+ {
+ title: '鍙橀噺鍚�',
+ dataIndex: 'VAR_NAME',
+ },
+ {
+ title: '鍙橀噺鍊�',
+ dataIndex: 'VAR_VALUE',
+ editRow: true,
+ editRule: true,
+ },
+ {
+ title: '榛樿鍊�',
+ dataIndex: 'DEFAULT_VALUE',
+ // editRow: true,
+ // editRule: true,
+ },
+ ] as BasicColumn[];
+
return [methods];
}
--
Gitblit v1.9.3