From d1c205d29b5eacf1de22a7af29329ca370d1c2d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 29 十一月 2024 14:50:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/business/member.vue | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/company/src/views/business/member.vue b/company/src/views/business/member.vue
index cedf737..c1a976f 100644
--- a/company/src/views/business/member.vue
+++ b/company/src/views/business/member.vue
@@ -9,7 +9,7 @@
<el-input v-model="searchForm.idcardNo" placeholder="璇疯緭鍏�" maxlength="18" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="淇濋櫓鏂规" prop="solutionsId">
- <el-select v-model="searchForm.solutionsId" placeholder="璇烽�夋嫨" @change="search">
+ <el-select v-model="searchForm.solutionsId" filterable placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in solutions"
:key="item.baseId"
@@ -25,7 +25,7 @@
</el-select>
</el-form-item>
<el-form-item v-if="userInfo.type === 0" label="鎵�灞炰紒涓�" prop="companyId">
- <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
+ <el-select v-model="searchForm.companyId" filterable placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="(item, index) in companyList"
:key="index"
@@ -172,16 +172,11 @@
.then(res => {
this.solutions = res
})
- /* if(this.userInfo.type ==1){
- findListByDTO({ dataType: 2 })
- .then(res => {
- this.options = res
+ if (this.userInfo.type === 0) {
+ companyAll({}).then(res => {
+ this.companyList = res
})
- }*/
-
- companyAll({}).then(res => {
- this.companyList = res
- })
+ }
},
calculateAge(idNumber) {
if (!idNumber) return
--
Gitblit v1.9.3