|
|
@@ -94,9 +94,6 @@
|
|
|
</el-table>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <!--加入排产【弹窗】-->
|
|
|
- <!--暂停完工【弹窗】-->
|
|
|
- <!--暂停完工【弹窗】-->
|
|
|
<!--机组调整【弹窗】-->
|
|
|
<el-dialog v-model="jizuDisplay" title="机组调整" style="width: 600px;">
|
|
|
<el-row class="">
|
|
|
@@ -251,7 +248,7 @@
|
|
|
<layout>
|
|
|
<layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
|
|
|
<div class="JKWTree-tree" style="height: 200px">
|
|
|
- <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
|
|
|
+ <el-tree :data="treeData" :props="defaultProps" :current-node-key="currentNodeKey" @node-click="handleNodeClick"></el-tree>
|
|
|
</div>
|
|
|
</layout-sider>
|
|
|
<layout-content>
|
|
|
@@ -692,6 +689,8 @@ const tableData = ref([]);
|
|
|
const _machine = ref(null);
|
|
|
const treeType = ref('customTree') // dataTree // 计划中，排产中 ,dataTree 车间
|
|
|
const handleNodeClick = async (node) => {
|
|
|
+ // console.log(node)
|
|
|
+ // console.log(node['$treeNodeId'])
|
|
|
if (node.type && node.type === '__customer') {
|
|
|
treeType.value = 'customTree'
|
|
|
schandleNodeClick(node)
|
|
|
@@ -701,7 +700,12 @@ const handleNodeClick = async (node) => {
|
|
|
// 使用字符串分割获取#前面的数据
|
|
|
const dataBeforeHash = custom_code.split('#')[0].trim();
|
|
|
_machine.value = dataBeforeHash + '#';
|
|
|
- console.log(_machine.value)
|
|
|
+ if(_machine.value && node['$treeNodeId']){
|
|
|
+ console.log(_machine.value)
|
|
|
+ console.log(node['$treeNodeId'])
|
|
|
+ return 'el-background-color';
|
|
|
+ }
|
|
|
+ console.log('机台' + _machine.value)
|
|
|
const zhubiao = await MachineWorkOrderList({ machine:_machine.value})
|
|
|
chejianData.value = zhubiao.data['排程'];
|
|
|
chejianfuData.value = zhubiao.data['制程'];
|
|
|
@@ -1609,6 +1613,10 @@ const rowContextMenu = (row) => {
|
|
|
:deep(.hui-plan-usage-low div) {
|
|
|
color: #8c939d !important;
|
|
|
}
|
|
|
+/*点击车间机台*/
|
|
|
+:deep(.el-background-color) {
|
|
|
+ color: red !important;
|
|
|
+}
|
|
|
/*工序状态更正颜色【蓝色】*/
|
|
|
:deep(.lan-plan-usage-low div) {
|
|
|
color: blue !important;
|
