|
@@ -6,6 +6,7 @@ import Region from '@ER/region/Region'
|
|
import { areaList } from '@vant/area-data'
|
|
import { areaList } from '@vant/area-data'
|
|
import { useI18n } from '../use-i18n'
|
|
import { useI18n } from '../use-i18n'
|
|
import utils from '@ER/utils'
|
|
import utils from '@ER/utils'
|
|
|
|
+// import dict from '@/api/system/dict'
|
|
const findPosition = (node, parent) => {
|
|
const findPosition = (node, parent) => {
|
|
for (let y = 0; y < parent.list.length; y++) {
|
|
for (let y = 0; y < parent.list.length; y++) {
|
|
const row = parent.list[y]
|
|
const row = parent.list[y]
|
|
@@ -297,6 +298,16 @@ export const useProps = (state, data, isPc = true, isRoot = false, specialHandli
|
|
// 当前选中的值,如果是人员就获取人员的api,部门就获取部门的api
|
|
// 当前选中的值,如果是人员就获取人员的api,部门就获取部门的api
|
|
if ([2, 3].indexOf(renderType) > -1) {
|
|
if ([2, 3].indexOf(renderType) > -1) {
|
|
result.options = options?.options
|
|
result.options = options?.options
|
|
|
|
+ } else if (renderType === 4) {
|
|
|
|
+ // 字典类型
|
|
|
|
+ const _dictOption = (options?.options || []).find(v => v.code === options.dictCode)
|
|
|
|
+ // console.error(options?.options, 'options?.options _dictOption', _dictOption)
|
|
|
|
+ /*if (_dictOption) {
|
|
|
|
+ if (!_dictOption.options.length) {
|
|
|
|
+ _dictOption.options = dict.dictListSelectOptionApi(options.dictCode).then(({ title, content }) => ({ label: title, value: content }))
|
|
|
|
+ }
|
|
|
|
+ }*/
|
|
|
|
+ result.options = _dictOption?.options
|
|
} else if (renderType === 1) {
|
|
} else if (renderType === 1) {
|
|
result.options = _.get(state, `data[${options.dataKey}].list`, [])
|
|
result.options = _.get(state, `data[${options.dataKey}].list`, [])
|
|
}
|
|
}
|
|
@@ -387,6 +398,7 @@ export const useProps = (state, data, isPc = true, isRoot = false, specialHandli
|
|
break
|
|
break
|
|
case 'cascader':
|
|
case 'cascader':
|
|
if (renderType === 2) {
|
|
if (renderType === 2) {
|
|
|
|
+ // 部门类型
|
|
result.options = options?.options
|
|
result.options = options?.options
|
|
} else if (renderType === 1) {
|
|
} else if (renderType === 1) {
|
|
result.options = _.get(state, `data[${options.dataKey}].list`, [])
|
|
result.options = _.get(state, `data[${options.dataKey}].list`, [])
|