From 61a19a514eed8796ee2c6e7ab1111addf053cf67 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 28 五月 2025 15:46:18 +0800
Subject: [PATCH] 1.新增NC文件批次页签 2.批次页签新增 数控加工确认表按钮，点击按钮出现对应批次确认表 3.处理修改查询电子样板与NC文件查询页面处理文件名折叠问题
---
src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue
index 1c1145a..ac589c8 100644
--- a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue
+++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue
@@ -31,12 +31,6 @@
:currentLevelDetails="currentLevelInfo" :size="containerSize"/>
</a-tab-pane>
- <!--绯荤粺鍙傛暟閰嶇疆涓嫢鍙傛暟涓�1鏃舵墠灞曠ず瀵瑰簲灞傜骇鐨勫垁鍏峰垪琛�-->
- <a-tab-pane :key="2" tab="鍒�鍏峰垪琛�"
- v-if="+currentLevelInfo.type===5&&isProcessHasCutterList||+currentLevelInfo.type===6&&isProcessStepHasCutterList">
- <CutterTableList ref="cutterTableListRef" :currentLevelInfo="currentLevelInfo" :size="containerSize"/>
- </a-tab-pane>
-
<template v-if="currentLevelInfo.hasOwnProperty('docId')">
<a-tab-pane :key="1" tab="鏂囨。灞炴��">
<DocumentInfo :currentLevelDetails="currentLevelInfo" :size="containerSize"/>
@@ -57,6 +51,20 @@
<UseDocumentEquipmentTableList ref="useDocumentEquipmentTableRef" :currentDocumentInfo="currentLevelInfo"
:size="containerSize"/>
</a-tab-pane>
+
+ <a-tab-pane :key="5" tab="鍒�鍏峰垪琛�">
+ <CutterTableList ref="cutterTableListRef" :currentLevelInfo="currentLevelInfo" :size="containerSize"/>
+ </a-tab-pane>
+
+ <a-tab-pane :key="6" tab="瀹＄璇︽儏">
+ <DocumentInfoFlow ref="flowTableListRef" :currentLevelDetails="currentLevelInfo" :size="containerSize"/>
+ </a-tab-pane>
+
+ <a-tab-pane :key="7" tab="鎵规鍒楄〃">
+ <GuideCardBatchList ref="guideCardBatchInfoRef" :guideCardBatchInfo="currentLevelInfo" :size="containerSize"/>
+ </a-tab-pane>
+
+
</template>
</a-tabs>
@@ -72,6 +80,7 @@
import ProcessStepInfo from './ProcessStep/ProcessStepInfo'
import CutterTableList from './Cutter/CutterTableList'
import DocumentInfo from '../../../common/DocumentInfo'
+import DocumentInfoFlow from '../../../common/DocumentInfoFlow.vue'
import DocumentVersionTableList from '../../../common/DocumentVersionTableList'
import UseDocumentEquipmentTableList from './Document/UseNcDocumentEquipmentTableList'
import FilePreview from '../../../common/FilePreview'
@@ -81,10 +90,12 @@
import ProcessSpecVersionInfo
from '@views/dnc/base/modules/ProductStructure/ProcessSpecVersion/ProcessSpecVersionInfo.vue'
import { getAction } from '@/api/manage'
+import GuideCardBatchList from '@views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue'
export default {
name: 'ProductStructureMainBottom',
components: {
+ GuideCardBatchList,
ProcessSpecVersionInfo,
UseDeviceCustomTypeEquipmentTableList,
CutterTableList,
@@ -94,6 +105,7 @@
UseDocumentEquipmentTableList,
DocumentVersionTableList,
DocumentInfo,
+ DocumentInfoFlow,
ProcessInfo,
PartInfo,
ProductInfo,
@@ -170,6 +182,14 @@
case 4:
this.$nextTick(() => this.$refs.useDocumentEquipmentTableRef.loadData())
break
+ case 5:
+ this.$nextTick(() => this.$refs.cutterTableListRef.setQueryParamAndLoadData(1))
+ break
+ case 6:
+ this.$nextTick(() => this.$refs.flowTableListRef.getAllApproveData())
+ break
+ case 7:
+ this.$nextTick(() => this.$refs.guideCardBatchInfoRef.getGuideCardBatchList())
default:
}
// 闃绘鎺ュ彛鍦ㄥ悓涓�鏂囨。涓�娆＄偣鍑诲唴澶氭瑙﹀彂
--
Gitblit v1.9.3