From 77be404d9d2b3fa11c7ba0890dcdf2bb0b5d6a1c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 31 十月 2024 17:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaMemberWindow.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
index b356deb..c4b80a8 100644
--- a/admin/src/components/business/OperaMemberWindow.vue
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -11,6 +11,12 @@
娉細浠呮敮鎸侀�夋嫨 銆恵{ companyType === 0 ? '鐩稿叧鏂圭粍缁�' : '鍐呴儴缁勭粐' }}銆�
</div>
</el-form-item>
+ <el-form-item label="閫夋嫨宀椾綅锛�" prop="positionId">
+ <el-select v-model="form.positionId" clearable filterable placeholder="璇烽�夋嫨">
+ <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </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>
@@ -26,6 +32,16 @@
</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="jobDate">
+ <el-date-picker v-model="form.jobDate" value-format="yyyy-MM-dd" type="date">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鏄惁鍏氬憳" prop="isDangyuan">
+ <el-radio-group v-model="form.isDangyuan">
+ <el-radio :label="0">闈炲厷鍛�</el-radio>
+ <el-radio :label="1">鍏氬憳</el-radio>
+ </el-radio-group>
</el-form-item>
<el-form-item label="浜鸿劯鐓х墖" prop="faceImgFull">
<div class="upload_wrap">
@@ -48,6 +64,7 @@
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { checkMobile, validIdCardNo, validIdCardNoNew } from '@/utils/form'
+import { allList } from '@/api/business/position'
export default {
name: 'OperaCompanyWindow',
extends: BaseOpera,
@@ -64,6 +81,7 @@
},
companyType: 0,
department: [],
+ positionList: [],
// 琛ㄥ崟鏁版嵁
form: {
id: null,
@@ -79,6 +97,9 @@
idcardType: 0,
phone: '',
faceImg: '',
+ jobDate: null,
+ isDangyuan: 0,
+ positionId: null,
faceImgFull: ''
},
// 楠岃瘉瑙勫垯
@@ -112,7 +133,27 @@
this.title = title
this.department = depart
this.visible = true
+ this.form = {
+ id: null,
+ name: '',
+ type: '',
+ company: [],
+ code: '',
+ idcardNo: '',
+ idcardNoNew: '',
+ linkName: '',
+ idcardDecode: '',
+ companyId: null,
+ idcardType: 0,
+ phone: '',
+ faceImg: '',
+ jobDate: null,
+ isDangyuan: 0,
+ positionId: null,
+ faceImgFull: ''
+ }
this.companyType = companyType
+ this.getPositionList()
// 鏂板缓
if (target == null) {
this.$nextTick(() => {
@@ -140,6 +181,12 @@
}
})
},
+ getPositionList() {
+ allList({})
+ .then(res => {
+ this.positionList = res
+ })
+ },
// 涓婁紶鍥剧墖
uploadAvatarSuccess(file) {
this.form.faceImg = file.imgurl
@@ -149,19 +196,22 @@
}
</script>
<style lang="scss" scoped>
-.upload_wrap{
+.upload_wrap {
display: flex;
align-items: center;
- .avatar-uploader{
+
+ .avatar-uploader {
display: flex;
align-items: center;
justify-content: center;
}
- ::v-deep .avatar{
+
+ ::v-deep .avatar {
max-width: 90px;
max-height: 90px;
}
- .content{
+
+ .content {
display: flex;
flex-direction: column;
justify-content: center;
@@ -171,4 +221,4 @@
line-height: 24px;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3