Browse Source

审批动态调整

zhangjie 1 year ago
parent
commit
516c0b1275

+ 2 - 8
src/views/sop/sop-manage/plan-change/index.vue

@@ -269,20 +269,15 @@ const sopInfo = ref({ ...props.sop });
 const stepHistoryShow = ref(false);
 const flowApproveHistoryList = 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;
   });
 }
@@ -374,8 +369,7 @@ const initData = async () => {
   sopInfo.value.statusStr = props.sop.projectExchangeFlowStatusStr;
 
   flowApproveHistoryList.value = getFlowApproveHistoryList(
-    res.flowApproveHistoryList,
-    res.flowTaskHistoryList
+    res.flowApproveHistoryList
   );
 
   for (const key in res.tbProjectExchange) {

+ 2 - 8
src/views/sop/sop-manage/quality-issue/index.vue

@@ -182,20 +182,15 @@ const emit = defineEmits(['confirm', 'cancel']);
 
 const stepHistoryShow = ref(false);
 const flowApproveHistoryList = 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;
   });
 }
@@ -325,8 +320,7 @@ const initFill = async () => {
     });
   });
   flowApproveHistoryList.value = getFlowApproveHistoryList(
-    res.flowApproveHistoryList,
-    allSteps.value
+    res.flowApproveHistoryList
   );
   loading.value = false;
 };

+ 3 - 10
src/views/sop/sop-manage/sop-step/index.vue

@@ -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) => {

+ 2 - 8
src/views/work-hours/work-hours-manage/abnormal-check/abnormal-detail-dialog.vue

@@ -199,20 +199,15 @@ const getUrls = (type) => {
   }
 };
 
-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;
   });
 }
@@ -221,8 +216,7 @@ const initDetail = async () => {
   flowApproveHistoryList.value = [];
   const res = await workHoursCheckDetailApi(props.row.objId);
   flowApproveHistoryList.value = getFlowApproveHistoryList(
-    res.flowApproveHistoryList,
-    res.flowTaskHistoryList
+    res.flowApproveHistoryList
   );
 };
 const toViewHistory = () => {