Merge branch 'release_v1.0.1_device_send' of http://git.qmth.com.cn/sop/web into release_v1.0.2

src/views/sop/components/dynamic-form-item/device-table/edit-column-dialog.vue

@@ -162,7 +162,7 @@ const rules = {
 
 const getDeviceOptions = async () => {
   const func = props.isOutType ? deviceCanOut : deviceCanIn;
-  const res = await func();
+  const res = await func({ sopNo: props.sop.sopNo });
   deviceOptions.value = res
     .filter(
       (item) =>

src/views/sop/sop-manage/plan-change/index.vue

@@ -280,13 +280,22 @@ function getFlowApproveHistoryList(data) {
   if (!data) return [];
 
   let lastTime = 0;
-  return data.map((item, index) => {
-    let nitem = { ...item };
-    nitem.duration =
-      index === 0 ? '-' : timeNumberToText(item.createTime - lastTime);
+  // return data.map((item, index) => {
+  //   let nitem = { ...item };
+  //   nitem.duration =
+  //     index === 0 ? '-' : timeNumberToText(item.createTime - lastTime);
+  //   lastTime = item.createTime;
+  //   return nitem;
+  // });
+  for (let i = data.length - 1; i >= 0; i--) {
+    let item = data[i];
+    item.duration =
+      i === data.length - 1
+        ? '-'
+        : timeNumberToText(item.createTime - lastTime);
     lastTime = item.createTime;
-    return nitem;
-  });
+  }
+  return data;
 }
 
 const IS_NEW_MODE = computed(() => {

src/views/sop/sop-manage/sop-step/index.vue

@@ -336,13 +336,22 @@ function getFlowApproveHistoryList(data) {
   if (!data) return [];
 
   let lastTime = 0;
-  return data.map((item, index) => {
-    let nitem = { ...item };
-    nitem.duration =
-      index === 0 ? '-' : timeNumberToText(item.createTime - lastTime);
+  // return data.map((item, index) => {
+  //   let nitem = { ...item };
+  //   nitem.duration =
+  //     index === 0 ? '-' : timeNumberToText(item.createTime - lastTime);
+  //   lastTime = item.createTime;
+  //   return nitem;
+  // });
+  for (let i = data.length - 1; i >= 0; i--) {
+    let item = data[i];
+    item.duration =
+      i === data.length - 1
+        ? '-'
+        : timeNumberToText(item.createTime - lastTime);
     lastTime = item.createTime;
-    return nitem;
-  });
+  }
+  return data;
 }
 
 function updateSopInfo(crmInfo) {

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

@@ -203,13 +203,22 @@ function getFlowApproveHistoryList(data) {
   if (!data) return [];
 
   let lastTime = 0;
-  return data.map((item, index) => {
-    let nitem = { ...item };
-    nitem.duration =
-      index === 0 ? '-' : timeNumberToText(item.createTime - lastTime);
+  // return data.map((item, index) => {
+  //   let nitem = { ...item };
+  //   nitem.duration =
+  //     index === 0 ? '-' : timeNumberToText(item.createTime - lastTime);
+  //   lastTime = item.createTime;
+  //   return nitem;
+  // });
+  for (let i = data.length - 1; i >= 0; i--) {
+    let item = data[i];
+    item.duration =
+      i === data.length - 1
+        ? '-'
+        : timeNumberToText(item.createTime - lastTime);
     lastTime = item.createTime;
-    return nitem;
-  });
+  }
+  return data;
 }
 const initDetail = async () => {
   stepHistoryShow.value = false;