FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 23:11:24 +08:00
Code Packages Releases Activity

Add employee name suffixes to work item information. Add password modification function.

Browse Source
This commit is contained in:
ggb
2023-06-06 23:32:32 +08:00
parent d3d7608efe
commit ca4b0fb1c4
8 changed files with 171 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ui/src/components/personalProfile/editPasswd.vue
View File

@@ -23,6 +23,7 @@
</template>
<script lang="ts">
export default {
emits: ['updatePasswd', 'cancelPasswd'],
data() {
return {
passwdForm: {
@@ -41,6 +42,10 @@ export default {
{
required: true,
message: '新密码不能为空'
},
{
validator: this.validateSurePasswordLength,
trigger: 'blur'
}
],
selectPasswd: [
@@ -52,6 +57,10 @@ export default {
{
validator: this.validateSurePassword,
trigger: 'blur'
},
{
validator: this.validateSurePasswordLength,
trigger: 'blur'
}
]
}
@@ -82,6 +91,14 @@ export default {
callback()
}
}
},
validateSurePasswordLength(rule, value, callback) {
if (value.length < 8 || value.length > 64) {
callback(new Error('新密码长度应为8到64位'))
return false
} else {
callback()
}
}
}
}

4
ui/src/components/work/DetailComponents.vue
View File

