fix
Showing
2 changed files
with
23 additions
and
24 deletions
| ... | @@ -28,7 +28,7 @@ import { | ... | @@ -28,7 +28,7 @@ import { |
| 28 | import { TableColumnWidth } from "@/utils/enum"; | 28 | import { TableColumnWidth } from "@/utils/enum"; |
| 29 | import router from "@/router"; | 29 | import router from "@/router"; |
| 30 | import { download } from "@/utils/common"; | 30 | import { download } from "@/utils/common"; |
| 31 | import { da, sl } from "element-plus/es/locale"; | 31 | |
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | const currentPath = ref<string[]>([]); | 34 | const currentPath = ref<string[]>([]); |
| ... | @@ -146,7 +146,7 @@ onMounted(async () => { | ... | @@ -146,7 +146,7 @@ onMounted(async () => { |
| 146 | execGuid: execGuidInfo.value.execGuid, | 146 | execGuid: execGuidInfo.value.execGuid, |
| 147 | classifyDetail: classifyDetailGuidInfo.value | 147 | classifyDetail: classifyDetailGuidInfo.value |
| 148 | }); | 148 | }); |
| 149 | getDictionaryList(); | 149 | // getDictionaryList(); |
| 150 | getSearchTableList(); | 150 | getSearchTableList(); |
| 151 | // getLabelListData(); | 151 | // getLabelListData(); |
| 152 | getGradeData(refGradeGuid.value); | 152 | getGradeData(refGradeGuid.value); |
| ... | @@ -900,21 +900,22 @@ const classEditFormItems = ref<any>([{ | ... | @@ -900,21 +900,22 @@ const classEditFormItems = ref<any>([{ |
| 900 | clearable: true, | 900 | clearable: true, |
| 901 | block: true, | 901 | block: true, |
| 902 | visible: true, | 902 | visible: true, |
| 903 | }, { | ||
| 904 | label: '关联字典', | ||
| 905 | field: 'dictionaryGuid', | ||
| 906 | type: 'select', | ||
| 907 | placeholder: '请选择', | ||
| 908 | default: '', | ||
| 909 | options: [], | ||
| 910 | props: { | ||
| 911 | label: "chName", | ||
| 912 | value: "guid", | ||
| 913 | }, | ||
| 914 | filterable: true, | ||
| 915 | clearable: true, | ||
| 916 | required: false | ||
| 917 | }, | 903 | }, |
| 904 | //{ | ||
| 905 | // label: '关联字典', | ||
| 906 | // field: 'dictionaryGuid', | ||
| 907 | // type: 'select', | ||
| 908 | // placeholder: '请选择', | ||
| 909 | // default: '', | ||
| 910 | // options: [], | ||
| 911 | // props: { | ||
| 912 | // label: "chName", | ||
| 913 | // value: "guid", | ||
| 914 | // }, | ||
| 915 | // filterable: true, | ||
| 916 | // clearable: true, | ||
| 917 | // required: false | ||
| 918 | // }, | ||
| 918 | { | 919 | { |
| 919 | label: '字段取值范围', | 920 | label: '字段取值范围', |
| 920 | type: 'input', | 921 | type: 'input', |
| ... | @@ -1052,7 +1053,7 @@ const drawerBtnClick = async (btn, info) => { | ... | @@ -1052,7 +1053,7 @@ const drawerBtnClick = async (btn, info) => { |
| 1052 | } else { | 1053 | } else { |
| 1053 | btn.loading = true; | 1054 | btn.loading = true; |
| 1054 | console.log('drawerBtnClick', info); | 1055 | console.log('drawerBtnClick', info); |
| 1055 | const { orderNumLength, orderNum, startNumber, endNumber, fieldValueRange, startValue, endValue, fieldPrecision, dictionaryGuid, isUnique, notNull } = info; | 1056 | const { orderNumLength, orderNum, startNumber, endNumber, fieldValueRange, startValue, endValue, fieldPrecision, isUnique, notNull } = info; |
| 1056 | // 判断长度orderNumLength,orderNum 要么都有值,要么都没有值,不能只有一个有值,一个没有值精确提醒 | 1057 | // 判断长度orderNumLength,orderNum 要么都有值,要么都没有值,不能只有一个有值,一个没有值精确提醒 |
| 1057 | let fieldLengthCondition: any = ''; | 1058 | let fieldLengthCondition: any = ''; |
| 1058 | if ((orderNumLength === 'between' && !startNumber) || (orderNumLength === 'between' && !endNumber)) { | 1059 | if ((orderNumLength === 'between' && !startNumber) || (orderNumLength === 'between' && !endNumber)) { |
| ... | @@ -1091,7 +1092,6 @@ const drawerBtnClick = async (btn, info) => { | ... | @@ -1091,7 +1092,6 @@ const drawerBtnClick = async (btn, info) => { |
| 1091 | if (fieldValueRange) { | 1092 | if (fieldValueRange) { |
| 1092 | param = { | 1093 | param = { |
| 1093 | fieldPrecision, | 1094 | fieldPrecision, |
| 1094 | dictionaryGuid, | ||
| 1095 | isUnique, | 1095 | isUnique, |
| 1096 | notNull, | 1096 | notNull, |
| 1097 | fieldLengthCondition, | 1097 | fieldLengthCondition, |
| ... | @@ -1102,7 +1102,6 @@ const drawerBtnClick = async (btn, info) => { | ... | @@ -1102,7 +1102,6 @@ const drawerBtnClick = async (btn, info) => { |
| 1102 | } else { | 1102 | } else { |
| 1103 | param = { | 1103 | param = { |
| 1104 | fieldPrecision, | 1104 | fieldPrecision, |
| 1105 | dictionaryGuid, | ||
| 1106 | isUnique, | 1105 | isUnique, |
| 1107 | notNull, | 1106 | notNull, |
| 1108 | fieldLengthCondition, | 1107 | fieldLengthCondition, | ... | ... |
| ... | @@ -87,7 +87,7 @@ const getDictionaryList = () => { | ... | @@ -87,7 +87,7 @@ const getDictionaryList = () => { |
| 87 | onMounted(async () => { | 87 | onMounted(async () => { |
| 88 | await getFieldTypeData() | 88 | await getFieldTypeData() |
| 89 | await getBizRuleConfigDetailData() | 89 | await getBizRuleConfigDetailData() |
| 90 | getDictionaryList() | 90 | // getDictionaryList() |
| 91 | }) | 91 | }) |
| 92 | 92 | ||
| 93 | 93 | ||
| ... | @@ -335,7 +335,7 @@ const saveData = async () => { | ... | @@ -335,7 +335,7 @@ const saveData = async () => { |
| 335 | execGuid: router.currentRoute.value.query.execGuid, | 335 | execGuid: router.currentRoute.value.query.execGuid, |
| 336 | fieldLengthCondition: fieldLengthCondition, | 336 | fieldLengthCondition: fieldLengthCondition, |
| 337 | fieldPrecision: item.fieldPrecision, | 337 | fieldPrecision: item.fieldPrecision, |
| 338 | dictionaryGuid: item.dictionaryGuid, | 338 | // dictionaryGuid: item.dictionaryGuid, |
| 339 | isUnique: item.isUnique, | 339 | isUnique: item.isUnique, |
| 340 | notNull: item.notNull, | 340 | notNull: item.notNull, |
| 341 | fieldValueRange: item.fieldValueRange | 341 | fieldValueRange: item.fieldValueRange |
| ... | @@ -348,7 +348,7 @@ const saveData = async () => { | ... | @@ -348,7 +348,7 @@ const saveData = async () => { |
| 348 | execGuid: router.currentRoute.value.query.execGuid, | 348 | execGuid: router.currentRoute.value.query.execGuid, |
| 349 | fieldLengthCondition: fieldLengthCondition, | 349 | fieldLengthCondition: fieldLengthCondition, |
| 350 | fieldPrecision: item.fieldPrecision, | 350 | fieldPrecision: item.fieldPrecision, |
| 351 | dictionaryGuid: item.dictionaryGuid, | 351 | // dictionaryGuid: item.dictionaryGuid, |
| 352 | isUnique: item.isUnique, | 352 | isUnique: item.isUnique, |
| 353 | notNull: item.notNull, | 353 | notNull: item.notNull, |
| 354 | startValue: item.startValue, | 354 | startValue: item.startValue, |
| ... | @@ -627,7 +627,7 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null | ... | @@ -627,7 +627,7 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null |
| 627 | </el-table-column> | 627 | </el-table-column> |
| 628 | 628 | ||
| 629 | <!-- 关联字典(可编辑)el-tree-select 形式下拉形式 --> | 629 | <!-- 关联字典(可编辑)el-tree-select 形式下拉形式 --> |
| 630 | <el-table-column prop="dictionaryGuid" label="关联字典" width="150" align="left" show-overflow-tooltip> | 630 | <!-- <el-table-column prop="dictionaryGuid" label="关联字典" width="150" align="left" show-overflow-tooltip> |
| 631 | <template #default="scope"> | 631 | <template #default="scope"> |
| 632 | <span v-if="!scope.row.isEdit">{{ scope.row.dictionaryGuid | 632 | <span v-if="!scope.row.isEdit">{{ scope.row.dictionaryGuid |
| 633 | ? dictionaryList.find((item: any) => item.guid === scope.row.dictionaryGuid)?.chName : '--' }}</span> | 633 | ? 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 | ... | @@ -636,7 +636,7 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null |
| 636 | </el-select> | 636 | </el-select> |
| 637 | </template> | 637 | </template> |
| 638 | 638 | ||
| 639 | </el-table-column> | 639 | </el-table-column> --> |
| 640 | 640 | ||
| 641 | <!-- 数据是否唯一(可编辑) --> | 641 | <!-- 数据是否唯一(可编辑) --> |
| 642 | <el-table-column prop="isUnique" label="数据是否唯一" width="150" align="left" show-overflow-tooltip> | 642 | <el-table-column prop="isUnique" label="数据是否唯一" width="150" align="left" show-overflow-tooltip> | ... | ... |
-
Please register or sign in to post a comment