From 95b6a6388e4cc4e6ed0f54cc04212a86cd8cf829 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 23 五月 2025 13:37:09 +0800
Subject: [PATCH] 1、用户管理新增和编辑用户时设置工单为必填项 2、新增终端登录、首页、设备点检、故障上报、上下班打卡、停机原因维护页面（未与后端联调且客户未确定页面设计）并调整全局路由守卫相关逻辑 3、调整设备结构树设备层级和车间层级区分的判断条件 4、调整电子样板检索与部件借用弹窗列表与搜索区域样式

---
 src/views/dnc/base/modules/ProductStructure/Process/ProcessModal.vue |   64 +++++++++++++++++++++++--------
 1 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/src/views/dnc/base/modules/ProductStructure/Process/ProcessModal.vue b/src/views/dnc/base/modules/ProductStructure/Process/ProcessModal.vue
index 9f265d2..0f35c26 100644
--- a/src/views/dnc/base/modules/ProductStructure/Process/ProcessModal.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Process/ProcessModal.vue
@@ -29,7 +29,8 @@
       return {
         title: '',
         width: 700,
-        visible: false
+        visible: false,
+        isAddNextLevel: false // 鏄惁涓烘坊鍔犱笅绾э紝浣滀负鏍戣妭鐐规槸鍚﹀睍寮�鐨勫垽鏂�
       }
     },
     created() {
@@ -37,38 +38,64 @@
     },
     methods: {
       /**
-       * 鍒涘缓
-       * @param modalTitle
+       * 鐐瑰嚮閮ㄤ欢鍒涘缓閮ㄤ欢涓嬬骇宸ュ簭
        */
-      handleComponentAddRelative(modalTitle) {
-        this.title = modalTitle
+      handleComponentAddRelative() {
+        this.isAddNextLevel = true
         this.visible = true
         this.$nextTick(() => {
-          this.$refs.realForm.add()
+          if (this.$refs.realForm) {
+            this.$refs.realForm.add({
+              productId: this.currentTreeNodeInfo.entity.productId,
+              componentId: this.currentTreeNodeInfo.entity.componentId
+            })
+          }
         })
       },
 
-      handleProcessAdd(modalTitle) {
-        this.title = modalTitle
+      /**
+       * 鐐瑰嚮宸ュ簭娣诲姞鍚岀骇宸ュ簭
+       */
+      handleProcessAdd() {
+        this.isAddNextLevel = false
         this.visible = true
         this.$nextTick(() => {
-          this.$refs.realForm.add()
+          if (this.$refs.realForm) {
+            this.$refs.realForm.add({
+              productId: this.currentTreeNodeInfo.entity.productId,
+              componentId: this.currentTreeNodeInfo.entity.componentId,
+              partsId: this.currentTreeNodeInfo.entity.partsId
+            })
+          }
         })
       },
 
-      handlePartsAddRelative(modalTitle) {
-        this.title = modalTitle
+      // 鍒涘缓宸ヨ壓瑙勭▼鐗堟湰涓嬬骇宸ュ簭
+      handleVersionAddChild() {
+        this.isAddNextLevel = true
         this.visible = true
         this.$nextTick(() => {
-          this.$refs.realForm.add()
+          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
+            })
+          }
         })
       },
 
-      handleProcessEdit(modalTitle) {
-        this.title = modalTitle
+      /**
+       * 缂栬緫宸ュ簭淇℃伅
+       */
+      handleProcessEdit() {
+        this.isAddNextLevel = false
         this.visible = true
         this.$nextTick(() => {
-          this.$refs.realForm.edit(this.currentTreeNodeInfo.entity)
+          if (this.$refs.realForm) {
+            this.$refs.realForm.edit({ id: this.currentTreeNodeInfo.id, ...this.currentTreeNodeInfo.entity })
+          }
         })
       },
 
@@ -77,7 +104,7 @@
       },
 
       submitCallback() {
-        this.$emit('submitSuccess')
+        this.$emit('submitSuccess', this.isAddNextLevel)
         this.visible = false
       },
 
@@ -87,7 +114,10 @@
       },
 
       triggerCorrespondingMethod({ methodName, modalTitle }) {
-        if (this[methodName]) this[methodName](modalTitle)
+        if (this[methodName]) {
+          this[methodName]()
+          this.title = modalTitle
+        }
       }
     }
   }

--
Gitblit v1.9.3