From e6b0c53c36db34d4e5e3588a026e6dec086b3ae4 Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Fri, 15 Dec 2023 15:50:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../keyprojects/outsourced/components/list.vue      |  9 ++++++---
 .../keyprojects/videomanager/components/list.vue    | 13 +++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/keyprojects/outsourced/components/list.vue b/src/views/keyprojects/outsourced/components/list.vue
index 1f403c0..e6665d0 100644
--- a/src/views/keyprojects/outsourced/components/list.vue
+++ b/src/views/keyprojects/outsourced/components/list.vue
@@ -32,7 +32,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="施工相关方">
-            <el-select v-model="UNITS_ID" placeholder="请选择施工相关方" style="width: 100%">
+            <el-select v-model="UNITS_ID" filterable placeholder="请选择施工相关方" style="width: 100%">
               <el-option
                 v-for="item in unitsList"
                 :key="item.UNITS_ID"
@@ -492,9 +492,12 @@ export default {
       // 合并
       return new Promise((resolve) => {
         requestFN(
-          '/corpDepartment/listTreeManageAndCorp1',
+          '/department/listTreeCorpInfo',
+          {
+            CORPINFO_ID: this.CORPINFO_ID
+          }
         ).then((data) => {
-          this.treeDeptOptions = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+          // this.treeDeptOptions = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
           this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
           resolve()
         }).catch((e) => {
diff --git a/src/views/keyprojects/videomanager/components/list.vue b/src/views/keyprojects/videomanager/components/list.vue
index abd4d82..81cb651 100644
--- a/src/views/keyprojects/videomanager/components/list.vue
+++ b/src/views/keyprojects/videomanager/components/list.vue
@@ -49,7 +49,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="施工相关方">
-            <el-select v-model="UNITS_ID" placeholder="请选择施工相关方" style="width: 100%">
+            <el-select v-model="UNITS_ID" filterable placeholder="请选择施工相关方" style="width: 100%">
               <el-option
                 v-for="item in unitsList"
                 :key="item.UNITS_ID"
@@ -174,6 +174,7 @@ export default {
   directives: { waves },
   data() {
     return {
+      CORPINFO_ID: '',
       listLoading: true,
       listQuery: {
         page: 1,
@@ -212,6 +213,7 @@ export default {
     }
   },
   created() {
+    this.CORPINFO_ID = this.$parent.CORPINFO_ID
     this.getList()
     this.getUnitsList()
     this.getCorpList()
@@ -243,9 +245,12 @@ export default {
       // 合并
       return new Promise((resolve) => {
         requestFN(
-          '/corpDepartment/listTreeManageAndCorp1',
+          'department/listTreeCorpInfo',
+          {
+            CORPINFO_ID: this.CORPINFO_ID
+          }
         ).then((data) => {
-          this.treeDeptOptions = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+          // this.treeDeptOptions = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
           this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
           resolve()
         }).catch((e) => {
@@ -305,7 +310,7 @@ export default {
           COMPETENT_DEPT_ID: this.COMPETENT_DEPT_ID,
           GROUP_UNIT: this.GROUP_UNIT,
           CORP_NAME: this.CORP_NAME,
-          CORPINFO_ID: this.$parent.CORPINFO_ID
+          CORPINFO_ID: this.CORPINFO_ID
         }
       ).then((data) => {
         this.listLoading = false