From e3bfce922c47cf8706be6eada6f5edbd38f39316 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 19 七月 2024 13:48:43 +0800
Subject: [PATCH] bug修改

---
 src/views/onlineEducation/count/index.vue |   75 +++++++++++++++++++------------------
 1 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/src/views/onlineEducation/count/index.vue b/src/views/onlineEducation/count/index.vue
index c2030dd..4efa22c 100644
--- a/src/views/onlineEducation/count/index.vue
+++ b/src/views/onlineEducation/count/index.vue
@@ -1,21 +1,25 @@
 <template>
   <div class="app-container">
-    <div style="margin-bottom: 10px">
+    <div>
       <el-form style="display: flex;flex-wrap: wrap">
         <el-form-item label="企业:" v-if="state.isAdmin">
           <el-select
-              v-model="state.queryParams.companyId"
-              style="width: 100%"
-              v-loadMore="loadMore"
-              class="m-2"
-              placeholder="请选择所属企业"
-              popper-class="more_select_dropdown"
+              v-model="state.queryParams.companyName"
+              filterable
+              remote
+              @change="selectValue"
+              reserve-keyword
+              placeholder="请输入企业名称"
+              remote-show-suffix
+              :remote-method="getCompanyList"
+              :loading="loadingCompany"
+              style="width: 240px"
           >
             <el-option
                 v-for="item in state.companyList"
                 :key="item.id"
                 :label="item.name"
-                :value="item.id"
+                :value="item.name"
             />
           </el-select>
         </el-form-item>
@@ -121,9 +125,9 @@
   const userInfo = JSON.parse(Cookies.get('userInfo'))
   console.log("userInfo",userInfo)
   state.isAdmin = userInfo.userType === 0;
-  if(state.isAdmin){
-    getCompanyList();
-  }
+  // if(state.isAdmin){
+  //   getCompanyList();
+  // }
 
   getList();
 
@@ -145,44 +149,42 @@
   }
   loading.value = false;
 }
+const selectValue = (val) => {
+  state.companyList.forEach(item => {
+    if(item.name === val){
+      state.queryParams.companyId = item.id
+    }
+  })
+}
 
 const finshed = ref(false)
-const getCompanyList = async (type)=>{
-  if (type === 'open' && state.pageNum !== 1) {
-  } else {
+const loadingCompany = ref(false)
+const getCompanyList = async (val)=>{
+  if(val != ""){
+    loadingCompany.value = true;
     const queryParams = {
-      pageNum: state.pageNum,
-      pageSize: state.pageSize,
+      name: val
     }
     const res = await getCompany(queryParams)
     if (res.code == 200) {
-      if (res.data.pageNum === state.pageNum) {
-        finshed.value = false;
-        if (state.pageNum == 1) {
-          state.companyList = res.data.list
-        } else {
-          state.companyList = state.companyList.concat(res.data.list)
-        }
-      } else {
-        finshed.value = true;
-      }
+      loadingCompany.value = false;
+      state.companyList = res.data.list
 
     } else {
       ElMessage.warning(res.message)
     }
-    console.log("state.companyList",state.companyList)
   }
 }
 //触底函数
-const loadMore = () => {
-  console.log(' 触底了');
-  // 防抖处理
-  setTimeout(() => {
-    if (finshed.value) return //值为true,则代表没有数据了
-    state.pageNum += 1
-    getCompanyList('')
-  }, 500)
-}
+// const loadMore = () => {
+//   console.log(' 触底了');
+//   // 防抖处理
+//   setTimeout(() => {
+//     if (finshed.value) return //值为true,则代表没有数据了
+//     state.pageNum += 1
+//     // getCompanyList('')
+//   }, 500)
+// }
 const setDate = () => {
   let isDate = new Date()
   let sTime = `${isDate.getFullYear()}-${isDate.getMonth() + 1}-${isDate.getDate()-7}`
@@ -221,6 +223,7 @@
     pageSize: 10,
   }
   searchTime.value = [];
+  state.companyList = [];
   getList();
 }
 

--
Gitblit v1.9.2