From 6cf36f0e43c9add691b9a375526ce7dc26209574 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 13 十一月 2025 14:49:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/relativeMember.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 15bfb90..505f171 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -42,6 +42,9 @@
<el-option label="鍚屾鎴愬姛" value="1"></el-option>
<el-option label="鍚屾澶辫触" value="2"></el-option>
</el-select>
+ <el-form-item label="" prop="idcardNo">
+ <el-input v-model="searchForm.idcardNo" placeholder="韬唤璇佸彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
</el-form-item>
<!-- <el-form-item label="">
<el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
@@ -73,9 +76,9 @@
v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
<li><el-button type="primary" @click="$refs.OperaMemberImportWindow.open('浜哄憳瀵煎叆', searchForm.companyType)"
icon="el-icon-plus" v-permissions="['business:member:create']">浜哄憳瀵煎叆</el-button></li>
- <li><el-button type="primary"
- @click="$refs.OperaTrainTimeImportWindow.open('鍩硅鏈夋晥鏈熷鍏�', department, searchForm.companyType)"
- icon="el-icon-plus" v-permissions="['business:traintime:create']">鍩硅鏈熷鍏�</el-button></li>
+<!-- <li><el-button type="primary"-->
+<!-- @click="$refs.OperaTrainTimeImportWindow.open('鍩硅鏈夋晥鏈熷鍏�', department, searchForm.companyType)"-->
+<!-- icon="el-icon-plus" v-permissions="['business:traintime:create']">鍩硅鏈熷鍏�</el-button></li>-->
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete"
v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
<li><el-button type="primary" v-permissions="['business:empower:create']"
@@ -254,7 +257,8 @@
workStatus: '',
positionId: '',
companyId: '',
- hasFace: ''
+ hasFace: '',
+ idcardNo:''
},
loading: false,
heading: false,
--
Gitblit v1.9.3