From 67b6b272617e3f86f73bdf1dc11b6edb79018c23 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Mon, 30 Aug 2021 09:54:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=96=B9=E6=B3=95=EF=BC=9B?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E3=80=81=E8=81=94=E7=B3=BB=E4=BA=BA?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6select=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/company/BusinessSelect.vue           |  2 +-
 src/components/company/SelectContacts.vue           | 12 ++++++++++--
 src/components/company/SelectPrincipal.vue          | 13 ++++++++++++-
 src/views/businessManagement/BusinessManagement.vue |  2 +-
 src/views/businessManagement/ContactManagement.vue  |  2 +-
 .../CommitteeMaintenance.vue                        | 13 +++++++++++++
 .../projectManagement/ConferenceMaintenance.vue     |  2 +-
 .../projectManagement/GeneralProjectManagement.vue  |  2 +-
 .../projectManagement/MemberUnitMaintenance.vue     |  2 +-
 .../WorkingGroupProjectManagement.vue               |  5 ++++-
 10 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 src/views/dataNetworkDiskManagement/CommitteeMaintenance.vue

diff --git a/src/components/company/BusinessSelect.vue b/src/components/company/BusinessSelect.vue
index 5bbc575..da83a88 100644
--- a/src/components/company/BusinessSelect.vue
+++ b/src/components/company/BusinessSelect.vue
@@ -19,7 +19,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
-              <a-button icon="reload">重置</a-button>
+              <a-button icon="reload" @click="searchReset">重置</a-button>
             </span>
           </a-col>
         </a-row>
diff --git a/src/components/company/SelectContacts.vue b/src/components/company/SelectContacts.vue
index dccddc6..eafe10d 100644
--- a/src/components/company/SelectContacts.vue
+++ b/src/components/company/SelectContacts.vue
@@ -6,7 +6,9 @@
         <a-select :value="value"
                   v-bind="$attrs"
                   v-on="$listeners"
-                  show-search>
+                  show-search
+                  option-filter-prop="children"
+                  :filter-option="filterOption">
           <a-select-option v-for="item in contactsList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
         </a-select>
       </a-col>
@@ -67,7 +69,7 @@ export default {
     getContactsList() {
       if (this.selectedCompany) {
         const params = {
-          companyName: this.selectedCompany.companyName
+          companyId: this.selectedCompany.id
         }
         getContactsByCompany(params).then(res => {
           this.contactsList = res.result
@@ -85,6 +87,12 @@ export default {
         return
       }
       this.$message.warn('请先选择来款企业再为该企业新建联系人')
+    },
+    // 下拉框的搜索
+    filterOption(input, option) {
+      return (
+          option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      );
     }
   },
   model: {
diff --git a/src/components/company/SelectPrincipal.vue b/src/components/company/SelectPrincipal.vue
index 9439e39..a6f1383 100644
--- a/src/components/company/SelectPrincipal.vue
+++ b/src/components/company/SelectPrincipal.vue
@@ -1,5 +1,10 @@
 <template>
-  <a-select :value="value" v-bind="$attrs" v-on="$listeners">
+  <a-select :value="value"
+            v-bind="$attrs"
+            v-on="$listeners"
+            show-search
+            option-filter-prop="children"
+            :filter-option="filterOption">
     <a-select-option v-for="item in userList" :key="item.id" :value="item.id">{{ `${item.username}(${item.orgCodeTxt})` }}</a-select-option>
   </a-select>
 </template>
@@ -34,6 +39,12 @@ export default {
         this.userList = res.result
       })
     },
+    // 下拉框的搜索
+    filterOption(input, option) {
+      return (
+          option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      );
+    }
   },
   model: {
     prop: 'value',
diff --git a/src/views/businessManagement/BusinessManagement.vue b/src/views/businessManagement/BusinessManagement.vue
index 2e754da..6e5cd4e 100644
--- a/src/views/businessManagement/BusinessManagement.vue
+++ b/src/views/businessManagement/BusinessManagement.vue
@@ -12,7 +12,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
-              <a-button icon="reload">重置</a-button>
+              <a-button icon="reload" @click="searchReset">重置</a-button>
             </span>
           </a-col>
         </a-row>
diff --git a/src/views/businessManagement/ContactManagement.vue b/src/views/businessManagement/ContactManagement.vue
index d80d20f..f1f658d 100644
--- a/src/views/businessManagement/ContactManagement.vue
+++ b/src/views/businessManagement/ContactManagement.vue
@@ -22,7 +22,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
-              <a-button icon="reload">重置</a-button>
+              <a-button icon="reload" @click="searchReset">重置</a-button>
             </span>
           </a-col>
         </a-row>
diff --git a/src/views/dataNetworkDiskManagement/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/CommitteeMaintenance.vue
new file mode 100644
index 0000000..2415db0
--- /dev/null
+++ b/src/views/dataNetworkDiskManagement/CommitteeMaintenance.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: 'CommitteeMaintenance'
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index f91a8a8..fe9c42c 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -54,7 +54,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
-              <a-button icon="reload">重置</a-button>
+              <a-button icon="reload" @click="searchReset">重置</a-button>
             </span>
           </a-col>
         </a-row>
diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue
index b3f8e5a..c61cbc2 100644
--- a/src/views/projectManagement/GeneralProjectManagement.vue
+++ b/src/views/projectManagement/GeneralProjectManagement.vue
@@ -42,7 +42,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
-              <a-button icon="reload">重置</a-button>
+              <a-button icon="reload" @click="searchReset">重置</a-button>
             </span>
           </a-col>
         </a-row>
diff --git a/src/views/projectManagement/MemberUnitMaintenance.vue b/src/views/projectManagement/MemberUnitMaintenance.vue
index e2b6f89..3c8e1b5 100644
--- a/src/views/projectManagement/MemberUnitMaintenance.vue
+++ b/src/views/projectManagement/MemberUnitMaintenance.vue
@@ -43,7 +43,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
-              <a-button icon="reload">重置</a-button>
+              <a-button icon="reload" @click="searchReset">重置</a-button>
             </span>
           </a-col>
         </a-row>
diff --git a/src/views/projectManagement/WorkingGroupProjectManagement.vue b/src/views/projectManagement/WorkingGroupProjectManagement.vue
index c57b86d..4f96baa 100644
--- a/src/views/projectManagement/WorkingGroupProjectManagement.vue
+++ b/src/views/projectManagement/WorkingGroupProjectManagement.vue
@@ -22,7 +22,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
-              <a-button icon="reload">重置</a-button>
+              <a-button icon="reload" @click="searchReset">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -39,6 +39,9 @@
 
     <!--    table表格区域-->
     <div>
+      <div class="">
+
+      </div>
       <a-table
           ref="table"
           size="middle"