From f6722e13ba28cd292c162df9292bb3418ba12bec Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 25 六月 2025 15:17:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/system/user/OperaUserWindow.vue | 169 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 111 insertions(+), 58 deletions(-)
diff --git a/company/src/components/system/user/OperaUserWindow.vue b/company/src/components/system/user/OperaUserWindow.vue
index 240a739..85dce16 100644
--- a/company/src/components/system/user/OperaUserWindow.vue
+++ b/company/src/components/system/user/OperaUserWindow.vue
@@ -7,44 +7,32 @@
@confirm="confirm"
>
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鐢ㄦ埛鍚�" prop="username" required>
- <el-input v-model="form.username" placeholder="璇疯緭鍏ョ敤鎴峰悕" v-trim maxlength="50"/>
+ <el-form-item label="璐﹀彿" prop="username" required>
+ <el-input v-model="form.username" placeholder="璇疯緭鍏�" v-trim maxlength="50"/>
</el-form-item>
- <el-form-item label="濮撳悕" prop="realname" required>
- <el-input v-model="form.realname" placeholder="璇疯緭鍏ュ鍚�" v-trim maxlength="50"/>
+ <el-form-item label="鍚嶇О" prop="realname" required>
+ <el-input v-model="form.realname" placeholder="璇疯緭鍏�" v-trim maxlength="50"/>
</el-form-item>
- <el-form-item label="鎬у埆" prop="sex" required>
- <el-radio-group v-model="form.sex">
- <el-radio label="1">鐢�</el-radio>
- <el-radio label="0">濂�</el-radio>
- </el-radio-group>
+ <el-form-item label="鑱旂郴鏂瑰紡" prop="mobile">
+ <el-input v-model="form.mobile" placeholder="璇疯緭鍏�" v-trim maxlength="11"/>
</el-form-item>
- <el-form-item label="澶村儚" prop="avatar" required>
- <el-radio-group v-model="form.avatar" class="form-item-avatar">
- <el-radio label="https://dmtest.ahapp.net/preselectfile/man.png" border><img src="https://dmtest.ahapp.net/preselectfile/man.png" alt=""></el-radio>
- <el-radio label="https://dmtest.ahapp.net/preselectfile/woman.png" border><img src="https://dmtest.ahapp.net/preselectfile/woman.png" alt=""></el-radio>
- </el-radio-group>
+ <el-form-item label="楠岃瘉鐮�" prop="captcha">
+ <div style="width: 100%; display: flex; align-items: center;">
+ <el-input v-model="form.captcha" maxlength="11" type="number" style="flex: 1;" placeholder="璇疯緭鍏�" v-trim/>
+ <el-button type="primary" style="flex-shrink: 0; margin-left: 15px;" @click="send" v-if="num === 0">鍙戦�侀獙璇佺爜</el-button>
+ <el-button type="primary" style="flex-shrink: 0; margin-left: 15px;" v-else>{{num}}s</el-button>
+ </div>
</el-form-item>
- <el-form-item v-if="form.id == null" label="鍒濆瀵嗙爜" prop="password" required>
- <el-input v-model="form.password" type="password" placeholder="璇疯緭鍏ュ垵濮嬪瘑鐮�" maxlength="30" show-password/>
+ <el-form-item label="閮ㄩ棬" prop="departmentId">
+ <el-cascader
+ :options="organization"
+ v-model="form.departmentId"
+ placeholder="璇烽�夋嫨"
+ :props="{ label: 'name', value: 'id', children: 'childList', checkStrictly: true }"
+ clearable />
</el-form-item>
- <el-form-item label="鎵�灞為儴闂�" prop="departmentId" required>
- <DepartmentSelect v-model="form.departmentId" placeholder="璇烽�夋嫨鐢ㄦ埛鎵�灞為儴闂�" :inline="false" clearable/>
- </el-form-item>
- <el-form-item label="宀椾綅" prop="positionId">
- <PositionSelect v-model="form.positionIds" placeholder="璇烽�夋嫨鐢ㄦ埛鎵�鍦ㄥ矖浣�" :inline="false" :multiple="true" clearable/>
- </el-form-item>
- <el-form-item label="宸ュ彿" prop="empNo">
- <el-input v-model="form.empNo" placeholder="璇疯緭鍏ュ伐鍙�" v-trim maxlength="50"/>
- </el-form-item>
- <el-form-item label="鎵嬫満鍙风爜" prop="mobile">
- <el-input v-model="form.mobile" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" v-trim maxlength="11"/>
- </el-form-item>
- <el-form-item label="閭" prop="email">
- <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" v-trim maxlength="200"/>
- </el-form-item>
- <el-form-item label="鐢熸棩" prop="birthday">
- <el-date-picker v-model="form.birthday" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鐢ㄦ埛鐢熸棩"/>
+ <el-form-item label="鎶勯�佹枃浠堕偖绠�" prop="email">
+ <el-input v-model="form.email" placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
</el-form>
</GlobalWindow>
@@ -56,7 +44,8 @@
import DepartmentSelect from '@/components/common/DepartmentSelect'
import PositionSelect from '@/components/common/PositionSelect'
import { checkMobile, checkEmail } from '@/utils/form'
-
+import { sendSms } from '@/api/business/smsEmail'
+import { tree } from '@/api/business/companyDepartment'
export default {
name: 'OperaUserWindow',
extends: BaseOpera,
@@ -68,16 +57,14 @@
id: null,
username: '', // 鐢ㄦ埛鍚�
realname: '', // 濮撳悕
- empNo: '', // 宸ュ彿
- departmentId: null, // 鎵�灞為儴闂↖D
- positionIds: [], // 鎵�灞炲矖浣岻D闆�
- avatar: '/avatar/man.png', // 澶村儚
- password: '', // 瀵嗙爜
mobile: '', // 鎵嬫満鍙风爜
- email: '', // 閭
- sex: '1', // 鎬у埆
- birthday: '' // 鐢熸棩
+ email: '',
+ captcha: '',
+ departmentId: ''
},
+ num: 0,
+ timer: null,
+ organization: [],
// 楠岃瘉瑙勫垯
rules: {
username: [
@@ -86,28 +73,91 @@
realname: [
{ required: true, message: '璇疯緭鍏ュ鍚�' }
],
- password: [
- { required: true, message: '璇疯緭鍏ュ瘑鐮�' }
+ mobile: [
+ { required: true, validator: checkMobile }
],
departmentId: [
{ required: true, message: '璇烽�夋嫨閮ㄩ棬' }
],
- avatar: [
- { required: true, message: '璇烽�夋嫨鐢ㄦ埛澶村儚' }
- ],
- sex: [
- { required: true, message: '璇烽�夋嫨鐢ㄦ埛鎬у埆' }
- ],
- mobile: [
- { required: true, validator: checkMobile }
- ],
email: [
- { validator: checkEmail }
+ { required: true, message: '璇疯緭鍏ラ偖绠�' }
]
}
}
},
methods: {
+ __confirmCreate () {
+ this.$refs.form.validate((valid) => {
+ if (!valid) {
+ return
+ }
+ let obj = JSON.parse(JSON.stringify(this.form))
+ obj.departmentId = obj.departmentId[obj.departmentId.length - 1]
+ // 璋冪敤鏂板缓鎺ュ彛
+ this.isWorking = true
+ this.api.create(obj)
+ .then(() => {
+ this.visible = false
+ this.$tip.apiSuccess('鏂板缓鎴愬姛')
+ this.$emit('success')
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.isWorking = false
+ })
+ })
+ },
+ __confirmEdit () {
+ this.$refs.form.validate((valid) => {
+ if (!valid) {
+ return
+ }
+ let obj = JSON.parse(JSON.stringify(this.form))
+ obj.departmentId = obj.departmentId[obj.departmentId.length - 1]
+ // 璋冪敤鏂板缓鎺ュ彛
+ this.isWorking = true
+ this.api.updateById(obj)
+ .then(() => {
+ this.visible = false
+ this.$tip.apiSuccess('淇敼鎴愬姛')
+ this.$emit('success')
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.isWorking = false
+ })
+ })
+ },
+ send() {
+ if (!this.form.mobile) {
+ this.$message.warning('璇疯緭鍏ユ墜鏈哄彿')
+ return
+ }
+ sendSms({ phone: this.form.mobile })
+ .then(res => {
+ this.num = 60
+ this.setTime()
+ })
+ },
+ getTree() {
+ tree()
+ .then(records => {
+ this.organization = records
+ })
+ },
+ setTime() {
+ this.timer = setInterval(() => {
+ this.num -= 1
+ if (this.num === 0) {
+ clearInterval(this.timer)
+ this.num = 0
+ }
+ }, 1000)
+ },
/**
* @title 绐楀彛鏍囬
* @target 缂栬緫鐨勭敤鎴峰璞�
@@ -115,13 +165,16 @@
open (title, target) {
this.title = title
this.visible = true
+ this.getTree()
+ clearInterval(this.timer)
+ this.num = 0
// 鏂板缓
if (target == null) {
this.$nextTick(() => {
this.$refs.form.resetFields()
this.form.id = null
- this.form.departmentId = null
- this.form.positionIds = []
+ // this.form.departmentId = null
+ // this.form.positionIds = []
})
return
}
@@ -130,8 +183,8 @@
for (const key in this.form) {
this.form[key] = target[key]
}
- this.form.departmentId = target.department == null ? null : target.department.id
- this.form.positionIds = target.positions == null ? [] : target.positions.map(p => p.id)
+ // this.form.departmentId = target.department == null ? null : target.department.id
+ // this.form.positionIds = target.positions == null ? [] : target.positions.map(p => p.id)
})
}
},
--
Gitblit v1.9.3