From a00b50f20267948804399af79f0c5c1dec671a2c Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 09 六月 2025 16:56:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dnc/base/modules/ProductStructure/Process/ProcessModal.vue | 52 +++++++++++++++++-----------------------------------
1 files changed, 17 insertions(+), 35 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/Process/ProcessModal.vue b/src/views/dnc/base/modules/ProductStructure/Process/ProcessModal.vue
index 3d5c716..0f35c26 100644
--- a/src/views/dnc/base/modules/ProductStructure/Process/ProcessModal.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Process/ProcessModal.vue
@@ -8,12 +8,11 @@
@ok="handleOk"
@cancel="handleCancel"
cancelText="鍏抽棴">
- <ProcessModalForm ref="realForm" @ok="submitCallback" :allDeviceList="allDeviceList"/>
+ <ProcessModalForm ref="realForm" @ok="submitCallback"/>
</j-modal>
</template>
<script>
- import dncApi from '@/api/dnc'
import ProcessModalForm from './ProcessModalForm.vue'
export default {
@@ -31,28 +30,13 @@
title: '',
width: 700,
visible: false,
- allDeviceList: [],
isAddNextLevel: false // 鏄惁涓烘坊鍔犱笅绾э紝浣滀负鏍戣妭鐐规槸鍚﹀睍寮�鐨勫垽鏂�
- }
- },
- watch: {
- visible: {
- handler(value) {
- if (value) this.getAllDeviceListByApi()
- }
}
},
created() {
this.$bus.$on('treeMenuItemMethodTrigger', this.triggerCorrespondingMethod)
},
methods: {
- getAllDeviceListByApi() {
- dncApi.getAllDeviceListApi()
- .then(res => {
- if (res.success) this.allDeviceList = res.list
- })
- },
-
/**
* 鐐瑰嚮閮ㄤ欢鍒涘缓閮ㄤ欢涓嬬骇宸ュ簭
*/
@@ -64,24 +48,6 @@
this.$refs.realForm.add({
productId: this.currentTreeNodeInfo.entity.productId,
componentId: this.currentTreeNodeInfo.entity.componentId
- })
- }
- })
- },
-
-
- /**
- * 鐐瑰嚮闆朵欢鍒涘缓闆朵欢涓嬬骇宸ュ簭
- */
- handlePartsAddRelative() {
- this.isAddNextLevel = true
- this.visible = true
- this.$nextTick(() => {
- if (this.$refs.realForm) {
- this.$refs.realForm.add({
- productId: this.currentTreeNodeInfo.entity.productId,
- componentId: this.currentTreeNodeInfo.entity.componentId,
- partsId: this.currentTreeNodeInfo.entity.partsId
})
}
})
@@ -104,6 +70,22 @@
})
},
+ // 鍒涘缓宸ヨ壓瑙勭▼鐗堟湰涓嬬骇宸ュ簭
+ handleVersionAddChild() {
+ this.isAddNextLevel = true
+ this.visible = true
+ this.$nextTick(() => {
+ if (this.$refs.realForm) {
+ this.$refs.realForm.add({
+ productId: this.currentTreeNodeInfo.entity.productId,
+ componentId: this.currentTreeNodeInfo.entity.componentId,
+ partsId: this.currentTreeNodeInfo.entity.partsId,
+ psvId: this.currentTreeNodeInfo.id
+ })
+ }
+ })
+ },
+
/**
* 缂栬緫宸ュ簭淇℃伅
*/
--
Gitblit v1.9.3