修复资产按钮加载
Showing
5 changed files
with
18 additions
and
9 deletions
| ... | @@ -828,7 +828,7 @@ const passCommonDialogInfo = ref({ | ... | @@ -828,7 +828,7 @@ const passCommonDialogInfo = ref({ |
| 828 | footer: { | 828 | footer: { |
| 829 | btns: [ | 829 | btns: [ |
| 830 | { type: "default", label: "取消", value: "cancel" }, | 830 | { type: "default", label: "取消", value: "cancel" }, |
| 831 | { type: "primary", label: "确定", value: "submit", loading: true }, | 831 | { type: "primary", label: "确定", value: "submit", loading: false }, |
| 832 | ], | 832 | ], |
| 833 | }, | 833 | }, |
| 834 | }); | 834 | }); | ... | ... |
| ... | @@ -1121,7 +1121,7 @@ const rejectDialogInfo = ref({ | ... | @@ -1121,7 +1121,7 @@ const rejectDialogInfo = ref({ |
| 1121 | footer: { | 1121 | footer: { |
| 1122 | btns: [ | 1122 | btns: [ |
| 1123 | { type: "default", label: "取消", value: "cancel" }, | 1123 | { type: "default", label: "取消", value: "cancel" }, |
| 1124 | { type: "primary", label: "确定", value: "submit", loading: true }, | 1124 | { type: "primary", label: "确定", value: "submit", loading: false }, |
| 1125 | ], | 1125 | ], |
| 1126 | }, | 1126 | }, |
| 1127 | }); | 1127 | }); |
| ... | @@ -1210,7 +1210,7 @@ const passCommonDialogInfo = ref({ | ... | @@ -1210,7 +1210,7 @@ const passCommonDialogInfo = ref({ |
| 1210 | footer: { | 1210 | footer: { |
| 1211 | btns: [ | 1211 | btns: [ |
| 1212 | { type: "default", label: "取消", value: "cancel" }, | 1212 | { type: "default", label: "取消", value: "cancel" }, |
| 1213 | { type: "primary", label: "确定", value: "submit", loading: true }, | 1213 | { type: "primary", label: "确定", value: "submit", loading: false }, |
| 1214 | ], | 1214 | ], |
| 1215 | }, | 1215 | }, |
| 1216 | }); | 1216 | }); | ... | ... |
| ... | @@ -22,6 +22,7 @@ import { | ... | @@ -22,6 +22,7 @@ import { |
| 22 | import useUserStore from "@/store/modules/user"; | 22 | import useUserStore from "@/store/modules/user"; |
| 23 | import useDataAssetStore from "@/store/modules/dataAsset"; | 23 | import useDataAssetStore from "@/store/modules/dataAsset"; |
| 24 | import { getCamundaDeploymentId, getProcessNodesPromise, passFlowData, rejectFlowData, revokeFlowData, isMyFirstNode } from '@/api/modules/workFlowService'; | 24 | import { getCamundaDeploymentId, getProcessNodesPromise, passFlowData, rejectFlowData, revokeFlowData, isMyFirstNode } from '@/api/modules/workFlowService'; |
| 25 | import { changeNum } from '@/utils/common'; | ||
| 25 | 26 | ||
| 26 | const assetStore = useDataAssetStore(); | 27 | const assetStore = useDataAssetStore(); |
| 27 | 28 | ||
| ... | @@ -328,10 +329,10 @@ const tableBtnClick = (scope, btn) => { | ... | @@ -328,10 +329,10 @@ const tableBtnClick = (scope, btn) => { |
| 328 | formItems.value[0].visible = false; | 329 | formItems.value[0].visible = false; |
| 329 | formItems.value[0].default = row.damGuid; | 330 | formItems.value[0].default = row.damGuid; |
| 330 | formItems.value[1].default = row.costAssessmentFile || []; | 331 | formItems.value[1].default = row.costAssessmentFile || []; |
| 331 | formItems.value[2].default = row.qualityScore; | 332 | // formItems.value[2].default = row.qualityScore; |
| 332 | formItems.value[3].default = row.evaluationRangeStart && row.evaluationRangeEnd ? [row.evaluationRangeStart, row.evaluationRangeEnd] : ''; | 333 | formItems.value[3].default = row.evaluationRangeStart && row.evaluationRangeEnd ? [row.evaluationRangeStart, row.evaluationRangeEnd] : ''; |
| 333 | formItems.value[4].default = row.evaluationNote; | 334 | // formItems.value[4].default = row.evaluationNote; |
| 334 | formItems.value[5].default = row.evaluationFile || []; | 335 | // formItems.value[5].default = row.evaluationFile || []; |
| 335 | dialogInfo.value.type = 'reSubmit'; | 336 | dialogInfo.value.type = 'reSubmit'; |
| 336 | dialogInfo.value.visible = true; | 337 | dialogInfo.value.visible = true; |
| 337 | } | 338 | } |
| ... | @@ -343,6 +344,10 @@ const tableBtnClick = (scope, btn) => { | ... | @@ -343,6 +344,10 @@ const tableBtnClick = (scope, btn) => { |
| 343 | formItems.value[0].visible = false; | 344 | formItems.value[0].visible = false; |
| 344 | formItems.value[0].default = row.damGuid; | 345 | formItems.value[0].default = row.damGuid; |
| 345 | formItems.value[1].default = row.costAssessmentFile || []; | 346 | formItems.value[1].default = row.costAssessmentFile || []; |
| 347 | formItems.value[2].default = changeNum(row.qualityScore || 0, 2); | ||
| 348 | formItems.value[3].default = row.evaluationRangeStart && row.evaluationRangeEnd ? [row.evaluationRangeStart, row.evaluationRangeEnd] : ''; | ||
| 349 | formItems.value[4].default = row.evaluationNote; | ||
| 350 | formItems.value[5].default = row.evaluationFile || []; | ||
| 346 | dialogInfo.value.type = 'reSubmit'; | 351 | dialogInfo.value.type = 'reSubmit'; |
| 347 | dialogInfo.value.visible = true; | 352 | dialogInfo.value.visible = true; |
| 348 | } | 353 | } |
| ... | @@ -1060,7 +1065,7 @@ const passCommonDialogInfo = ref({ | ... | @@ -1060,7 +1065,7 @@ const passCommonDialogInfo = ref({ |
| 1060 | footer: { | 1065 | footer: { |
| 1061 | btns: [ | 1066 | btns: [ |
| 1062 | { type: "default", label: "取消", value: "cancel" }, | 1067 | { type: "default", label: "取消", value: "cancel" }, |
| 1063 | { type: "primary", label: "确定", value: "submit", loading: true }, | 1068 | { type: "primary", label: "确定", value: "submit", loading: false }, |
| 1064 | ], | 1069 | ], |
| 1065 | }, | 1070 | }, |
| 1066 | }); | 1071 | }); |
| ... | @@ -1097,7 +1102,7 @@ const rejectDialogInfo = ref({ | ... | @@ -1097,7 +1102,7 @@ const rejectDialogInfo = ref({ |
| 1097 | footer: { | 1102 | footer: { |
| 1098 | btns: [ | 1103 | btns: [ |
| 1099 | { type: "default", label: "取消", value: "cancel" }, | 1104 | { type: "default", label: "取消", value: "cancel" }, |
| 1100 | { type: "primary", label: "确定", value: "submit", loading: true }, | 1105 | { type: "primary", label: "确定", value: "submit", loading: false }, |
| 1101 | ], | 1106 | ], |
| 1102 | }, | 1107 | }, |
| 1103 | }); | 1108 | }); |
| ... | @@ -1117,7 +1122,7 @@ const rejectDialogBtnClick = (btn, info) => { | ... | @@ -1117,7 +1122,7 @@ const rejectDialogBtnClick = (btn, info) => { |
| 1117 | approveStaffGuid: userData.staffGuid | 1122 | approveStaffGuid: userData.staffGuid |
| 1118 | } | 1123 | } |
| 1119 | rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => { | 1124 | rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => { |
| 1120 | rejectDialogInfo.value.footer.btns[1].loading = true; | 1125 | rejectDialogInfo.value.footer.btns[1].loading = false; |
| 1121 | if (res?.code == proxy.$passCode) { | 1126 | if (res?.code == proxy.$passCode) { |
| 1122 | if (res.data) { | 1127 | if (res.data) { |
| 1123 | ElMessage.success('驳回成功'); | 1128 | ElMessage.success('驳回成功'); | ... | ... |
| ... | @@ -1906,6 +1906,9 @@ const selectChange = (val, row, info) => { | ... | @@ -1906,6 +1906,9 @@ const selectChange = (val, row, info) => { |
| 1906 | // 这里应该是onActivated 钩子,路由从configure-路由从configure-rules跳转过来要重新请求数据、 | 1906 | // 这里应该是onActivated 钩子,路由从configure-路由从configure-rules跳转过来要重新请求数据、 |
| 1907 | onActivated(async () => { | 1907 | onActivated(async () => { |
| 1908 | if (localStorage.getItem('shouldReloadData') === 'true') { | 1908 | if (localStorage.getItem('shouldReloadData') === 'true') { |
| 1909 | if (activeName.value == '数据库目录') { | ||
| 1910 | getDataBaseTreeData(); | ||
| 1911 | } | ||
| 1909 | await getDataBaseTableData({ | 1912 | await getDataBaseTableData({ |
| 1910 | exexGuid: execGuidInfo.value.execGuid | 1913 | exexGuid: execGuidInfo.value.execGuid |
| 1911 | }); | 1914 | }); | ... | ... |
| ... | @@ -1069,6 +1069,7 @@ const rejectDialogBtnClick = (btn, info) => { | ... | @@ -1069,6 +1069,7 @@ const rejectDialogBtnClick = (btn, info) => { |
| 1069 | font-size: 16px; | 1069 | font-size: 16px; |
| 1070 | color: #212121; | 1070 | color: #212121; |
| 1071 | font-weight: 600; | 1071 | font-weight: 600; |
| 1072 | width: calc(100% - 28px); | ||
| 1072 | } | 1073 | } |
| 1073 | } | 1074 | } |
| 1074 | 1075 | ... | ... |
-
Please register or sign in to post a comment