Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
96bc17ea by lihua
Options

fix

1 parent 494600b6
Inline Side-by-side
Showing 5 changed files with 27 additions and 25 deletions
src/views/data_asset/qualityEvaluate.vue
......@@ -795,14 +795,14 @@ const passCommonDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit" },
{ type: "primary", label: "确定", value: "submit", loading: false },
],
},
});
const passCommonDialogBtnClick = (btn, info) => {
if (btn.value == 'submit') {
tableInfo.value.loading = true;
passCommonDialogInfo.value.footer.btns[1].loading = true;
let params = {
guid: currTableData.value.approveVO.approveGuid,
flowType: currTableData.value.approveVO.flowType,
......@@ -810,7 +810,7 @@ const passCommonDialogBtnClick = (btn, info) => {
approveStaffGuid: userData.staffGuid
}
passFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
tableInfo.value.loading = false;
passCommonDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
if (res.data) {
ElMessage.success('审批成功');
......@@ -822,9 +822,7 @@ const passCommonDialogBtnClick = (btn, info) => {
} else {
ElMessage.error(res.msg);
}
}).catch(() => {
tableInfo.value.loading = false;
});
})
} else if (btn.value == 'cancel') {
passCommonDialogInfo.value.visible = false;
}
......
src/views/data_asset/registerCatalogDetail.vue
......@@ -752,7 +752,7 @@ const rejectDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit" },
{ type: "primary", label: "确定", value: "submit", loading: false },
],
},
});
......@@ -770,7 +770,9 @@ const rejectDialogBtnClick = (btn, info) => {
approveSuggest: info.approveSuggest,
approveStaffGuid: userData.staffGuid,
}
rejectDialogInfo.value.footer.btns[1].loading = true;
rejectFlowData(params, route.query.serviceTenantGuid).then((res: any) => {
rejectDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
if (res.data) {
ElMessage.success('驳回成功');
......@@ -820,7 +822,7 @@ const passCommonDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit" },
{ type: "primary", label: "确定", value: "submit", loading: true },
],
},
});
......@@ -833,7 +835,9 @@ const passCommonDialogBtnClick = (btn, info) => {
approveSuggest: info.approveSuggest,
approveStaffGuid: userData.staffGuid,
}
passCommonDialogInfo.value.footer.btns[1].loading = true;
passFlowData(params, route.query.serviceTenantGuid).then((res: any) => {
passCommonDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
if (res.data) {
ElMessage.success('驳回成功');
......
src/views/data_asset/registerDetail.vue
......@@ -1116,7 +1116,7 @@ const rejectDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit" },
{ type: "primary", label: "确定", value: "submit", loading: true },
],
},
});
......@@ -1127,6 +1127,7 @@ const rejectDialogBtnClick = (btn, info) => {
ElMessage.error('请填写驳回理由');
return
}
rejectDialogInfo.value.footer.btns[1].loading = true;
//资产登记的驳回。
let params = {
guid: detailInfo.value.approveVO.approveGuid,
......@@ -1135,6 +1136,7 @@ const rejectDialogBtnClick = (btn, info) => {
approveStaffGuid: userData.staffGuid
}
rejectFlowData(params, serviceTenantGuid.value).then((res: any) => {
rejectDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
if (res.data) {
ElMessage.success('驳回成功');
......@@ -1202,7 +1204,7 @@ const passCommonDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit" },
{ type: "primary", label: "确定", value: "submit", loading: true },
],
},
});
......@@ -1215,7 +1217,9 @@ const passCommonDialogBtnClick = (btn, info) => {
approveSuggest: info.approveSuggest,
approveStaffGuid: userData.staffGuid
}
passCommonDialogInfo.value.footer.btns[1].loading = true;
passFlowData(params, serviceTenantGuid.value).then((res: any) => {
passCommonDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
if (res.data) {
ElMessage.success('驳回成功');
......
src/views/data_asset/valueEvaluate.vue
......@@ -1060,7 +1060,7 @@ const passCommonDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit" },
{ type: "primary", label: "确定", value: "submit", loading: true },
],
},
});
......@@ -1097,7 +1097,7 @@ const rejectDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit" },
{ type: "primary", label: "确定", value: "submit", loading: true },
],
},
});
......@@ -1109,7 +1109,7 @@ const rejectDialogBtnClick = (btn, info) => {
return
}
console.log('currTableData', currTableData.value, info);
tableInfo.value.loading = true;
rejectDialogInfo.value.footer.btns[1].loading = true;
let params = {
guid: currTableData.value.approveVO.approveGuid,
flowType: currTableData.value.approveVO.flowType,
......@@ -1117,7 +1117,7 @@ const rejectDialogBtnClick = (btn, info) => {
approveStaffGuid: userData.staffGuid
}
rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
tableInfo.value.loading = false;
rejectDialogInfo.value.footer.btns[1].loading = true;
if (res?.code == proxy.$passCode) {
if (res.data) {
ElMessage.success('驳回成功');
......@@ -1129,9 +1129,7 @@ const rejectDialogBtnClick = (btn, info) => {
} else {
ElMessage.error(res.msg);
}
}).catch(() => {
tableInfo.value.loading = false;
});
})
} else if (btn.value == 'cancel') {
rejectDialogInfo.value.visible = false;
}
......@@ -1139,7 +1137,7 @@ const rejectDialogBtnClick = (btn, info) => {
const passCommonDialogBtnClick = (btn, info) => {
if (btn.value == 'submit') {
tableInfo.value.loading = true;
passCommonDialogInfo.value.footer.btns[1].loading = true;
let params = {
guid: currTableData.value.approveVO.approveGuid,
flowType: currTableData.value.approveVO.flowType,
......@@ -1147,7 +1145,7 @@ const passCommonDialogBtnClick = (btn, info) => {
approveStaffGuid: userData.staffGuid
}
passFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
tableInfo.value.loading = false;
passCommonDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
if (res.data) {
ElMessage.success('审批成功');
......@@ -1159,9 +1157,7 @@ const passCommonDialogBtnClick = (btn, info) => {
} else {
ElMessage.error(res.msg);
}
}).catch(() => {
tableInfo.value.loading = false;
});
})
} else if (btn.value == 'cancel') {
passCommonDialogInfo.value.visible = false;
}
......
src/views/data_meta/collectorTask.vue
......@@ -531,7 +531,9 @@ const dialogBtnClick = (btn, info) => {
if (btn.value == 'submit') {
let params = { ...info, }
// params.taskState = 1;
params.databaseNameEn = databaseNameEn.value
let data: any = dataSourceList.value.find((item: any) => item.guid == params.dataSourceGuid)
databaseNameEn.value = data?.databaseNameEn;
params.databaseNameEn = data?.databaseNameEn;
if (dialogInfo.value.type == 'add') {
let addTask = () => {
params.taskState = 1;
......@@ -551,10 +553,8 @@ const dialogBtnClick = (btn, info) => {
}
})
}
let data: any = dataSourceList.value.find((item: any) => item.guid == params.dataSourceGuid)
if (data) {
dialogInfo.value.footer.btns[1].loading = true;
databaseNameEn.value = data.databaseNameEn;
checkDataSource({
databaseNameEn: databaseNameEn.value,
}).then((res: any) => {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!