@@ -22,13 +22,13 @@
</el-descriptions-item>
<el-descriptions-item label="负责员工">
<el-tag v-for="item in taskData.worker" style="margin-right: 10px">{{
item.username
item.staff.lastName + item.staff.firstName + '(' + item.username + ')'
}}</el-tag>
</el-descriptions-item>
</el-descriptions>
</template>
<script lang='ts'>
<script lang="ts">
export default {
props: {
taskData: {

37
ui/src/components/work/EditWork.vue
View File

@@ -12,7 +12,11 @@
<el-option
v-for="item in workers"
:key="item.id"
:label="item.username"
:label="
item.staff
? item.staff.lastName + item.staff.firstName + '(' + item.username + ')'
: item.username
"
:value="item"
/>
</el-select>
@@ -29,7 +33,7 @@
</el-col>
</el-form-item>
<el-form-item label="工作内容" prop="content">
<el-input v-model="form.content" type="textarea" />
<el-input v-model="form.content" type="textarea" maxlength="100" show-word-limit />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit(form)">
@@ -42,9 +46,9 @@
</template>
<script lang="ts">
import request from '@/services'
import _ from 'lodash'
export default {
emits: ['updateWork', 'addWork', 'setDialogVisible'],
props: {
editForm: {
publisherId: '',
@@ -52,7 +56,8 @@ export default {
deadline: '',
content: '',
worker: []
}
},
workers: null
},
data() {
return {
@@ -64,12 +69,6 @@ export default {
content: '',
worker: []
},
workers: [
{
id: '',
username: ''
}
],
rules: {
worker: [
{
@@ -93,16 +92,10 @@ export default {
}
},
methods: {
getFormData() {
request.get('/user/department').then((response) => {
this.workers = response.data.data
})
},
onSubmit(form) {
// 表单校验
this.$refs.ruleForm.validate((value) => {
if (value) {
form.publisherId = _.toString(1)
if (this.editForm) {
this.$emit('updateWork', form)
this.reset()
@@ -116,7 +109,11 @@ export default {
})
},
reset() {
this.$refs.ruleForm.resetFields()
if (this.editForm) {
this.form = _.cloneDeep(this.editForm)
} else {
this.$refs.ruleForm.resetFields()
}
},
cancel() {
this.reset()
@@ -125,17 +122,15 @@ export default {
},
updated() {
if (this.editForm) {
this.form = this.editForm
this.form = _.cloneDeep(this.editForm)
this.commitButton = '保存'
}
this.getFormData()
},
created() {
if (this.editForm) {
this.form = this.editForm
this.form = _.cloneDeep(this.editForm)
this.commitButton = '保存'
}
this.getFormData()
}
}
</script>

63
ui/src/pages/profile/PersonalProfile.vue
View File

@@ -7,12 +7,12 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="名字" prop="firstName">
<el-input v-model="form.firstName" />
<el-input v-model="form.firstName" maxlength="20" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="姓氏" prop="lastName">
<el-input v-model="form.lastName" />
<el-input v-model="form.lastName" maxlength="20" />
</el-form-item>
</el-col>
</el-row>
@@ -57,13 +57,13 @@
</el-col>
</el-row>
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" />
<el-input v-model="form.email" maxlength="50" />
</el-form-item>
<el-form-item label="手机号码" prop="tel">
<el-input v-model="form.tel" />
<el-input v-model="form.tel" maxlength="20" />
</el-form-item>
<el-form-item label="联系地址" prop="address">
<el-input v-model="form.address" />
<el-input v-model="form.address" maxlength="100" show-word-limit />
</el-form-item>
<el-form-item style="float: right">
<el-button type="info" @click="resetForm">重置</el-button>
@@ -89,7 +89,11 @@ import _ from 'lodash'
import request from '@/services'
import { ElMessage } from 'element-plus'
import { requestUser } from '@/utils/auth'
import { DATABASE_SELECT_OK, DATABASE_UPDATE_OK } from '@/constants/Common.constants'
import {
DATABASE_SELECT_OK,
DATABASE_UPDATE_OK,
OLD_PASSWORD_NOT_MATCH
} from '@/constants/Common.constants'
export default {
data() {
@@ -148,7 +152,9 @@ export default {
required: true,
message: '请选择性别'
}
]
],
email: [{ validator: this.checkEmail }],
tel: [{ validator: this.checkTel }]
},
visible: false
}
@@ -203,10 +209,51 @@ export default {
this.form = _.cloneDeep(this.staff)
},
updatePasswd(passwdForm) {
this.visible = false
request
.put('/user/passwd', {
oldPasswd: passwdForm.oldPasswd,
newPasswd: passwdForm.newPasswd
})
.then(async (res) => {
const response = res.data
if (response.code === DATABASE_UPDATE_OK) {
ElMessage({
message: '修改成功',
type: 'success'
})
this.visible = false
} else if (response.code === OLD_PASSWORD_NOT_MATCH) {
ElMessage({
message: '旧密码错误，修改失败，请重试',
type: 'error'
})
} else {
ElMessage({
message: '系统错误，修改失败',
type: 'error'
})
}
})
},
cancelPasswd() {
this.visible = false
},
checkEmail(rule, value, callback) {
const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
if (mailReg.test(value)) {
callback()
} else {
return callback(new Error('邮箱格式错误！'))
}
},
checkTel(rule, value, callback) {
const telReg =
/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
if (telReg.test(value)) {
callback()
} else {
return callback(new Error('手机号格式错误！'))
}
}
},
created() {

46
ui/src/pages/work/Manage.vue
View File

@@ -37,7 +37,13 @@
round
style="margin-right: 10px"
>
{{ item.username }}
{{
item.staff.lastName +
item.staff.firstName +
'(' +
item.username +
')'
}}
</el-tag>
</template>
</el-table-column>
@@ -77,12 +83,27 @@
</el-table-column>
</el-table>
</div>
<el-dialog v-model="addVisible" width="60%">
<edit-work @setDialogVisible="setDialogVisible" @addWork="addWork"></edit-work>
<el-dialog
v-model="addVisible"
width="60%"
:show-close="false"
:close-on-click-modal="false"
>
<edit-work
:workers="workers"
@setDialogVisible="setDialogVisible"
@addWork="addWork"
></edit-work>
</el-dialog>
<el-dialog v-model="editVisible" width="60%">
<el-dialog
v-model="editVisible"
width="60%"
:show-close="false"
:close-on-click-modal="false"
>
<edit-work
:editForm="rowData"
:workers="workers"
@setDialogVisible="setDialogVisible"
@updateWork="updateWork"
></edit-work>
@@ -110,7 +131,8 @@ export default {
addVisible: false,
editVisible: false,
loading: true,
searchContent: ''
searchContent: '',
workers: []
}
},
methods: {
@@ -198,7 +220,7 @@ export default {
return new Date(time).toLocaleString()
},
searchByContent() {
request.get('/work', { content: this.searchContent }).then((res) => {
request.get('/work', { content: this.searchContent.trim() }).then((res) => {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.tableData = response.data
@@ -212,10 +234,20 @@ export default {
})
}
})
},
getWorkers() {
request.get('/user/department').then((res) => {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.workers = response.data
console.log(this.workers)
}
})
}
},
created() {
mounted() {
this.getTableData()
this.getWorkers()
},
components: {
EditWork