From ccf69ee82f77a2e67a565cec02f95e64324a283f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 15 五月 2024 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaMemberWindow.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
index 880fb75..c3eb8db 100644
--- a/admin/src/components/business/OperaMemberWindow.vue
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -17,25 +17,30 @@
@change="handleChangeCompany"
:show-all-levels="false"
clearable
+ filterable
:props="departprops"
></el-cascader>
+ <div style="font-size: 12px;color: #F56C6C" >
+ 娉細浠呮敮鎸侀�夋嫨 銆恵{companyType ===0?'鐩稿叧鏂圭粍缁�':'鍐呴儴缁勭粐'}}銆�
+ </div>
</el-form-item>
<el-form-item label="鎵嬫満鍙�" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿" v-trim/>
+ <div style="color: #F56C6C;font-size: 12px">娉細鍛樺伐鎵嬫満鍙峰皢浣滀负骞冲彴鐧诲綍璐﹀彿锛屽垵濮嬪瘑鐮佷负绯荤粺榛樿瀵嗙爜閰嶇疆椤�</div>
</el-form-item>
<el-form-item label="韬唤璇佸彿" prop="idcardNo" v-if="form.id ==null">
<el-input v-model="form.idcardNo" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" v-trim/>
</el-form-item>
<el-form-item label="淇敼韬唤璇佸彿" prop="idcardNoNew" v-if="form.id !=null">
<el-input v-model="form.idcardNoNew" placeholder="鍙慨鏀硅韩浠借瘉鍙�" v-trim/>
- <div v-if="form.id !=null">
- 锛堟敞锛氬綋鍓嶈韩浠借瘉鍙蜂负<span style="color: red">銆恵{form.idcardDecode}}銆�</span>锛屽闇�淇敼锛岃鍦ㄨ緭鍏ユ爮濉啓鏂扮殑韬唤璇佸彿!锛�
+ <div style="font-size: 12px" v-if="form.id !=null">
+ 娉細褰撳墠韬唤璇佸彿涓�<span style="color: #F56C6C">銆恵{form.idcardDecode}}銆�</span>锛屽闇�淇敼锛岃鍦ㄨ緭鍏ユ爮濉啓鏂扮殑韬唤璇佸彿!
</div>
</el-form-item>
<el-form-item label="宸ュ彿" prop="code">
<el-input v-model="form.code" placeholder="璇疯緭鍏ュ憳宸ュ伐鍙�" v-trim/>
</el-form-item>
- <el-form-item label="浜鸿劯鐓х墖" prop="faceImgFull">
+ <el-form-item label="浜鸿劯鐓х墖" prop="faceImgFull" >
<UploadAvatarImage
:file="{ 'imgurlfull': form.faceImgFull, 'imgurl': form.faceImg }"
:uploadData="uploadData"
@@ -67,6 +72,7 @@
value: 'id',
checkStrictly: true
},
+ companyType:0,
department: [],
// 琛ㄥ崟鏁版嵁
form: {
@@ -112,10 +118,11 @@
* @title 绐楀彛鏍囬
* @target 缂栬緫鐨勫璞�
*/
- open (title, target, depart) {
+ open (title, target, depart,companyType) {
this.title = title
this.department = depart
this.visible = true
+ this.companyType = companyType
// 鏂板缓
if (target == null) {
this.$nextTick(() => {
@@ -141,7 +148,6 @@
}
})
}
- console.log(that.form.company)
})
},
// 涓婁紶鍥剧墖
--
Gitblit v1.9.3