结果确认界面调整
Showing
2 changed files
with
16 additions
and
18 deletions
| ... | @@ -172,10 +172,7 @@ const fieldItemList = ref([ | ... | @@ -172,10 +172,7 @@ const fieldItemList = ref([ |
| 172 | { label: '已分类', value: 'Y' }, | 172 | { label: '已分类', value: 'Y' }, |
| 173 | { label: '未分类', value: 'N' }, | 173 | { label: '未分类', value: 'N' }, |
| 174 | ], | 174 | ], |
| 175 | props: { | 175 | props: { }, |
| 176 | // label: 'name', | ||
| 177 | // value: 'dbGuid' | ||
| 178 | }, | ||
| 179 | clearable: true, | 176 | clearable: true, |
| 180 | }, | 177 | }, |
| 181 | { | 178 | { |
| ... | @@ -192,7 +189,6 @@ const fieldItemList = ref([ | ... | @@ -192,7 +189,6 @@ const fieldItemList = ref([ |
| 192 | label: "classifyName", | 189 | label: "classifyName", |
| 193 | value: "classifyDetailGuid", | 190 | value: "classifyDetailGuid", |
| 194 | }, | 191 | }, |
| 195 | // popperClass: 'strictiy_cascader', | ||
| 196 | filterable: true, | 192 | filterable: true, |
| 197 | clearable: true, | 193 | clearable: true, |
| 198 | blur: true | 194 | blur: true |
| ... | @@ -231,18 +227,13 @@ const sheetTableInfo = ref({ | ... | @@ -231,18 +227,13 @@ const sheetTableInfo = ref({ |
| 231 | id: "mapping-table", | 227 | id: "mapping-table", |
| 232 | fields: [ | 228 | fields: [ |
| 233 | { label: "序号", type: "index", width: 56, align: "center", fixed: "left" }, | 229 | { label: "序号", type: "index", width: 56, align: "center", fixed: "left" }, |
| 234 | // { | 230 | { label: "表中文名", field: "tableChName", width: 180 }, |
| 235 | // label: "分类分级变更状态", field: "isCgChange", width: 140, align: 'center', type: "tag", getName: (scope) => { | ||
| 236 | // return filterVal(scope.row.isCgChange, 'isCgChange'); | ||
| 237 | // } | ||
| 238 | // }, | ||
| 239 | { label: "表中文名", field: "tableChName", width: 120 }, | ||
| 240 | { | 231 | { |
| 241 | label: "表英文名", field: "tableName", width: 200, type: "text_btn", value: 'tab' | 232 | label: "表英文名", field: "tableName", width: 200, type: "text_btn", value: 'tab' |
| 242 | }, | 233 | }, |
| 243 | { label: "数据库名", field: "databaseChName", width: 120 }, | 234 | { label: "数据库名", field: "databaseChName", width: 140 }, |
| 244 | { label: "数据库名称", field: "database", width: 200 }, | 235 | { label: "数据库名称", field: "database", width: 200 }, |
| 245 | { label: "字段数", field: "fieldNum", width: 96, align: 'right' }, | 236 | { label: "字段数", field: "fieldNum", width: 80, align: 'right' }, |
| 246 | { label: "已分类字段数", field: "classifyFieldNum", width: 120, align: 'right' }, | 237 | { label: "已分类字段数", field: "classifyFieldNum", width: 120, align: 'right' }, |
| 247 | { label: "已分级字段数", field: "gradeFieldNum", width: 120, align: 'right' }, | 238 | { label: "已分级字段数", field: "gradeFieldNum", width: 120, align: 'right' }, |
| 248 | ], | 239 | ], |
| ... | @@ -303,8 +294,8 @@ const fieldTableInfo = ref({ | ... | @@ -303,8 +294,8 @@ const fieldTableInfo = ref({ |
| 303 | { label: "标签", field: "label", width: 120 }, | 294 | { label: "标签", field: "label", width: 120 }, |
| 304 | { label: "规则", field: "ruleDetail", width: 200 }, | 295 | { label: "规则", field: "ruleDetail", width: 200 }, |
| 305 | { label: "表英文名", field: "tableName", width: 200 }, | 296 | { label: "表英文名", field: "tableName", width: 200 }, |
| 306 | { label: "表中文名", field: "tableChName", width: 120 }, | 297 | { label: "表中文名", field: "tableChName", width: 140 }, |
| 307 | { label: "数据库名", field: "databaseChName", width: 120 }, | 298 | { label: "数据库名", field: "databaseChName", width: 140 }, |
| 308 | { label: "数据库名称", field: "database", width: 200 }, | 299 | { label: "数据库名称", field: "database", width: 200 }, |
| 309 | ], | 300 | ], |
| 310 | loading: false, | 301 | loading: false, |
| ... | @@ -404,7 +395,6 @@ const getTaskDetail = (param) => { | ... | @@ -404,7 +395,6 @@ const getTaskDetail = (param) => { |
| 404 | loading.value = false; | 395 | loading.value = false; |
| 405 | if (res.code == proxy.$passCode) { | 396 | if (res.code == proxy.$passCode) { |
| 406 | taskDetail.value = res.data || {}; | 397 | taskDetail.value = res.data || {}; |
| 407 | // taskDetail.value.confirmStatus != 'Y' && (showBtns.value = true); | ||
| 408 | getFieldCount() | 398 | getFieldCount() |
| 409 | getSheetFieldList({ type: 1 }); | 399 | getSheetFieldList({ type: 1 }); |
| 410 | getFieldTree() | 400 | getFieldTree() |
| ... | @@ -566,7 +556,6 @@ const getFieldTableData = () => { | ... | @@ -566,7 +556,6 @@ const getFieldTableData = () => { |
| 566 | isMergeClassify: checked1.value ? 'Y' : 'N' | 556 | isMergeClassify: checked1.value ? 'Y' : 'N' |
| 567 | } | 557 | } |
| 568 | const classifyName = params.classifyName?.at(-1) || undefined; | 558 | const classifyName = params.classifyName?.at(-1) || undefined; |
| 569 | // params.isClassify = classifyName === undefined ? '' : classifyName == 'unclassified' ? 'N' : 'Y'; | ||
| 570 | if (classifyName && classifyName != 'unclassified') { | 559 | if (classifyName && classifyName != 'unclassified') { |
| 571 | params.classifyDetail = classifyName; | 560 | params.classifyDetail = classifyName; |
| 572 | } | 561 | } |
| ... | @@ -629,7 +618,6 @@ const tableBtnClick = (scope, btn) => { | ... | @@ -629,7 +618,6 @@ const tableBtnClick = (scope, btn) => { |
| 629 | row.classifyDetailGuid = cascaderData.length ? cascaderData[0].value : ''; | 618 | row.classifyDetailGuid = cascaderData.length ? cascaderData[0].value : ''; |
| 630 | row.classifyDetailName = cascaderData.length ? cascaderData[0].label : ''; | 619 | row.classifyDetailName = cascaderData.length ? cascaderData[0].label : ''; |
| 631 | row.gradeDetailName = gradeList.value.find(item => item.guid == row.gradeDetailGuid)?.gradeName; | 620 | row.gradeDetailName = gradeList.value.find(item => item.guid == row.gradeDetailGuid)?.gradeName; |
| 632 | row.STATE = ''; | ||
| 633 | if (cascaderData.length && row.gradeDetailGuid) { | 621 | if (cascaderData.length && row.gradeDetailGuid) { |
| 634 | const params = [ | 622 | const params = [ |
| 635 | { | 623 | { |
| ... | @@ -642,6 +630,15 @@ const tableBtnClick = (scope, btn) => { | ... | @@ -642,6 +630,15 @@ const tableBtnClick = (scope, btn) => { |
| 642 | } | 630 | } |
| 643 | ]; | 631 | ]; |
| 644 | saveFields(params) | 632 | saveFields(params) |
| 633 | row.STATE = ''; | ||
| 634 | } else { | ||
| 635 | if(row.classifyDetailGuid && row.gradeDetailGuid == ''){ | ||
| 636 | ElMessage.error('分级不能为空'); | ||
| 637 | } else if(row.classifyDetailGuid == '' && row.gradeDetailGuid){ | ||
| 638 | ElMessage.error('分类不能为空'); | ||
| 639 | } else { | ||
| 640 | ElMessage.error('分类和分级均不能为空'); | ||
| 641 | } | ||
| 645 | } | 642 | } |
| 646 | } | 643 | } |
| 647 | }; | 644 | }; | ... | ... |
| ... | @@ -347,6 +347,7 @@ const handleScroll = () => { | ... | @@ -347,6 +347,7 @@ const handleScroll = () => { |
| 347 | const listClick = (row) => { | 347 | const listClick = (row) => { |
| 348 | selectIndex.value = row.guid; | 348 | selectIndex.value = row.guid; |
| 349 | templateInfo.value = row; | 349 | templateInfo.value = row; |
| 350 | loading.value = true; | ||
| 350 | getClassifyTree(); | 351 | getClassifyTree(); |
| 351 | searchItemValue.value.classifyGuid = row.guid; | 352 | searchItemValue.value.classifyGuid = row.guid; |
| 352 | searchItemValue.value.detailGuid = ''; | 353 | searchItemValue.value.detailGuid = ''; | ... | ... |
-
Please register or sign in to post a comment