|
|
|
@ -50,28 +50,32 @@ |
|
|
|
></el-main> |
|
|
|
<el-aside width="500px"> |
|
|
|
<el-tabs v-model="activeName"> |
|
|
|
<el-tab-pane label="人员配置" name="process"> |
|
|
|
<el-tab-pane label="工序工位" name="workstation"> |
|
|
|
<!-- <el-button>调整人员</el-button> |
|
|
|
<el-button>调整设备</el-button> --> |
|
|
|
<el-table :data="processData" ref="tableProcess" style="width: 100%; height: 80%"> |
|
|
|
<el-table-column prop="name" label="人员"> |
|
|
|
<el-table-column prop="name" label="工作位置"> |
|
|
|
<template #default="scope"> |
|
|
|
<el-button size="mini" text @click="userAddNode(scope.row)" style="width: 100%" |
|
|
|
<el-button size="mini" text style="width: 100%" |
|
|
|
>{{ scope.row.name }}[{{ scope.row.code }}]</el-button |
|
|
|
> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="code" label="工序编码" width="180" v-if="false" /> |
|
|
|
|
|
|
|
</el-table> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="工作位置配置" name="ddddd"> |
|
|
|
<el-tab-pane label="工序物料" name="materials"> |
|
|
|
<el-table :data="processData" ref="tableProcess" style="width: 100%; height: 80%"> |
|
|
|
<el-table-column prop="name" label="工作位置"> |
|
|
|
<template #default="scope"> |
|
|
|
<el-button size="mini" text @click="userAddNode(scope.row)" style="width: 100%" |
|
|
|
<el-button size="mini" text style="width: 100%" |
|
|
|
>{{ scope.row.name }}[{{ scope.row.code }}]</el-button |
|
|
|
> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="code" label="工序编码" width="180" v-if="false" /> |
|
|
|
<el-table-column prop="code" label="替换物料" width="180" v-if="false" /> |
|
|
|
</el-table> |
|
|
|
</el-tab-pane> |
|
|
|
</el-tabs> |
|
|
|
@ -97,7 +101,7 @@ import { |
|
|
|
getNewNode |
|
|
|
} from '@/views/mes/processroute/components/graphbase.data' |
|
|
|
import * as ProcessrouteApi from '@/api/mes/processroute' |
|
|
|
import {ProcessSearch} from './processSearch.data' |
|
|
|
import {ProcessSearch} from '../../publicUtil/processSearch.data' |
|
|
|
import * as ProcessApi from '@/api/wms/process' |
|
|
|
import { SearchTable } from '@/components/SearchTable' |
|
|
|
import { Graph } from '@antv/x6' |
|
|
|
@ -143,86 +147,6 @@ const dialogWidth = ref() |
|
|
|
const dialogVisible = ref(false) // 弹窗的是否展示 |
|
|
|
const dialogTitle = ref('') // 弹窗的标题 |
|
|
|
let graphJson = { |
|
|
|
cells: [ |
|
|
|
{ |
|
|
|
position: { |
|
|
|
x: 40, |
|
|
|
y: 40 |
|
|
|
}, |
|
|
|
size: { |
|
|
|
width: 100, |
|
|
|
height: 40 |
|
|
|
}, |
|
|
|
attrs: { |
|
|
|
text: { |
|
|
|
text: 'Hello' |
|
|
|
}, |
|
|
|
body: { |
|
|
|
stroke: '#8f8f8f', |
|
|
|
strokeWidth: 1, |
|
|
|
fill: '#fff', |
|
|
|
rx: 6, |
|
|
|
ry: 6 |
|
|
|
} |
|
|
|
}, |
|
|
|
visible: true, |
|
|
|
shape: 'rect', |
|
|
|
id: 'adbc20c6-96e4-4792-9e5b-42df6066cff0', |
|
|
|
zIndex: 1 |
|
|
|
}, |
|
|
|
{ |
|
|
|
position: { |
|
|
|
x: 240, |
|
|
|
y: 180 |
|
|
|
}, |
|
|
|
size: { |
|
|
|
width: 100, |
|
|
|
height: 40 |
|
|
|
}, |
|
|
|
attrs: { |
|
|
|
text: { |
|
|
|
text: 'World' |
|
|
|
}, |
|
|
|
body: { |
|
|
|
stroke: '#8f8f8f', |
|
|
|
strokeWidth: 1, |
|
|
|
fill: '#fff', |
|
|
|
rx: 6, |
|
|
|
ry: 6 |
|
|
|
} |
|
|
|
}, |
|
|
|
visible: true, |
|
|
|
shape: 'ellipse', |
|
|
|
id: '9b1f1e94-a01f-4902-bfae-4e6e81029261', |
|
|
|
zIndex: 2 |
|
|
|
}, |
|
|
|
{ |
|
|
|
shape: 'edge', |
|
|
|
attrs: { |
|
|
|
line: { |
|
|
|
stroke: '#8f8f8f', |
|
|
|
strokeWidth: 1 |
|
|
|
} |
|
|
|
}, |
|
|
|
id: '8fd50f13-22ba-41ff-b54a-eb6d8553c3d7', |
|
|
|
source: { |
|
|
|
cell: 'adbc20c6-96e4-4792-9e5b-42df6066cff0' |
|
|
|
}, |
|
|
|
target: { |
|
|
|
cell: '9b1f1e94-a01f-4902-bfae-4e6e81029261' |
|
|
|
}, |
|
|
|
labels: [ |
|
|
|
{ |
|
|
|
attrs: { |
|
|
|
label: { |
|
|
|
text: 'X6' |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
], |
|
|
|
zIndex: 3 |
|
|
|
} |
|
|
|
] |
|
|
|
} |
|
|
|
/** 打开弹窗 */ |
|
|
|
const open = async (type: string, row?: any, titleName?: any) => { |
|
|
|
@ -230,7 +154,7 @@ const open = async (type: string, row?: any, titleName?: any) => { |
|
|
|
detailData.value = row |
|
|
|
dialogWidth.value = props.basicFormWidth + '%' |
|
|
|
//获取配置的 |
|
|
|
getProcessroute('001') |
|
|
|
await ProcessrouteApi.getProcessroute(row.processrouteCode) |
|
|
|
if (titleName) { |
|
|
|
dialogTitle.value = t('action.' + titleName) |
|
|
|
} else { |
|
|
|
@ -280,7 +204,7 @@ const searchTableRef = ref() |
|
|
|
|
|
|
|
const opensearchTable = ( |
|
|
|
) => { |
|
|
|
console.log("opensearchTable") |
|
|
|
//console.log("opensearchTable") |
|
|
|
const _searchCondition = {} |
|
|
|
const _searchTableTitle = "工序查询" |
|
|
|
const _searchTableAllSchemas = ProcessSearch.allSchemas |
|
|
|
@ -310,8 +234,6 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { |
|
|
|
processData.value.push({code:item.code,name:item.name})} |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//emit('searchTableSuccess', formField, searchField, val, undefined, type, row) |
|
|
|
} |
|
|
|
const deleteNode=(row)=>{ |
|
|
|
|
