fc2f9600 by xukangle

fix

1 parent ec4b80df
......@@ -28,7 +28,7 @@ import {
import { TableColumnWidth } from "@/utils/enum";
import router from "@/router";
import { download } from "@/utils/common";
import { da, sl } from "element-plus/es/locale";
const currentPath = ref<string[]>([]);
......@@ -146,7 +146,7 @@ onMounted(async () => {
execGuid: execGuidInfo.value.execGuid,
classifyDetail: classifyDetailGuidInfo.value
});
getDictionaryList();
// getDictionaryList();
getSearchTableList();
// getLabelListData();
getGradeData(refGradeGuid.value);
......@@ -900,21 +900,22 @@ const classEditFormItems = ref<any>([{
clearable: true,
block: true,
visible: true,
}, {
label: '关联字典',
field: 'dictionaryGuid',
type: 'select',
placeholder: '请选择',
default: '',
options: [],
props: {
label: "chName",
value: "guid",
},
filterable: true,
clearable: true,
required: false
},
//{
// label: '关联字典',
// field: 'dictionaryGuid',
// type: 'select',
// placeholder: '请选择',
// default: '',
// options: [],
// props: {
// label: "chName",
// value: "guid",
// },
// filterable: true,
// clearable: true,
// required: false
// },
{
label: '字段取值范围',
type: 'input',
......@@ -1052,7 +1053,7 @@ const drawerBtnClick = async (btn, info) => {
} else {
btn.loading = true;
console.log('drawerBtnClick', info);
const { orderNumLength, orderNum, startNumber, endNumber, fieldValueRange, startValue, endValue, fieldPrecision, dictionaryGuid, isUnique, notNull } = info;
const { orderNumLength, orderNum, startNumber, endNumber, fieldValueRange, startValue, endValue, fieldPrecision, isUnique, notNull } = info;
// 判断长度orderNumLength,orderNum 要么都有值,要么都没有值,不能只有一个有值,一个没有值精确提醒
let fieldLengthCondition: any = '';
if ((orderNumLength === 'between' && !startNumber) || (orderNumLength === 'between' && !endNumber)) {
......@@ -1091,7 +1092,6 @@ const drawerBtnClick = async (btn, info) => {
if (fieldValueRange) {
param = {
fieldPrecision,
dictionaryGuid,
isUnique,
notNull,
fieldLengthCondition,
......@@ -1102,7 +1102,6 @@ const drawerBtnClick = async (btn, info) => {
} else {
param = {
fieldPrecision,
dictionaryGuid,
isUnique,
notNull,
fieldLengthCondition,
......
......@@ -87,7 +87,7 @@ const getDictionaryList = () => {
onMounted(async () => {
await getFieldTypeData()
await getBizRuleConfigDetailData()
getDictionaryList()
// getDictionaryList()
})
......@@ -335,7 +335,7 @@ const saveData = async () => {
execGuid: router.currentRoute.value.query.execGuid,
fieldLengthCondition: fieldLengthCondition,
fieldPrecision: item.fieldPrecision,
dictionaryGuid: item.dictionaryGuid,
// dictionaryGuid: item.dictionaryGuid,
isUnique: item.isUnique,
notNull: item.notNull,
fieldValueRange: item.fieldValueRange
......@@ -348,7 +348,7 @@ const saveData = async () => {
execGuid: router.currentRoute.value.query.execGuid,
fieldLengthCondition: fieldLengthCondition,
fieldPrecision: item.fieldPrecision,
dictionaryGuid: item.dictionaryGuid,
// dictionaryGuid: item.dictionaryGuid,
isUnique: item.isUnique,
notNull: item.notNull,
startValue: item.startValue,
......@@ -627,7 +627,7 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null
</el-table-column>
<!-- 关联字典(可编辑)el-tree-select 形式下拉形式 -->
<el-table-column prop="dictionaryGuid" label="关联字典" width="150" align="left" show-overflow-tooltip>
<!-- <el-table-column prop="dictionaryGuid" label="关联字典" width="150" align="left" show-overflow-tooltip>
<template #default="scope">
<span v-if="!scope.row.isEdit">{{ scope.row.dictionaryGuid
? dictionaryList.find((item: any) => item.guid === scope.row.dictionaryGuid)?.chName : '--' }}</span>
......@@ -636,7 +636,7 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null
</el-select>
</template>
</el-table-column>
</el-table-column> -->
<!-- 数据是否唯一(可编辑) -->
<el-table-column prop="isUnique" label="数据是否唯一" width="150" align="left" show-overflow-tooltip>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!