|
@@ -320,20 +320,15 @@ const stepHistoryShow = ref(false);
|
|
|
const flowApproveHistoryList = ref([]);
|
|
|
const stepDuration = ref('');
|
|
|
|
|
|
-function getFlowApproveHistoryList(data, allStepData) {
|
|
|
+function getFlowApproveHistoryList(data) {
|
|
|
if (!data) return [];
|
|
|
|
|
|
- let setupData = {};
|
|
|
- allStepData.forEach((item) => {
|
|
|
- setupData[item.setup] = item.taskName;
|
|
|
- });
|
|
|
let lastTime = 0;
|
|
|
return data.map((item, index) => {
|
|
|
let nitem = { ...item };
|
|
|
nitem.duration =
|
|
|
index === 0 ? '-' : timeNumberToText(item.createTime - lastTime);
|
|
|
lastTime = item.createTime;
|
|
|
- nitem.taskName = setupData[item.approveSetup];
|
|
|
return nitem;
|
|
|
});
|
|
|
}
|
|
@@ -400,8 +395,7 @@ const initFill = async () => {
|
|
|
});
|
|
|
});
|
|
|
flowApproveHistoryList.value = getFlowApproveHistoryList(
|
|
|
- res.flowApproveHistoryList,
|
|
|
- allSteps.value
|
|
|
+ res.flowApproveHistoryList
|
|
|
);
|
|
|
};
|
|
|
const initEdit = async () => {
|
|
@@ -415,8 +409,7 @@ const initEdit = async () => {
|
|
|
(a, b) => a.setup - b.setup
|
|
|
);
|
|
|
flowApproveHistoryList.value = getFlowApproveHistoryList(
|
|
|
- res.flowApproveHistoryList,
|
|
|
- allSteps.value
|
|
|
+ res.flowApproveHistoryList
|
|
|
);
|
|
|
let allFormMap = {};
|
|
|
allSteps.value.forEach((item) => {
|