eae96494 by lihua

修复资产按钮加载

1 parent 9202a046
......@@ -828,7 +828,7 @@ const passCommonDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit", loading: true },
{ type: "primary", label: "确定", value: "submit", loading: false },
],
},
});
......
......@@ -1121,7 +1121,7 @@ const rejectDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit", loading: true },
{ type: "primary", label: "确定", value: "submit", loading: false },
],
},
});
......@@ -1210,7 +1210,7 @@ const passCommonDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit", loading: true },
{ type: "primary", label: "确定", value: "submit", loading: false },
],
},
});
......
......@@ -22,6 +22,7 @@ import {
import useUserStore from "@/store/modules/user";
import useDataAssetStore from "@/store/modules/dataAsset";
import { getCamundaDeploymentId, getProcessNodesPromise, passFlowData, rejectFlowData, revokeFlowData, isMyFirstNode } from '@/api/modules/workFlowService';
import { changeNum } from '@/utils/common';
const assetStore = useDataAssetStore();
......@@ -328,10 +329,10 @@ const tableBtnClick = (scope, btn) => {
formItems.value[0].visible = false;
formItems.value[0].default = row.damGuid;
formItems.value[1].default = row.costAssessmentFile || [];
formItems.value[2].default = row.qualityScore;
// formItems.value[2].default = row.qualityScore;
formItems.value[3].default = row.evaluationRangeStart && row.evaluationRangeEnd ? [row.evaluationRangeStart, row.evaluationRangeEnd] : '';
formItems.value[4].default = row.evaluationNote;
formItems.value[5].default = row.evaluationFile || [];
// formItems.value[4].default = row.evaluationNote;
// formItems.value[5].default = row.evaluationFile || [];
dialogInfo.value.type = 'reSubmit';
dialogInfo.value.visible = true;
}
......@@ -343,6 +344,10 @@ const tableBtnClick = (scope, btn) => {
formItems.value[0].visible = false;
formItems.value[0].default = row.damGuid;
formItems.value[1].default = row.costAssessmentFile || [];
formItems.value[2].default = changeNum(row.qualityScore || 0, 2);
formItems.value[3].default = row.evaluationRangeStart && row.evaluationRangeEnd ? [row.evaluationRangeStart, row.evaluationRangeEnd] : '';
formItems.value[4].default = row.evaluationNote;
formItems.value[5].default = row.evaluationFile || [];
dialogInfo.value.type = 'reSubmit';
dialogInfo.value.visible = true;
}
......@@ -1060,7 +1065,7 @@ const passCommonDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit", loading: true },
{ type: "primary", label: "确定", value: "submit", loading: false },
],
},
});
......@@ -1097,7 +1102,7 @@ const rejectDialogInfo = ref({
footer: {
btns: [
{ type: "default", label: "取消", value: "cancel" },
{ type: "primary", label: "确定", value: "submit", loading: true },
{ type: "primary", label: "确定", value: "submit", loading: false },
],
},
});
......@@ -1117,7 +1122,7 @@ const rejectDialogBtnClick = (btn, info) => {
approveStaffGuid: userData.staffGuid
}
rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
rejectDialogInfo.value.footer.btns[1].loading = true;
rejectDialogInfo.value.footer.btns[1].loading = false;
if (res?.code == proxy.$passCode) {
if (res.data) {
ElMessage.success('驳回成功');
......
......@@ -1906,6 +1906,9 @@ const selectChange = (val, row, info) => {
// 这里应该是onActivated 钩子,路由从configure-路由从configure-rules跳转过来要重新请求数据、
onActivated(async () => {
if (localStorage.getItem('shouldReloadData') === 'true') {
if (activeName.value == '数据库目录') {
getDataBaseTreeData();
}
await getDataBaseTableData({
exexGuid: execGuidInfo.value.execGuid
});
......
......@@ -1069,6 +1069,7 @@ const rejectDialogBtnClick = (btn, info) => {
font-size: 16px;
color: #212121;
font-weight: 600;
width: calc(100% - 28px);
}
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!