7a549942 by lxs

结果确认界面调整

1 parent c46e1eb4
......@@ -172,10 +172,7 @@ const fieldItemList = ref([
{ label: '已分类', value: 'Y' },
{ label: '未分类', value: 'N' },
],
props: {
// label: 'name',
// value: 'dbGuid'
},
props: { },
clearable: true,
},
{
......@@ -192,7 +189,6 @@ const fieldItemList = ref([
label: "classifyName",
value: "classifyDetailGuid",
},
// popperClass: 'strictiy_cascader',
filterable: true,
clearable: true,
blur: true
......@@ -231,18 +227,13 @@ const sheetTableInfo = ref({
id: "mapping-table",
fields: [
{ label: "序号", type: "index", width: 56, align: "center", fixed: "left" },
// {
// label: "分类分级变更状态", field: "isCgChange", width: 140, align: 'center', type: "tag", getName: (scope) => {
// return filterVal(scope.row.isCgChange, 'isCgChange');
// }
// },
{ label: "表中文名", field: "tableChName", width: 120 },
{ label: "表中文名", field: "tableChName", width: 180 },
{
label: "表英文名", field: "tableName", width: 200, type: "text_btn", value: 'tab'
},
{ label: "数据库名", field: "databaseChName", width: 120 },
{ label: "数据库名", field: "databaseChName", width: 140 },
{ label: "数据库名称", field: "database", width: 200 },
{ label: "字段数", field: "fieldNum", width: 96, align: 'right' },
{ label: "字段数", field: "fieldNum", width: 80, align: 'right' },
{ label: "已分类字段数", field: "classifyFieldNum", width: 120, align: 'right' },
{ label: "已分级字段数", field: "gradeFieldNum", width: 120, align: 'right' },
],
......@@ -303,8 +294,8 @@ const fieldTableInfo = ref({
{ label: "标签", field: "label", width: 120 },
{ label: "规则", field: "ruleDetail", width: 200 },
{ label: "表英文名", field: "tableName", width: 200 },
{ label: "表中文名", field: "tableChName", width: 120 },
{ label: "数据库名", field: "databaseChName", width: 120 },
{ label: "表中文名", field: "tableChName", width: 140 },
{ label: "数据库名", field: "databaseChName", width: 140 },
{ label: "数据库名称", field: "database", width: 200 },
],
loading: false,
......@@ -404,7 +395,6 @@ const getTaskDetail = (param) => {
loading.value = false;
if (res.code == proxy.$passCode) {
taskDetail.value = res.data || {};
// taskDetail.value.confirmStatus != 'Y' && (showBtns.value = true);
getFieldCount()
getSheetFieldList({ type: 1 });
getFieldTree()
......@@ -566,7 +556,6 @@ const getFieldTableData = () => {
isMergeClassify: checked1.value ? 'Y' : 'N'
}
const classifyName = params.classifyName?.at(-1) || undefined;
// params.isClassify = classifyName === undefined ? '' : classifyName == 'unclassified' ? 'N' : 'Y';
if (classifyName && classifyName != 'unclassified') {
params.classifyDetail = classifyName;
}
......@@ -629,7 +618,6 @@ const tableBtnClick = (scope, btn) => {
row.classifyDetailGuid = cascaderData.length ? cascaderData[0].value : '';
row.classifyDetailName = cascaderData.length ? cascaderData[0].label : '';
row.gradeDetailName = gradeList.value.find(item => item.guid == row.gradeDetailGuid)?.gradeName;
row.STATE = '';
if (cascaderData.length && row.gradeDetailGuid) {
const params = [
{
......@@ -642,6 +630,15 @@ const tableBtnClick = (scope, btn) => {
}
];
saveFields(params)
row.STATE = '';
} else {
if(row.classifyDetailGuid && row.gradeDetailGuid == ''){
ElMessage.error('分级不能为空');
} else if(row.classifyDetailGuid == '' && row.gradeDetailGuid){
ElMessage.error('分类不能为空');
} else {
ElMessage.error('分类和分级均不能为空');
}
}
}
};
......
......@@ -347,6 +347,7 @@ const handleScroll = () => {
const listClick = (row) => {
selectIndex.value = row.guid;
templateInfo.value = row;
loading.value = true;
getClassifyTree();
searchItemValue.value.classifyGuid = row.guid;
searchItemValue.value.detailGuid = '';
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!