From 943954bdcb3b672b89cfa097e53d2ac17a36a101 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 30 六月 2024 13:13:25 +0800
Subject: [PATCH] 产品工艺路线路由节点选择功能更新
---
src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue | 327 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 270 insertions(+), 57 deletions(-)
diff --git a/src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue b/src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue
index 55c2500..0342a53 100644
--- a/src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue
+++ b/src/views/tigerprojects/mes/prod/biz_mes_wo/index.vue
@@ -1,8 +1,16 @@
+<!--
+ * @Description: 宸ュ崟绠＄悊椤甸潰
+ * @Author: Ben Lin
+ * @version:
+ * @Date: 2024-05-25 00:27:00
+ * @LastEditors: Ben Lin
+ * @LastEditTime: 2024-06-28 11:40:38
+-->
<template>
<div>
<BasicTable @register="registerTable">
<template #toolbar>
- <a-button color="primary" @click="addWo" preIcon="add_02|svg"> 鏂板 </a-button>
+ <a-button type="primary" @click="addWo" preIcon="add_02|svg"> 鏂板 </a-button>
<a-button ghost color="success" @click="ExcelToDb" preIcon="excel-import|svg">
瀵煎叆
</a-button>
@@ -15,7 +23,7 @@
@click="handleSelectItem"
preIcon="search|svg"
/>
- <NormalModal @register="registerItemAdd" @success="handleItemSuccess" />
+ <GeneralModal @register="registerItemAdd" @success="handleItemSuccess" />
</template>
<template #action="{ record }">
<TableAction
@@ -62,39 +70,45 @@
<Loading :loading="compState.loading" :tip="compState.tip" />
<WoDrawer @register="registerDrawer" @success="handleSuccess" />
<WoModal @register="registerWo" @success="handleSuccess" :title="title" :mtitle="mtitle" />
+ <!-- 鑷畾涔夋ā鎬佹锛屽彲浠ヨ嚜瀹氫箟澶氳〃鍗� -->
<CustModal
@register="registerCust"
@success="custSuccess"
:type="cType"
:detailSlots="dtlSlots"
>
+ <!-- 鐢ㄦ彃妲借嚜瀹氫箟澶氳〃鍗� -->
<template #[item.name] v-for="item in dtlSlots" :key="item.name">
- <BasicForm @register="useFormData[item.name][0]">
- <template #[sitem]="{ field }" v-for="sitem in item.slots" :key="sitem">
+ <BasicForm @register="useFormData[item.name][0]" v-if="useFormData[item.name]">
+ <!-- 鐢ㄦ彃妲借嚜瀹氫箟寮瑰嚭閫夋嫨妗� -->
+ <template #[name]="{ field }" v-for="name in item.slots" :key="name">
<a-button
class="mt-1 ml-1"
size="small"
@click="handleCustClick(field)"
- :preIcon="item.preIcons[sitem]"
+ :preIcon="item.preIcons[name]"
+ />
+ <GeneralModal
+ @register="useModalData[name][0]"
+ @success="(d, u) => handleEntSuccess(d, u, item.name)"
/>
</template>
</BasicForm>
- <NormalModal
- @register="registerEntity"
- @success="(d, u) => handleEntSuccess(d, u, item.name)"
- />
+ <!-- 鑷畾涔夊唴瀹� -->
+ <div style="height: 200px" id="lfContainer" v-if="isCustEl[item.name]"></div>
</template>
</CustModal>
<RouteViewModal @register="registerRv" @success="RvItemSuccess" />
</div>
</template>
<script lang="ts" setup>
- import { reactive, unref, h, onMounted, ref, nextTick } from 'vue';
+ import { reactive, unref, h, onMounted, ref, nextTick, Ref } from 'vue';
+ import { Steps, Step, Layout, LayoutContent } from 'ant-design-vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { BasicForm, FormSchema, FormActionType, useForm } from '/@/components/Form/index';
import WoDrawer from './WoDrawer.vue';
import WoModal from './WoModal.vue';
- import NormalModal from '/@/views/components/NormalModal.vue';
+ import GeneralModal from '/@/views/components/GeneralModal.vue';
import RouteViewModal from '/@/views/components/RouteViewModal.vue';
import CustModal from '/@/views/components/CustModal.vue';
import { useDrawer } from '/@/components/Drawer';
@@ -104,23 +118,35 @@
import { useMessage } from '/@/hooks/web/useMessage';
import { useI18n } from '/@/hooks/web/useI18n';
import { useModal } from '/@/components/Modal';
- import { getListByPage } from '/@/api/tigerapi/system';
+ import { SaveEntity, getListByPage } from '/@/api/tigerapi/system';
import { GetSelectSuccess, OpenSelectItem, getFormSchema } from '/@/views/components/data';
+ import LogicFlow from '@logicflow/core';
+ import { getRouteData } from '/@/api/tigerapi/mes/router';
+ import actionRect from '/@/components/FlowChart/src/actionRect';
+ import TestNode from '/@/components/FlowChart/src/TestNode';
+ import CollectNode from '/@/components/FlowChart/src/CollectNode';
+ import AssemblyNode from '/@/components/FlowChart/src/AssemblyNode';
+ import PackingNode from '/@/components/FlowChart/src/PackingNode';
+ import RepairNode from '/@/components/FlowChart/src/RepairNode';
+ import customEdge from '/@/components/FlowChart/src/customEdge';
+ import { BpmnElement } from '@logicflow/extension';
const { t } = useI18n();
+ const ASteps = Steps;
+ const AStep = Step;
const cType = ref('');
const title = ref('宸ュ崟瀵煎叆');
const mtitle = ref('宸ュ崟鍒楄〃');
const dtlSlots = ref([] as any[]);
const selectVals = ref({});
- const { createMessage } = useMessage();
+ const { createMessage, createErrorModal } = useMessage();
const [registerDrawer, { openDrawer }] = useDrawer();
const compState = reactive({
absolute: false,
loading: false,
tip: '鍔犺浇涓�...',
});
- const [registerEntity, { openModal: openEntModal }] = useModal();
+ const lfInstance = ref(null) as Ref<LogicFlow | null>;
const [registerRv, { openModal: openRvModal }] = useModal();
const [registerWo, { openModal: openWoModal }] = useModal();
const [registerItemAdd, { openModal: openItemModal }] = useModal();
@@ -146,10 +172,27 @@
bordered: true,
showIndexColumn: false,
});
+ const routeData = ref({
+ nodes: [],
+ edges: [],
+ });
const formSchema = ref([] as FormSchema[]);
- const woSchema = ref([] as FormSchema[]);
- const prodSchema = ref([] as FormSchema[]);
- const xxSchema = ref([] as FormSchema[]);
+ const woSchema = ref<FormSchema[]>(getFormSchema('woinfo'));
+ const prodSchema = ref<FormSchema[]>(getFormSchema('prodinfo'));
+ const isCustEl = ref({
+ forminfo: false,
+ woinfo: false,
+ prodinfo: false,
+ rotinfo: true,
+ });
+ //琛ㄥ崟涓彃妲芥覆鏌撴寜閽墦寮�妯℃�佹useModal鏂规硶
+ const useModalData = ref({
+ add: useModal(),
+ set: useModal(),
+ addRot: useModal(),
+ setRot: useModal(),
+ });
+ //鑷畾涔夊琛ㄥ崟瀹炰緥
const useFormData = ref({
forminfo: useForm({
labelWidth: 120,
@@ -175,17 +218,17 @@
},
showActionButtonGroup: false,
}),
- xxinfo: useForm({
- labelWidth: 120,
- schemas: xxSchema,
- actionColOptions: {
- span: 24,
- },
- showActionButtonGroup: false,
- }),
+ // rotinfo: useForm({
+ // labelWidth: 120,
+ // schemas: rotSchema,
+ // actionColOptions: {
+ // span: 24,
+ // },
+ // showActionButtonGroup: false,
+ // }),
});
- onMounted(() => {});
+ onMounted(async () => {});
//鏂板
function addWo() {
@@ -215,25 +258,55 @@
cType.value = 'BIZ_MES_WO_Config';
dtlSlots.value = [
{ name: 'woinfo', slots: [], preIcons: {}, title: '宸ュ崟淇℃伅' },
- { name: 'prodinfo', slots: [], preIcons: {}, title: '浜у搧淇℃伅' },
- { name: 'xxinfo', slots: ['add'], preIcons: { add: 'search|svg' }, title: 'XXX' },
+ {
+ name: 'prodinfo',
+ slots: ['addRot', 'setRot'],
+ preIcons: { addRot: 'search|svg', setRot: 'config|svg' },
+ title: '浜у搧淇℃伅',
+ },
+ { name: 'rotinfo', slots: ['add'], preIcons: { add: 'search|svg' }, title: '宸ヨ壓淇℃伅' },
];
- woSchema.value = getFormSchema('woinfo');
- prodSchema.value = getFormSchema('prodinfo');
- xxSchema.value = getFormSchema('xxinfo');
+ // rotSchema.value = getFormSchema('rotinfo');
+ //宸ヨ壓璺嚎娓叉煋鍥惧垵濮嬪寲
+ if (lfInstance.value != null) {
+ routeData.value = {
+ nodes: [],
+ edges: [],
+ };
+ const lf = unref(lfInstance)!;
+ lf.render({});
+ }
+ selectVals.value['ROUTE_CODE'] = record.ROUTE_CODE;
openCustModal(true, {
isUpdate: true,
ctype: cType,
title: '宸ヨ壓閰嶇疆',
width: '1000px',
formEl: useFormData.value, //濡傛灉鏄涓〃鍗曪紝澧炲姞澶氫釜鎻掓Ы
- formElName: ['woinfo', 'prodinfo', 'xxinfo'],
+ formElName: ['woinfo', 'prodinfo', 'rotinfo'], //琛ㄥ崟鎻掓Ы鍚嶇О锛屾敮鎸佸涓〃鍗�
RowKey: '',
- ...record,
+ fnName: { BIZ_MES_WO_Config: 'SaveCofig' }, //淇濆瓨鏂规硶鍚�
+ initFnName: { BIZ_MES_WO_Config: 'initRoute' }, //鍒濆鍖栨柟娉曞悕
+ isCustEl: isCustEl.value,
+ others: routeData.value,
+ values: record, //琛ㄥ崟璁板綍
});
}
- //涓嬪彂
+
+ /**
+ * @description: 涓嬪彂
+ * @param {*} record
+ * @return {*}
+ */
function handleRelease(record: Recordable) {
+ if (record.STATUS == 2) {
+ createErrorModal({
+ title: t('璀﹀憡'),
+ content: t('宸ュ崟宸茬粡涓嬪彂锛屼笉鑳藉啀涓嬪彂锛�'),
+ getContainer: () => document.body,
+ });
+ return;
+ }
cType.value = 'BIZ_MES_WO';
dtlSlots.value = [
{
@@ -250,22 +323,75 @@
title: '宸ュ崟涓嬪彂', //鏍囬
width: '900px', //寮瑰嚭妗嗗搴�
formEl: useFormData.value,
- formElName: ['forminfo'],
+ formElName: ['forminfo'], //琛ㄥ崟鎻掓Ы鍚嶇О
RowKeys: { add: 'ROUTE_CODE', set: 'ROUTE_CODE' }, //鎻掓Ы鐨勫脊鍑烘閫夋嫨鐨刢ode
- ...record,
+ fnName: { BIZ_MES_WO: 'SaveWoBatch' }, //淇濆瓨鏂规硶鍚�
+ initFnName: {}, //鍒濆鍖栨柟娉曞悕
+ isCustEl: isCustEl.value,
+ values: record, //琛ㄥ崟璁板綍
});
}
- function custSuccess(d) {
- reload();
+
+ /**
+ * @description: 鍙栨秷涓嬪彂
+ * @param {*} record
+ * @return {*}
+ */
+ function handleUnRelease(record: Recordable) {
+ if (record.STATUS == 0) {
+ createErrorModal({
+ title: t('璀﹀憡'),
+ content: t('宸ュ崟鏄垵濮嬪寲鐘舵�侊紝涓嶈兘鍙栨秷涓嬪彂锛�'),
+ getContainer: () => document.body,
+ });
+ return;
+ }
+ record.STATUS = 0;
+ SaveEntity(record, true, 'BIZ_MES_WO').then((action) => {
+ if (action.IsSuccessed) {
+ createMessage.success(t('宸插彇娑堜笅鍙�'));
+ reload();
+ } else {
+ createMessage.success(t('鍙栨秷涓嬪彂鎿嶄綔澶辫触'));
+ }
+ });
}
- //鍙栨秷涓嬪彂
- function handleUnRelease(record: Recordable) {}
//鏆傚仠
- function handlePause(record: Recordable) {}
- //鍒犻櫎
+ function handlePause(record: Recordable) {
+ if (record.STATUS == 0) {
+ createErrorModal({
+ title: t('璀﹀憡'),
+ content: t('宸ュ崟鏄垵濮嬪寲鐘舵�侊紝涓嶈兘鏆傚仠锛�'),
+ getContainer: () => document.body,
+ });
+ return;
+ }
+ if (record.STATUS == 5) {
+ createErrorModal({
+ title: t('璀﹀憡'),
+ content: t('宸ュ崟鏄畬鎴愮姸鎬侊紝涓嶈兘鏆傚仠锛�'),
+ getContainer: () => document.body,
+ });
+ return;
+ }
+ record.STATUS = 4;
+ SaveEntity(record, true, 'BIZ_MES_WO').then((action) => {
+ if (action.IsSuccessed) {
+ createMessage.success(t('宸叉殏鍋�'));
+ reload();
+ } else {
+ createMessage.success(t('鏆傚仠鎿嶄綔澶辫触'));
+ }
+ });
+ }
+
+ /**
+ * @description: 鍒犻櫎
+ * @param {*} record
+ * @return {*}
+ */
function handleDelete(record: Recordable) {
- const apiAction = DeleteMesWo(record.ID);
- apiAction.then((action) => {
+ DeleteMesWo(record.ID).then((action) => {
if (action.IsSuccessed) {
createMessage.success(t('宸插垹闄�'));
reload();
@@ -274,7 +400,20 @@
}
});
}
- //鐐瑰嚮鎵撳紑鐗╂枡鍒楄〃妗�
+
+ /**
+ * @description: 寮瑰嚭妗嗙‘瀹氳繑鍥�
+ * @param {*} d
+ * @return {*}
+ */
+ function custSuccess(d) {
+ reload();
+ }
+
+ /**
+ * @description: 鐐瑰嚮鎵撳紑鐗╂枡鍒楄〃妗�
+ * @return {*}
+ */
function handleSelectItem() {
openItemModal(true, {
title: '鐗╂枡鍒楄〃',
@@ -306,35 +445,109 @@
],
tableName: 'BAS_ITEM',
rowKey: 'ITEM_CODE',
+ searchInfo: {TABLE_NAME: 'BAS_ITEM'}
});
}
+ /**
+ * @description: 寮瑰嚭閫夋嫨鐗╂枡妗嗚繑鍥炴垚鍔熸柟娉�
+ * @param {*} d
+ * @param {*} u
+ * @return {*}
+ */
function handleItemSuccess(d, u) {
getForm().setFieldsValue({
ITEM_CODE: d.values['val'],
});
}
- /* 寮瑰嚭閫夋嫨妗嗛�夋嫨鎴愬姛鍚庝簨浠� */
+
+ /**
+ * @description: 鍚勮〃鍗曞唴寮瑰嚭閫夋嫨妗嗛�夋嫨鎴愬姛鍚庢柟娉�
+ * @param {*} d
+ * @param {*} u
+ * @param {*} item
+ * @return {*}
+ */
function handleEntSuccess(d, u, item) {
var values = GetSelectSuccess(d, u, cType.value);
selectVals.value = values; //淇濆瓨寮瑰嚭妗嗛�夋嫨鐨勭粨鏋�
let _val = {};
_val[d.returnFieldName] = values[d.returnFieldName];
- if (item == 'forminfo') {
- useFormData.value['forminfo'][1].setFieldsValue(_val);
- }
- if (item == 'prodinfo') {
- useFormData.value['prodinfo'][1].setFieldsValue(_val);
- }
- if (item == 'woinfo') {
- useFormData.value['woinfo'][1].setFieldsValue(_val);
+ useFormData.value[item][1].setFieldsValue(_val);
+ if (d.returnFieldName == 'ROUTE_CODE' && cType.value == 'BIZ_MES_WO_Config') {
+ routeData.value = {
+ nodes: [],
+ edges: [],
+ };
+ init(selectVals.value['ROUTE_CODE']);
}
}
- /* 寮瑰嚭閫夋嫨妗� */
+ /**
+ * @description: 寮瑰嚭閫夋嫨妗�
+ * @param {*} item
+ * @return {*}
+ */
function handleCustClick(item) {
- // openRvModal(true, {});
- OpenSelectItem(openEntModal, cType.value, item, [openRvModal], selectVals.value['ID']);
+ //鎵撳紑鑷畾涔夋ā鎬佹
+ OpenSelectItem(
+ useModalData.value[item][1].openModal, //甯﹀叆openModal鏂规硶
+ cType.value,
+ item,
+ [openRvModal],
+ selectVals.value['ROUTE_CODE'],
+ ); //[openRvModal], selectVals.value['ID']杩欐槸鑷畾涔夊弬鏁帮紝鎸夊疄闄呴渶姹�
}
function RvItemSuccess(d, u) {}
+
+ async function init(rotId) {
+ LogicFlow.use(BpmnElement);
+ lfInstance.value = new LogicFlow({
+ container: document.querySelector('#lfContainer'),
+ edgeGenerator: (sourceNode) => {
+ // console.log('a');
+ // 璧峰鑺傜偣绫诲瀷 rect 鏃朵娇鐢� 鑷畾涔夌殑杈� custom-edge
+ if (sourceNode.properties.isReturn) return 'custom-edge';
+ // if (sourceNode.type === 'rect') return 'custom-edge';
+ // return 'custom-edge';
+ },
+ });
+ const lf = unref(lfInstance)!;
+ // lf?.setDefaultEdgeType('line');
+ lf.register(customEdge);
+ lf.register(actionRect);
+ lf.register(TestNode);
+ lf.register(CollectNode);
+ lf.register(AssemblyNode);
+ lf.register(PackingNode);
+ lf.register(RepairNode);
+ lf.render({});
+ //閫氳繃宸ヨ壓璺嚎ID鑾峰彇鍥惧舰鏁版嵁锛屽苟娓叉煋
+ var _data = await getRouteData(rotId);
+ console.log('缁勪欢宸叉寕杞�', _data);
+ //宸ヨ壓璺嚎鍏ㄤ俊鎭紝鍖呮嫭Node銆丒dge鍜孉ct
+ // routeConfig.routeData = _data.Data;
+ if (_data.Data != null) {
+ //宸ヨ壓璺嚎涓讳俊鎭�
+ var currRoute = _data.Data.route;
+ _data.Data.nodes.forEach((n) => {
+ n.node.properties = JSON.parse(n.node.properties);
+ routeData.value.nodes.push(n.node);
+ });
+ console.log('111', routeData.value);
+ _data.Data.edges.forEach((e) => {
+ e.edge.properties = JSON.parse(e.edge.properties);
+ routeData.value.edges.push(e.edge);
+ });
+ _data.Data.acts.forEach((act) => {
+ act.node.properties = JSON.parse(act.node.properties);
+ routeData.value.nodes.push(act.node);
+ });
+ console.log('init', unref(lf).getGraphData(), JSON.parse(JSON.stringify(routeData.value)));
+ lf.render(routeData.value);
+ // lf.graphModel.resize(500, 400);
+ lf.graphModel.fitView();
+ lf.graphModel.translateCenter();
+ }
+ }
</script>
--
Gitblit v1.9.3