Skip to content

Commit

Permalink
doc: 一些文案修改 (#14)
Browse files Browse the repository at this point in the history
  • Loading branch information
@eryajf
eryajf authored Jul 10, 2022
1 parent 15707b7 commit 1147f62
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 50 deletions.
84 changes: 36 additions & 48 deletions src/views/personnel/fieldRelation/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,9 @@

<!-- 新增 -->
<el-dialog :title="dialogFormTitle" :visible.sync="updateLoading">
<el-link
class="link-title"
href="http://ldapdoc.eryajf.net/pages/84953d/"
target="_blank"
type="primary"
>新增说明文档</el-link>
<div class="components-container">
<aside>动态关系管理说明文档参考： <a href="http://ldapdoc.eryajf.net/pages/84953d/" target="_blank">动态字段关系管理</a></aside>
</div>
<el-form
ref="dialogForm"
size="small"
Expand All @@ -145,8 +142,8 @@
</el-checkbox-group>
</el-form-item>

<template v-if="checked == '创建用户动态'">
<el-form-item label="创建类型">
<template v-if="checked == '用户字段动态关联'">
<el-form-item label="类型标志">
<el-select
v-model="userVal"
placeholder="请选择"
Expand Down Expand Up @@ -224,6 +221,12 @@
/>
</el-form-item>
<el-form-item label="说明" prop="introduction">
<el-input
v-model.trim="dialogFormData.introduction"
placeholder="说明"
/>
</el-form-item>
<!-- <el-form-item label="说明" prop="introduction">
<el-input
v-model.trim="dialogFormData.introduction"
type="textarea"
Expand All @@ -232,10 +235,10 @@
show-word-limit
maxlength="100"
/>
</el-form-item>
</el-form-item> -->
</template>
<template v-else>
<el-form-item label="创建类型">
<el-form-item label="类型标志">
<el-select
v-model="groupVal"
placeholder="请选择"
Expand Down Expand Up @@ -270,11 +273,7 @@
<el-form-item label="分组描述" prop="remark">
<el-input
v-model.trim="dialogFormData.remark"
type="textarea"
placeholder="分组描述"
:autosize="{ minRows: 3, maxRows: 6 }"
show-word-limit
maxlength="100"
/>
</el-form-item>
</template>
Expand All @@ -292,25 +291,22 @@

<!-- 编辑 -->
<el-dialog :title="dialogFormTitle" :visible.sync="dialogFormVisible">
<el-link
class="link-title"
href="http://ldapdoc.eryajf.net/pages/84953d/"
target="_blank"
type="primary"
>修改说明文档</el-link>
<div class="components-container">
<aside>动态关系管理说明文档参考： <a href="http://ldapdoc.eryajf.net/pages/84953d/" target="_blank">动态字段关系管理</a></aside>
</div>
<el-form
ref="dialogForm"
size="small"
:model="dialogFormData"
:rules="dialogFormRules"
label-width="120px"
>
<template v-if="checked == '创建用户动态'">
<template v-if="checked == '用户字段动态关联'">
<el-form-item label="类型">
<el-button type="primary">创建用户动态</el-button>
<el-button type="primary">用户字段动态关联</el-button>
</el-form-item>

<el-form-item label="创建类型">
<el-form-item label="类型标志">
<el-select
v-model="userVal"
placeholder="请选择"
Expand Down Expand Up @@ -390,19 +386,15 @@
<el-form-item label="说明" prop="introduction">
<el-input
v-model.trim="dialogFormData.introduction"
type="textarea"
placeholder="说明"
:autosize="{ minRows: 3, maxRows: 6 }"
show-word-limit
maxlength="100"
/>
</el-form-item>
</template>
<template v-else>
<el-form-item label="类型">
<el-button type="primary">创建分组动态</el-button>
<el-button type="primary">分组字段动态关联</el-button>
</el-form-item>
<el-form-item label="创建类型">
<el-form-item label="类型标志">
<el-select
v-model="groupVal"
placeholder="请选择"
Expand Down Expand Up @@ -437,11 +429,7 @@
<el-form-item label="分组描述" prop="remark">
<el-input
v-model.trim="dialogFormData.remark"
type="textarea"
placeholder="分组描述"
:autosize="{ minRows: 3, maxRows: 6 }"
show-word-limit
maxlength="100"
/>
</el-form-item>
</template>
Expand Down Expand Up @@ -469,7 +457,7 @@ import {
relationUp,
relationDel
} from '@/api/personnel/fieldRelation'
const cityOptions = ['创建用户动态', '创建分组动态']
const cityOptions = ['用户字段动态关联', '分组字段动态关联']
export default {
name: 'FieldRelation',
components: {
Expand Down Expand Up @@ -513,7 +501,7 @@ export default {
userVal: '',
groupVal: '',
updateId: '',
checked: ['创建用户动态'], // 新增数据默认选中
checked: ['用户字段动态关联'], // 新增数据默认选中
cities: cityOptions, // 新增默认选中
// 查询参数
params: {
Expand Down Expand Up @@ -566,7 +554,7 @@ export default {
{ min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
],
username: [
{ required: true, message: '请输入创建类型', trigger: 'blur' },
{ required: true, message: '请输入类型标志', trigger: 'blur' },
{ min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
],
givenName: [
Expand Down Expand Up @@ -657,7 +645,7 @@ export default {
this.value = this.city
},
changeUser(e) {
this.userVal = e
},
changeGroup(e) {
Expand Down Expand Up @@ -711,7 +699,7 @@ export default {
// 新增
create() {
this.checked = ['创建用户动态'];
this.checked = ['用户字段动态关联'];
this.userVal = '',
this.groupVal = '',
this.dialogFormData = {},
Expand All @@ -722,9 +710,9 @@ export default {
},
// 修改
update(row) {
const typeDialog = row.Flag.split('_')[1]
const {
avatar,
givenName,
Expand All @@ -743,12 +731,12 @@ export default {
sourceDeptId,
sourceDeptParentId
} = row.Attributes
if (typeDialog === 'user') {
this.updateId = row.ID
this.checked = ['创建用户动态'];
this.checked = ['用户字段动态关联'];
this.userVal = row.Flag,
this.dialogFormData.username = username, // 用户名(通常为用户名拼音) name_pinyin
this.dialogFormData.nickname = nickname, // 中文名字 name
Expand All @@ -764,7 +752,7 @@ export default {
this.dialogFormData.sourceUnionId = sourceUnionId // 源用户唯一ID unionid
} else {
this.updateId = row.ID
this.checked = ['创建分组动态'];
this.checked = ['分组字段动态关联'];
this.groupVal = row.Flag
this.dialogFormData.groupName = groupName, // 分组名称（通常为分组名的拼音）
this.dialogFormData.remark = remark, // 分组描述
Expand All @@ -781,10 +769,10 @@ export default {
submitForm(e) {
// console.log(e,765)
let flag, attributes
if (this.checked[0] === '创建用户动态') {
if (this.checked[0] === '用户字段动态关联') {
if (this.userVal === '') {
this.$message({
message: '请选择创建类型',
message: '请选择类型标志',
type: 'warning'
})
return false
Expand All @@ -794,7 +782,7 @@ export default {
} else {
if (this.groupVal === '') {
this.$message({
message: '请选择创建类型',
message: '请选择类型标志',
type: 'warning'
})
return false
Expand Down
6 changes: 4 additions & 2 deletions src/views/personnel/group/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
<el-table-column show-overflow-tooltip sortable prop="groupType" label="类型" />
<el-table-column show-overflow-tooltip sortable prop="groupDn" label="DN" />
<el-table-column show-overflow-tooltip sortable prop="remark" label="描述" />
<el-table-column show-overflow-tooltip sortable prop="CreatedAt" label="创建时间" />
<el-table-column show-overflow-tooltip sortable prop="UpdatedAt" label="更新时间" />
<el-table-column fixed="right" label="操作" align="center" width="220">
<template #default="scope">
<el-tooltip v-if="scope.row.groupType != 'ou'" content="添加" effect="dark" placement="top">
Expand All @@ -61,10 +63,10 @@
<el-dialog :title="dialogFormTitle" :visible.sync="updateLoading">
<el-form ref="dialogForm" size="small" :model="dialogFormData" :rules="dialogFormRules" label-width="120px">
<el-form-item label="名称" prop="groupName">
<el-input v-model.trim="dialogFormData.groupName" placeholder="名称" />
<el-input v-model.trim="dialogFormData.groupName" placeholder="名称(拼音)" />
</el-form-item>
<el-form-item label="分组类型" prop="groupType">
<el-input v-model.trim="dialogFormData.groupType" placeholder="分组类型：ou/cn/..." />
<el-input v-model.trim="dialogFormData.groupType" placeholder="分组类型：ou或cn(建议仅第一层为ou)" />
</el-form-item>
<el-form-item label="上级分组" prop="parentId">
<treeselect
Expand Down
2 changes: 2 additions & 0 deletions src/views/personnel/user/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
<el-table-column show-overflow-tooltip sortable prop="creator" label="创建人" />
<el-table-column show-overflow-tooltip sortable prop="introduction" label="说明" />
<el-table-column show-overflow-tooltip sortable prop="userDn" label="DN" />
<el-table-column show-overflow-tooltip sortable prop="CreatedAt" label="创建时间" />
<el-table-column show-overflow-tooltip sortable prop="UpdatedAt" label="更新时间" />
<el-table-column fixed="right" label="操作" align="center" width="120">
<template slot-scope="scope">
<el-tooltip content="编辑" effect="dark" placement="top">
Expand Down

0 comments on commit 1147f62

Please sign in to comment.