[update] 属性类型增加多选用户
This commit is contained in:
@@ -307,7 +307,8 @@ export default {
|
|||||||
FieldType.TREE_SINGLE.value,
|
FieldType.TREE_SINGLE.value,
|
||||||
FieldType.TREE_MODAL_SELECT.value,
|
FieldType.TREE_MODAL_SELECT.value,
|
||||||
FieldType.TREE_MODAL_SELECT_SEARCH_DIFF.value,
|
FieldType.TREE_MODAL_SELECT_SEARCH_DIFF.value,
|
||||||
FieldType.TREE_MODAL_SELECT_SEARCH_CHILD.value
|
FieldType.TREE_MODAL_SELECT_SEARCH_CHILD.value,
|
||||||
|
FieldType.USER_MORE.value
|
||||||
],
|
],
|
||||||
queryParams: {},
|
queryParams: {},
|
||||||
isDragging: false, // 是否拖拽中
|
isDragging: false, // 是否拖拽中
|
||||||
|
|||||||
@@ -155,6 +155,15 @@
|
|||||||
:optionsHref="item.treeFirstHref"
|
:optionsHref="item.treeFirstHref"
|
||||||
:parentChildRelateDefault="item.dbFieldName !== 'part_name'"
|
:parentChildRelateDefault="item.dbFieldName !== 'part_name'"
|
||||||
:dict-id="item.dictId"/>
|
:dict-id="item.dictId"/>
|
||||||
|
<!-- 19, 多选用户 -->
|
||||||
|
<user-selection v-else-if="item.fieldShowType === FieldType.USER_MORE.value"
|
||||||
|
:placeholder="$t('pleaseSelect')+item.dbFieldTxt"
|
||||||
|
v-model="formInline[item.dbFieldName]"
|
||||||
|
:filedName="item.dbFieldName"
|
||||||
|
@nameChange="userSelectNameChange"
|
||||||
|
:nameStr="formInline[item.dbFieldName + '_dictText']"
|
||||||
|
type="checkbox"
|
||||||
|
:disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
</template>
|
</template>
|
||||||
<!-- 输入框 -->
|
<!-- 输入框 -->
|
||||||
<template
|
<template
|
||||||
v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,
|
v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,FieldType.USER_MORE.value,
|
||||||
FieldType.STANDARD_MORE.value,FieldType.TREE_MODAL_SELECT.value]
|
FieldType.STANDARD_MORE.value,FieldType.TREE_MODAL_SELECT.value]
|
||||||
.includes(item.fieldShowType)">
|
.includes(item.fieldShowType)">
|
||||||
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
@@ -214,7 +214,7 @@
|
|||||||
</a-form-item>
|
</a-form-item>
|
||||||
</template>
|
</template>
|
||||||
<!-- 输入框 -->
|
<!-- 输入框 -->
|
||||||
<template v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,
|
<template v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,FieldType.USER_MORE.value,
|
||||||
FieldType.STANDARD_MORE.value,FieldType.TREE_MODAL_SELECT.value]
|
FieldType.STANDARD_MORE.value,FieldType.TREE_MODAL_SELECT.value]
|
||||||
.includes(item.fieldShowType)">
|
.includes(item.fieldShowType)">
|
||||||
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
|
|||||||
@@ -30,7 +30,8 @@ export const FieldType = {
|
|||||||
TREE_SINGLE: { text: '树形结构(单选)', value: '15' },
|
TREE_SINGLE: { text: '树形结构(单选)', value: '15' },
|
||||||
TREE_MODAL_SELECT: { text: '树形弹框', value: '16' },
|
TREE_MODAL_SELECT: { text: '树形弹框', value: '16' },
|
||||||
TREE_MODAL_SELECT_SEARCH_DIFF: { text: '树形弹框(查询带出子集和单线父级)', value: '17' },
|
TREE_MODAL_SELECT_SEARCH_DIFF: { text: '树形弹框(查询带出子集和单线父级)', value: '17' },
|
||||||
TREE_MODAL_SELECT_SEARCH_CHILD: { text: '树形弹框(查询带出所有子级)', value: '18' }
|
TREE_MODAL_SELECT_SEARCH_CHILD: { text: '树形弹框(查询带出所有子级)', value: '18' },
|
||||||
|
USER_MORE: { text: '多选用户弹框', value: '19' }
|
||||||
}
|
}
|
||||||
|
|
||||||
export const TagsTypeEnums = new EsEnums({
|
export const TagsTypeEnums = new EsEnums({
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ const NEED_DICT_FIELD_TYPE = [
|
|||||||
FieldType.TREE_SINGLE.value,
|
FieldType.TREE_SINGLE.value,
|
||||||
FieldType.TREE_MODAL_SELECT.value,
|
FieldType.TREE_MODAL_SELECT.value,
|
||||||
FieldType.TREE_MODAL_SELECT_SEARCH_DIFF.value,
|
FieldType.TREE_MODAL_SELECT_SEARCH_DIFF.value,
|
||||||
FieldType.TREE_MODAL_SELECT_SEARCH_CHILD.value
|
FieldType.TREE_MODAL_SELECT_SEARCH_CHILD.value,
|
||||||
|
FieldType.USER_MORE.value
|
||||||
]
|
]
|
||||||
|
|
||||||
const ZH = 'zh-cn'
|
const ZH = 'zh-cn'
|
||||||
|
|||||||
@@ -56,7 +56,7 @@
|
|||||||
</template>
|
</template>
|
||||||
<!-- 输入框 -->
|
<!-- 输入框 -->
|
||||||
<template
|
<template
|
||||||
v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,
|
v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,FieldType.USER_MORE.value,
|
||||||
FieldType.STANDARD_MORE.value,FieldType.TREE_MODAL_SELECT.value]
|
FieldType.STANDARD_MORE.value,FieldType.TREE_MODAL_SELECT.value]
|
||||||
.includes(item.fieldShowType)">
|
.includes(item.fieldShowType)">
|
||||||
<a-input :placeholder="$t('pleaseEnter')+item.dbFieldTxt"
|
<a-input :placeholder="$t('pleaseEnter')+item.dbFieldTxt"
|
||||||
|
|||||||
@@ -176,6 +176,15 @@
|
|||||||
:optionsHref="item.treeFirstHref"
|
:optionsHref="item.treeFirstHref"
|
||||||
:parentChildRelateDefault="item.dbFieldName !== 'part_name'"
|
:parentChildRelateDefault="item.dbFieldName !== 'part_name'"
|
||||||
:dict-id="item.dictId"/>
|
:dict-id="item.dictId"/>
|
||||||
|
<!-- 19, 多选用户 -->
|
||||||
|
<user-selection v-else-if="item.fieldShowType === FieldType.USER_MORE.value"
|
||||||
|
:placeholder="$t('pleaseSelect')+item.dbFieldTxt + getPlaceholderSuffix(item)"
|
||||||
|
v-model="formInline[item.dbFieldName]"
|
||||||
|
:filedName="item.dbFieldName"
|
||||||
|
@nameChange="userSelectNameChange"
|
||||||
|
:nameStr="formInline[item.dbFieldName + '_dictText']"
|
||||||
|
type="checkbox"
|
||||||
|
:disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -167,6 +167,15 @@
|
|||||||
@nameChange="treeDataSelectNameChange"
|
@nameChange="treeDataSelectNameChange"
|
||||||
:optionsHref="item.treeFirstHref"
|
:optionsHref="item.treeFirstHref"
|
||||||
:dict-id="item.dictId"/>
|
:dict-id="item.dictId"/>
|
||||||
|
<!-- 19, 多选用户 -->
|
||||||
|
<user-selection v-else-if="item.fieldShowType === FieldType.USER_MORE.value"
|
||||||
|
:placeholder="$t('pleaseSelect')+item.dbFieldTxt + getPlaceholderSuffix(item)"
|
||||||
|
v-model="formInline[item.dbFieldName]"
|
||||||
|
:filedName="item.dbFieldName"
|
||||||
|
@nameChange="userSelectNameChange"
|
||||||
|
:nameStr="formInline[item.dbFieldName + '_dictText']"
|
||||||
|
type="checkbox"
|
||||||
|
:disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ export default {
|
|||||||
associated_file: 'enterpriseStandard:associatedFile:look' // 关联文件
|
associated_file: 'enterpriseStandard:associatedFile:look' // 关联文件
|
||||||
},
|
},
|
||||||
// 需要数据字段翻译的属性类型
|
// 需要数据字段翻译的属性类型
|
||||||
needDictFieldList: [FieldType.USER_SINGLE.value, FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value, FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value],
|
needDictFieldList: [FieldType.USER_SINGLE.value, FieldType.USER_MORE.value, FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value, FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value],
|
||||||
// 需要双语切换翻译的属性类型
|
// 需要双语切换翻译的属性类型
|
||||||
needEnNameFieldType: [FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value],
|
needEnNameFieldType: [FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value],
|
||||||
// 是双语切换翻译的属性,但是不翻译的字段
|
// 是双语切换翻译的属性,但是不翻译的字段
|
||||||
|
|||||||
+1
-1
@@ -216,7 +216,7 @@ export default {
|
|||||||
fileField: [],
|
fileField: [],
|
||||||
// 参与只允许查看
|
// 参与只允许查看
|
||||||
// 需要数据字段翻译的属性类型
|
// 需要数据字段翻译的属性类型
|
||||||
needDictFieldList: [FieldType.USER_SINGLE.value, FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value, FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value],
|
needDictFieldList: [FieldType.USER_SINGLE.value, FieldType.USER_MORE.value, FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value, FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value],
|
||||||
image: false,
|
image: false,
|
||||||
imageUrl: null,
|
imageUrl: null,
|
||||||
// 标准字段,需要跳转标准详情
|
// 标准字段,需要跳转标准详情
|
||||||
|
|||||||
Reference in New Issue
Block a user