From 848987aad3a1bbc02f29855be3fbc9b34f871371 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Sun, 28 Apr 2024 18:31:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=86=E9=87=8D=E7=82=B9?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E9=9A=90=E6=82=A3=E8=AF=84=E5=AE=A1=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safety-environmental-inspection/detail-list.vue |  6 +++++-
 .../safety-environmental-inspection/detail.vue      | 13 +++++++++++++
 .../safety-environmental-inspection/list.vue        |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pages/key-project-management/safety-environmental-inspection/detail-list.vue b/pages/key-project-management/safety-environmental-inspection/detail-list.vue
index a14d355..815434b 100644
--- a/pages/key-project-management/safety-environmental-inspection/detail-list.vue
+++ b/pages/key-project-management/safety-environmental-inspection/detail-list.vue
@@ -52,6 +52,7 @@ export default {
   data() {
     return {
       KEYWORDS: '',
+	  CORPINFO_ID: '',
       OUTSOURCED_ID: '',
       pageSize: 10,
       currentPage: 1,
@@ -71,7 +72,8 @@ export default {
     }
   },
   onLoad(e) {
-   this.OUTSOURCED_ID = e.OUTSOURCED_ID
+   this.OUTSOURCED_ID = e.OUTSOURCED_ID,
+   this.CORPINFO_ID = this.$route.query.CORPINFO_ID
   },
   onShow(){
     this.resetList()
@@ -81,6 +83,7 @@ export default {
       let resData = await getKeyProjectsCheckList({
         KEYWORDS: this.KEYWORDS,
         OUTSOURCED_ID: this.OUTSOURCED_ID,
+		CORPINFO_ID: this.CORPINFO_ID,
         showCount: this.pageSize,
         currentPage: this.currentPage,
       });
@@ -99,6 +102,7 @@ export default {
         params: {
           KEYPROJECTCHECK_ID,
           type,
+		  CORPINFO_ID:this.CORPINFO_ID,
           OUTSOURCED_ID:this.OUTSOURCED_ID
         }
       })
diff --git a/pages/key-project-management/safety-environmental-inspection/detail.vue b/pages/key-project-management/safety-environmental-inspection/detail.vue
index fdc2ce2..af08122 100644
--- a/pages/key-project-management/safety-environmental-inspection/detail.vue
+++ b/pages/key-project-management/safety-environmental-inspection/detail.vue
@@ -356,6 +356,8 @@ export default {
         HIDDENLEVEL: '',
         HIDDENTYPE_NAME: '',
         HIDDENTYPE: '',
+		HIDDENTYPE2_NAME: '',
+		HIDDENTYPE2: '',
         SOURCE: '4',
         CORPINFO_ID: '',
         HIDDENFINDDEPT: '',
@@ -396,6 +398,7 @@ export default {
   async onLoad(event) {
     this.KEYPROJECTCHECK_ID = event.KEYPROJECTCHECK_ID
     this.OUTSOURCED_ID = event.OUTSOURCED_ID
+	
     this.disabled = !(event.type === 'add' || event.type === 'edit');
     if (this.KEYPROJECTCHECK_ID) {
       await this.fnGetKeyProjectsCheckView()
@@ -492,6 +495,14 @@ export default {
       if (list === 'hiddenTypeTreeList') {
         this.hiddenForm.HIDDENTYPE = e[0].id
         this.hiddenForm.HIDDENTYPE_NAME = e[0].name
+		// 获取根节点元素名
+		this.hiddenTypeTreeList.forEach((enode) => {
+			if (JSON.stringify(enode).includes(e[0].id) && JSON.stringify(enode).includes(e[0].name)){
+				// CORPINFO_ID = this.$route.query.CORPINFO_ID,
+				this.hiddenForm.HIDDENTYPE2 = enode.id
+				this.hiddenForm.HIDDENTYPE2_NAME = enode.name
+			}
+		})
       }
       if (list === 'rectificationSiteuserColumns') {
         this.hiddenForm.RECTIFICATIONDEPT = e[0].UNITS_ID
@@ -636,6 +647,8 @@ export default {
           FOREIGN_KEY,
           TYPE: 102,
           CORPINFO_ID: this.userInfo.CORPINFO_ID,
+          // CORPINFO_ID: this.CORPINFO_ID,
+		  
         },
         loading:false
       })
diff --git a/pages/key-project-management/safety-environmental-inspection/list.vue b/pages/key-project-management/safety-environmental-inspection/list.vue
index fcccb90..8a04426 100644
--- a/pages/key-project-management/safety-environmental-inspection/list.vue
+++ b/pages/key-project-management/safety-environmental-inspection/list.vue
@@ -101,6 +101,7 @@ export default {
         url: '/pages/key-project-management/safety-environmental-inspection/detail-list',
         params: {
           OUTSOURCED_ID,
+		  CORPINFO_ID: this.CORPINFO_ID
         }
       })
     },