From e4f79a7e36214e5836cb0e667b3ffbd3db45456d Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期二, 22 十月 2024 23:54:26 +0800 Subject: [PATCH] 工单变量删除优化,预览优化 --- src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts | 1197 ++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 1,051 insertions(+), 146 deletions(-) diff --git a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts index e4f26ae..3bc1df4 100644 --- a/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts +++ b/src/views/tigerprojects/system/lowcode/entityts/WoRouteBinding.ts @@ -1,14 +1,19 @@ /* - * @Description: 浜у搧宸ヨ壓璺嚎鐩稿叧 + * @Description: 宸ュ崟宸ヨ壓璺嚎鐩稿叧 * @Author: Ben Lin * @version: * @Date: 2024-06-19 20:34:27 * @LastEditors: Ben Lin - * @LastEditTime: 2024-07-21 18:26:07 + * @LastEditTime: 2024-10-22 23:36:24 */ import { Ref, h, ref, render, unref } from 'vue'; -import { GetRoutePTree, RouteToCust, RouteToProd } from '/@/api/tigerapi/mes/router'; +import { + DeleteWoRoute, + GetWoPTree, + SP_MES_PROD2WO, + SP_MES_WO2CUST, +} from '/@/api/tigerapi/mes/router'; import { GetEnum, SaveEntity, convertToTree, getEntity } from '/@/api/tigerapi/system'; import { useLocale } from '/@/locales/useLocale'; import { isNullOrEmpty, isNullOrUnDef } from '/@/utils/is'; @@ -16,14 +21,25 @@ import { NavItem } from '/@/api/tigerapi/model/basModel'; import { useMessage } from '/@/hooks/web/useMessage'; import { useModal } from '/@/components/Modal'; -import { FormSchema } from '/@/components/Table'; -import { initRoute } from '../data'; +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 { 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; @@ -46,8 +62,8 @@ CreateIcon: (params: Recordable<any>) => { let icon = ''; switch (params['type']) { - case 'Product': - icon = 'similar-product|svg'; + case 'WorkOrder': + icon = 'workorder|svg'; break; case 'Route': icon = 'route|svg'; @@ -68,26 +84,57 @@ * @description: 楂樼骇琛ㄥ崟鍜岃鎯呴〉闈㈣繑鍥炰富椤甸潰鐨剈rl * @return {*} */ - GetHomeUrl: () => { - return `/V_BAS_PROD/LC/${encodeURI(JSON.stringify({ ID: 'V_BAS_PROD', colSlots: [], crudColSlots: [] }))}`; + GetHomeUrl: (params: {}) => { + return `/BIZ_MES_WO/LC/${encodeURI(JSON.stringify({ ID: 'BIZ_MES_WO', colSlots: params['colSlots'], crudColSlots: [] }))}`; }, /** * @description: 鑾峰彇鏍戝舰鏁版嵁 * @param {string} type * @return {*} */ - fetchTreeData: async (type: string, itemCode: string) => { + fetchTreeData: async (type: string, wo: string) => { let data = { title: '', treeData: [] as any[], fieldNames: {} }; - 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'); - data.title = '宸ヨ壓璺嚎'; + let prodTreeData = await GetWoPTree({ wo: wo }); + let _treeData = convertToTree(prodTreeData, 'pid', 'tid', 'root'); + if (_treeData.length == 0) { + _treeData.push({ + pid: 'root', + tid: '', + id: '', + wo: wo, + 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; }, /** @@ -104,6 +151,9 @@ case 'Node': form = nodeFormShema; break; + default: + form = crudForms[type]; + break; } return form; }, @@ -112,77 +162,240 @@ * @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鍒楄〃 + * @param {string} type + * @param {array} args + * @return {*} + */ + GetUseTables: (data: Ref<{}>, ...args) => { + return { + BAS_PKG_DTL: useTable({ + title: '鍒楄〃淇℃伅', + // api: getListByPage, + // searchInfo: { TABLE_NAME: 'V_BAS_PKG_DTL' }, + dataSource: data.value['BAS_PKG_DTL'], + columns: GetBaseColumns('BAS_PKG_DTL', args[0], data), + // maxHeight: 520, + useSearchForm: false, + showTableSetting: false, + bordered: 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' + // }, + actionColumn: { + width: 100, + title: '鎿嶄綔', + dataIndex: 'action', + slots: { customRender: 'action' }, + fixed: 'right', + }, //鑷畾涔夋搷浣滃垪 + }), + }; + }, + GetUseForm: () => { + return { + Action: useForm({ + labelWidth: 145, + schemas: methods.GetCrudForm('Action'), + actionColOptions: { + offset: 8, + span: 24, + }, + wrapperCol: { + span: 15, + }, + showActionButtonGroup: true, + submitButtonOptions: { + text: '淇濆瓨', + }, + }), + Node: useForm({ + labelWidth: 145, + schemas: methods.GetCrudForm('Node'), + actionColOptions: { + offset: 8, + span: 24, + }, + wrapperCol: { + span: 15, + }, + showActionButtonGroup: true, + submitButtonOptions: { + text: '淇濆瓨', + }, + }), + }; }, /** * @description: 鍒囨崲鑺傜偣鏃朵簨浠舵柟娉� * @return {*} */ - nodeChange: (params: { - resetFields: any; - setFieldsValue: any; - objParams: Ref<any>; - selectedNodes: Ref<any[]>; - }) => { - let sqlcmd = ' 1=1 '; - if (!isNullOrEmpty(params['objParams'].value['CODE'])) { - sqlcmd += `And PROD_CODE = '${params['objParams'].value['CODE']}'`; - } - if (!isNullOrEmpty(params['selectedNodes'].value[0].cust)) { - sqlcmd += `And CUST_CODE = '${params['selectedNodes'].value[0].cust}'`; - } - if (!isNullOrEmpty(params['selectedNodes'].value[0].id)) { - sqlcmd += - params['selectedNodes'].value[0].type == 'Action' - ? `And ACT_ID = '${params['selectedNodes'].value[0].id}'` - : `And NODE_ID = '${params['selectedNodes'].value[0].id}'`; - } - getEntity({ - sqlcmd: sqlcmd, - entityName: - params['selectedNodes'].value[0].type == 'Action' ? 'MES_PROD_ACTION' : 'MES_PROD_OPER', - order: '', - }).then((res) => { - params['resetFields'](); - if (params['selectedNodes'].value[0].type == 'Action') { - params['setFieldsValue']({ - ID: res.Data.Items[0].ID, - ACT_ID: res.Data.Items[0].ACT_ID, - ROT_ID: res.Data.Items[0].ROT_ID, - NODE_ID: res.Data.Items[0].NODE_ID, - IS_ACTIVE: res.Data.Items[0].IS_ACTIVE, - ITEM_CODE: res.Data.Items[0].ITEM_CODE, - RULE_CODE: res.Data.Items[0].RULE_CODE, - TEST_CODE: res.Data.Items[0].TEST_CODE, - SAPL_CODE: res.Data.Items[0].SAPL_CODE, - LABEL_CODE: res.Data.Items[0].LABEL_CODE, - PKG_CODE: res.Data.Items[0].PKG_CODE, - ACT_CODE: res.Data.Items[0].ACT_CODE, - REMARK: res.Data.Items[0].REMARK, - PROD_CODE: params['objParams'].value['CODE'], - ACT_TYPE: res.Data.Items[0].ACT_TYPE, - CUST_CODE: params['selectedNodes'].value[0].cust, - }); + nodeChange: (params: { useForms: Ref<any>; objParams: Ref<any>; selectedNodes: any[] }) => + new Promise<any>(async (resolve, reject) => { + let result = { isShow: {} }; + let sqlcmd = ' 1=1 '; + if (!isNullOrEmpty(params['objParams'].value['CODE'])) { + sqlcmd += `And WORK_ORDER = '${params['objParams'].value['CODE']}'`; } - if (params['selectedNodes'].value[0].type == 'Node') { - params['setFieldsValue']({ - 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, - REMARK: res.Data.Items[0].REMARK, - PROD_CODE: params['objParams'].value['CODE'], - CUST_CODE: params['selectedNodes'].value[0].cust, - }); + if (!isNullOrEmpty(params['selectedNodes'][0].id)) { + sqlcmd += + params['selectedNodes'][0].type == 'Action' + ? `And ACT_ID = '${params['selectedNodes'][0].id}'` + : `And NODE_ID = '${params['selectedNodes'][0].id}'`; } - }); - }, + try { + const res = await getEntity({ + sqlcmd: sqlcmd, + entityName: + params['selectedNodes'][0].type == 'Action' ? 'MES_WO_ACTION' : 'MES_WO_OPER', + order: '', + }); + const setFieldsValue = params['useForms'].value['Action'][1]['setFieldsValue']; + const setFieldsValueNode = params['useForms'].value['Node'][1]['setFieldsValue']; + const resetFields = params['useForms'].value['Action'][1]['resetFields']; + const resetFieldsNode = params['useForms'].value['Node'][1]['resetFields']; + if (params['selectedNodes'][0].type == 'Action') { + resetFields(); + setFieldsValue({ + ID: res.Data.Items[0].ID, + ACT_ID: res.Data.Items[0].ACT_ID, + ROT_ID: res.Data.Items[0].ROT_ID, + NODE_ID: res.Data.Items[0].NODE_ID, + IS_ACTIVE: res.Data.Items[0].IS_ACTIVE, + ITEM_CODE: res.Data.Items[0].ITEM_CODE, + RULE_CODE: res.Data.Items[0].RULE_CODE, + TEST_CODE: res.Data.Items[0].TEST_CODE, + SAPL_CODE: res.Data.Items[0].SAPL_CODE, + LABEL_CODE: res.Data.Items[0].LABEL_CODE, + PKG_CODE: res.Data.Items[0].PKG_CODE, + ACT_CODE: res.Data.Items[0].ACT_CODE, + REMARK: res.Data.Items[0].REMARK, + WORK_ORDER: params['objParams'].value['CODE'], + ACT_TYPE: res.Data.Items[0].ACT_TYPE, + 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, + }); + /* 濡傛灉鏄寘瑁呰鍒� */ + 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 = 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 == 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(); + const wonode = await getEntity({ + sqlcmd: `WORK_ORDER ='${params['objParams'].value['CODE']}' AND ID = '${res.Data.Items[0].NODE_ID}'`, + entityName: 'MES_WO_NODE', + order: '', + }); + 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: + 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, + }); + result['name'] = 'Node'; + result['isShow'] = { + BAS_PKG_DTL: false, + ItemCode: false, + }; + } + useProdRoute.setcurDtl(result); + resolve(result); + } catch (e) { + reject(e); + } + }), /** * @description: 鑷畾涔夋彁浜ゆ柟娉� * @return {*} @@ -191,11 +404,16 @@ let entityName = ''; switch (type) { case 'Action': - entityName = 'MES_PROD_ACTION'; + entityName = 'MES_WO_ACTION'; break; case 'Node': - entityName = 'MES_PROD_OPER'; + entityName = 'MES_WO_OPER'; break; + } + 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) { @@ -210,6 +428,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; @@ -227,7 +448,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 }, //闇�瑕佸甫鍒板脊鍑虹獥鍙d腑鐨勬暟鎹� + 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: 寮瑰嚭閫夋嫨妗嗛�夋嫨鎴愬姛杩斿洖 @@ -235,28 +484,64 @@ * @param {*} u * @return {*} */ - GetSelectSuccess: (d, u, ...args) => { + GetSelectSuccess: async (d, u, ...args) => { let value = {}; switch (args[0]) { case 'scanadd': value = { - RULE_CODE: d.values['val'], + value: { + RULE_CODE: d.values['val'], + }, + 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 = { - ITEM_CODE: d.values['val'], + value: { + ITEM_CODE: d.values['val'], + }, + isShow: { BAS_PKG_DTL: false, ItemCode: true }, + data: data, + name: 'ItemCode', }; break; case 'printadd': value = { - LABEL_CODE: d.values['val'], + value: { + LABEL_CODE: d.values['val'], + }, + isShow: { BAS_PKG_DTL: false, ItemCode: false }, }; break; + case 'labeladd': + break; case 'pkgadd': + const ents = await getEntity({ + sqlcmd: `RULE_CODE ='${d.values['val']}'`, + entityName: 'V_BAS_PKG_DTL', + order: '', + }); value = { - pkgRULE_CODE: d.values['val'], + value: { + PKG_CODE: d.values['val'], + }, + isShow: { BAS_PKG_DTL: true, ItemCode: false }, + data: ents.Data.Items, + name: 'BAS_PKG_DTL', }; + break; case 'addRoute': if (isNullOrEmpty(args[1]['CODE'])) { createErrorModal({ @@ -265,29 +550,51 @@ }); return; } - let codes = d.values.id.split(','); - var i; - for (i = 0; i < codes.length; i++) { - if (d.which == 'addRoute') { - RouteToProd({ rotId: codes[i], prodCode: args[1]['CODE'] }); + /* 鏇存柊宸ュ崟鐘舵�佸苟鐢熸垚宸ュ崟鐨勫伐鑹鸿矾绾� */ + UpdateWoStatus({ + UserId: useUserStore().getUserInfo.userId as string, + WorkOrder: args[1]['CODE'], + Status: -1, + RouteStatus: 1, + WoBatch: '', + ActLine: '', + }).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, + WoBatch: '', + ActLine: '', + }); + createErrorModal({ + title: t('sys.api.errorTip'), + content: t(action.LocaleMsg), + }); + } + }); + } else { + createErrorModal({ + title: t('sys.api.errorTip'), + content: t(action.LocaleMsg), + }); } - } - - args[2](); + }); break; case 'addCustomer': if (isNullOrEmpty(args[1]['CODE'])) { createErrorModal({ title: t('sys.api.errorTip'), - content: '浜у搧涓虹┖锛屼笉鑳芥坊鍔犲伐鑹鸿矾绾匡紝璇风偣鍑诲乏渚ч�夋嫨浜у搧', + content: '宸ュ崟涓虹┖锛屼笉鑳芥坊鍔犲伐鑹鸿矾绾匡紝璇风偣鍑诲乏渚ч�夋嫨宸ュ崟', }); return; } - let 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 }); - } + SP_MES_WO2CUST({ wo: args[1]['CODE'] }); args[2](); break; @@ -303,6 +610,31 @@ addRoute: useModal(), addCustomer: useModal(), editRoute: useModal(), + scanadd: useModal(), + assyadd: useModal(), + 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(), }; }, /** @@ -310,10 +642,11 @@ * @param {string} type * @return {*} */ - GetTitle: (type: string) => { + GetTitle: (type: string, item) => { return { configTitle: type == 'Action' ? '琛屼负閰嶇疆' : '宸ュ簭閰嶇疆', navTitle: type == 'Product' ? '娣诲姞宸ヨ壓璺嚎' : '宸ヨ壓璺嚎缁存姢', + tableTitle: type == 'Action' ? (item == 'ItemCode' ? '涓婃枡鍒楄〃' : '鍖呰灞傜骇鍒楄〃') : '', }; }, /** @@ -321,24 +654,32 @@ * @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: { BAS_PKG_DTL: false, ItemCode: false }, }; if (isNullOrUnDef(selectedNodes)) { return result; } - if (selectedNodes.value[0].type == 'Product' || selectedNodes.value[0].type == 'Route') { + if (selectedNodes.value[0].type == 'WorkOrder' || selectedNodes.value[0].type == 'Route') { result.showNav = true; result.showConfig = 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 = { BAS_PKG_DTL: false, ItemCode: false }; + } else { + result.showOtherTable = { BAS_PKG_DTL: false, ItemCode: false }; + } } + useProdRoute.setCurSelectedNodes({ name: code, SelectedNodes: selectedNodes.value }); return result; }, /** @@ -348,7 +689,7 @@ GetNavItems: (type: string) => { let item: NavItem[] = []; switch (type) { - case 'Product': + case 'WorkOrder': item = [ { title: '娣诲姞浜у搧宸ヨ壓璺嚎', @@ -357,15 +698,16 @@ url: '/addRoute', action: 'addRoute', isStep: false, + isCustEl: false, }, - { - title: '娣诲姞瀹㈡埛宸ヨ壓璺嚎', - icon: 'add_customer|svg', - color: '#bf0c2c', - url: '/addCustomer', - action: 'addCustomer', - isStep: true, - }, + // { + // title: '娣诲姞瀹㈡埛宸ヨ壓璺嚎', + // icon: 'add_customer|svg', + // color: '#bf0c2c', + // url: '/addCustomer', + // action: 'addCustomer', + // isStep: true, + // }, ]; break; case 'Route': @@ -377,6 +719,7 @@ url: '/editRoute', action: 'editRoute', isStep: false, + isCustEl: false, }, ]; break; @@ -427,12 +770,23 @@ }); break; case 'addCustomer': - args[0](true, { - title: '璇峰畬鎴愪互涓嬫楠�', - }); + if (isNullOrEmpty(args[2][0]['wo'])) { + createErrorModal({ + title: t('sys.api.errorTip'), + content: '宸ュ崟涓虹┖锛屼笉鑳芥坊鍔犲伐鑹鸿矾绾匡紝璇风偣鍑诲乏渚ч�夋嫨宸ュ崟', + }); + return; + } + SP_MES_WO2CUST({ wo: args[2][0]['wo'] }); break; case 'editRoute': - args[1](true, { rotId: args[2][0].id, slotName: '' }); + args[1](true, { + rotId: args[2][0].wo, + slotName: '', + rotType: 'Wo', + prodCode: args[3], + custCode: args[2][0].cust, + }); break; } }, @@ -443,7 +797,7 @@ GetBaseCards: (type: string) => { let reusts: any[] = []; switch (type) { - case 'Product': + case 'WorkOrder': reusts = []; break; case 'Route': @@ -487,17 +841,262 @@ * @param {array} args * @return {*} */ - CustFunc: (param: CustModalParams) => { - if (param.cType == 'Route') { - // initRoute(args[0], args[1]); - } + CustFunc: async (param: CustModalParams) => { + 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); + } + }); }, - GetUseForm: () => { - return {}; + /** + * @description: 鑾峰彇鍙抽敭鑿滃崟鍒楄〃 + * @param {EventDataNode} node + * @return {*} + */ + GetRightMenuList: (node: EventDataNode, ...args): ContextMenuItem[] => { + const emit = args[0]; + const menu = [ + // { + // label: '鏂板', + // handler: () => { + // console.log('鐐瑰嚮浜嗘柊澧�', node); + // }, + // icon: 'bi:plus', + // }, + { + label: '鍒犻櫎', + handler: () => { + console.log('鐐瑰嚮浜嗗垹闄�', node); + DeleteWoRoute({ rotId: '', rotCode: node.code, wo: node.wo }).then((action) => { + if (action.IsSuccessed) { + emit('deletenode', node); + } else { + createErrorModal({ + title: t('sys.api.errorTip'), + content: t(action.LocaleMsg), + }); + } + }); + }, + icon: 'bx:bxs-folder-open', + }, + ]; + return node.type == 'Route' ? menu : []; }, }; /* 浠ヤ笅鏄唴閮ㄦ柟娉曪紝涓峞xport锛屼緵涓婇潰鐨勬柟娉曡皟鐢� */ + + let columns: BasicColumn[] = []; + /** + * @description: 鑾峰彇琛ㄦ牸瀛楁Json + * @param {string} type + * @return {*} + */ + function GetBaseColumns(type: string, emit, data: Ref<{}>) { + 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: 寮瑰嚭閫夋嫨妗�-鐗╂枡閫夋嫨妗嗛厤缃� @@ -649,13 +1248,19 @@ */ const actionFormShema: FormSchema[] = [ { - field: 'PROD_CODE', - label: '浜у搧缂栫爜', + field: 'WORK_ORDER', + label: '宸ュ崟鍙�', component: 'Input', dynamicDisabled: ({ values }) => { return true; }, colProps: { span: 12 }, + }, + { + field: 'PROD_CODE', + label: 'PROD_CODE', + component: 'Input', + show: false, }, { field: 'ID', @@ -704,7 +1309,7 @@ defaultValue: 0, componentProps: { api: GetEnum, - params: { name: 'MES_PROD_ACTION+ACT_TYPEs' }, + params: { name: 'MES_WO_ACTION+ACT_TYPEs' }, resultField: 'Data', labelField: unref(getLocale) == 'zh_CN' ? 'Desc' : 'Name', valueField: 'Value', @@ -739,7 +1344,7 @@ field: 'RULE_CODE', label: '鎵爜楠岃瘉', component: 'Input', - colProps: { span: 10 }, + colProps: { span: 11 }, ifShow: ({ values }) => isScan(values.ACT_TYPE), }, { @@ -747,14 +1352,14 @@ label: '1', defaultValue: '', component: 'Input', - colProps: { span: 2, pull: 1 }, + colProps: { span: 1, pull: window.screen.width == 1366 ? -1 : 1 }, ifShow: ({ values }) => isScan(values.ACT_TYPE), colSlot: 'scanadd', }, { field: 'ITEM_CODE', label: '缁勮涓婃枡', - colProps: { span: 10 }, + colProps: { span: 11 }, component: 'Input', ifShow: ({ values }) => isAssy(values.ACT_TYPE), }, @@ -763,14 +1368,14 @@ label: '1', defaultValue: '', component: 'Input', - colProps: { span: 2, pull: 1 }, + colProps: { span: 1, pull: window.screen.width == 1366 ? -1 : 1 }, ifShow: ({ values }) => isAssy(values.ACT_TYPE), colSlot: 'assyadd', }, { field: 'TEST_CODE', label: '浜у搧娴嬭瘯', - colProps: { span: 10 }, + colProps: { span: 11 }, component: 'Input', ifShow: ({ values }) => isTest(values.ACT_TYPE), }, @@ -779,14 +1384,14 @@ label: '1', defaultValue: '', component: 'Input', - colProps: { span: 2, pull: 1 }, + colProps: { span: 1, pull: window.screen.width == 1366 ? -1 : 1 }, ifShow: ({ values }) => isTest(values.ACT_TYPE), colSlot: 'testadd', }, { field: 'SAPL_CODE', label: '浜у搧鎶芥', - colProps: { span: 10 }, + colProps: { span: 11 }, component: 'Input', ifShow: ({ values }) => isAudit(values.ACT_TYPE), }, @@ -795,14 +1400,14 @@ label: '1', defaultValue: '', component: 'Input', - colProps: { span: 2, 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: 10 }, + colProps: { span: 9 }, component: 'Input', ifShow: ({ values }) => isPrint(values.ACT_TYPE), }, @@ -811,14 +1416,23 @@ label: '1', defaultValue: '', component: 'Input', - colProps: { span: 2, pull: 1 }, + colProps: { span: 2 }, //{ span: 2, pull: window.screen.width == 1366 ? -1 : 1 }, ifShow: ({ values }) => isPrint(values.ACT_TYPE), colSlot: 'printadd', }, { - field: 'pkgRULE_CODE', + 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: 10 }, + colProps: window.screen.width == 2560 ? { span: 10 } : { span: 11 }, component: 'Input', ifShow: ({ values }) => isPackage(values.ACT_TYPE), }, @@ -827,15 +1441,47 @@ label: '1', defaultValue: '', component: 'Input', - colProps: { span: 2, 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', label: '澶囨敞', component: 'Input', colProps: { span: 12 }, + }, + { + field: 'OPTION_1', + label: '琛屼负閫夐」1', + component: 'Input', + colProps: { span: 12 }, + show: false, }, ]; @@ -845,13 +1491,19 @@ */ const nodeFormShema: FormSchema[] = [ { - field: 'PROD_CODE', - label: '浜у搧缂栫爜', + field: 'WORK_ORDER', + label: '宸ュ崟鍙�', component: 'Input', dynamicDisabled: ({ values }) => { return true; }, colProps: { span: 12 }, + }, + { + field: 'PROD_CODE', + label: 'PROD_CODE', + component: 'Input', + show: false, }, { field: 'ID', @@ -1002,6 +1654,27 @@ }, }, { + field: 'ALLOW_DFT_IN', + label: '鏄惁鍏佽涓嶈壇鍝佽繘绔�', + required: true, + component: 'Select', + colProps: { span: 12 }, + componentProps: { + options: [ + { + label: '鏄�', + value: 'Y', + key: 'Y', + }, + { + label: '鍚�', + value: 'N', + key: 'N', + }, + ], + }, + }, + { field: 'REMARK', label: '澶囨敞', component: 'Input', @@ -1009,6 +1682,238 @@ }, ]; + const crudForms = { + BAS_PKG_DTL: [ + { + label: '鍖呰瑙勫垯ID', + field: 'PKG_RULE_ID', + component: 'Input', + colProps: { + span: 24, + }, + dynamicDisabled: ({ values }) => { + return true; + }, + }, + { + label: '鍖呰灞傜骇', + field: 'PKG_LEVEL', + component: 'Input', + colProps: { + span: 24, + }, + dynamicDisabled: ({ values }) => { + return true; + }, + }, + { + field: 'PKG_CODE', + label: '鍖呰/杞藉叿缂栫爜', + component: 'Input', + colProps: { + span: 24, + }, + dynamicDisabled: ({ values }) => { + return true; + }, + }, + { + label: '鍖呰鏁伴噺', + field: 'PKG_QTY', + component: 'Input', + colProps: { + span: 24, + }, + dynamicDisabled: ({ values }) => { + return true; + }, + }, + { + field: 'LABEL_CODE', + label: '妯℃澘缂栫爜', + component: 'Input', + show: true, + // required: true, + colProps: { + span: 22, + }, + }, + { + field: 'BAS_LABEL_TEMP1PSelect_0', //鎸変綆浠g爜閰嶇疆鐨勮鍒欙紝瀹炰綋鍚�+搴忓彿+PSelect_0锛屽簭鍙风敤鏉ュ尯鍒嗗涓殑鏃跺�欙紝PSelect_0杩欐槸涓浐瀹氬悗缂� + label: '1', + defaultValue: 'BAS_LABEL_TEMP', + component: 'Input', + colProps: { span: 2 }, + colSlot: 'BAS_LABEL_TEMP1add', //鎸変綆浠g爜閰嶇疆鐨勮鍒欙紝瀹炰綋鍚�+搴忓彿+add锛屽簭鍙风敤鏉ュ尯鍒嗗涓殑鏃跺�欙紝add杩欐槸涓浐瀹氬悗缂� + }, + { + label: '鍖呰鍚嶇О', + field: 'PKG_NAME', + component: 'Input', + colProps: { + span: 24, + }, + show: false, + }, + { + label: '澶囨敞', + field: 'REMARK', + component: 'Input', + colProps: { + span: 24, + }, + dynamicDisabled: ({ values }) => { + return true; + }, + }, + { + label: 'ID', + field: 'ID', + component: 'Input', + colProps: { + span: 24, + }, + 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', //鎸変綆浠g爜閰嶇疆鐨勮鍒欙紝瀹炰綋鍚�+搴忓彿+PSelect_0锛屽簭鍙风敤鏉ュ尯鍒嗗涓殑鏃跺�欙紝PSelect_0杩欐槸涓浐瀹氬悗缂� + label: '1', + defaultValue: 'BAS_CODE_RULE', + component: 'Input', + colProps: { span: 2 }, + colSlot: 'BAS_CODE_RULE1add', //鎸変綆浠g爜閰嶇疆鐨勮鍒欙紝瀹炰綋鍚�+搴忓彿+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 }, //闇�瑕佸甫鍒板脊鍑虹獥鍙d腑鐨勬暟鎹� + 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