md

src/views/project-quality/project-quality-manage/issues-feedback/index.vue

@@ -65,7 +65,7 @@
               v-if="perm.LINK_Approve"
               theme="primary"
               hover="color"
-              :disabled="row.status === 'FINISH'"
+              :disabled="row.status === 'FINISH' || !row.myself"
               @click="auditQualityIssueHandle(row)"
             >
               审核

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

@@ -372,37 +372,37 @@ const initFill = async () => {
   crmInfo.value = res.crmInfo;
   updateSopInfo(crmInfo.value);
   sopInfo.value.sopNo = res.sopNo;
-  if (res.currFlowTaskResult) {
-    currFlowTaskResultSetup.value = res.currFlowTaskResult.setup;
-  }
+
   res.flowTaskHistoryList = res.flowTaskHistoryList || [];
   res.flowTaskHistoryList.forEach((item) => {
     item.formProperty.forEach((v) => {
       v.writable = false;
     });
   });
-  allSteps.value = [...res.flowTaskHistoryList, res.currFlowTaskResult].sort(
-    (a, b) => a.setup - b.setup
-  );
-  allSteps.value.forEach((item) => {
-    item.formProperty.forEach((prop) => {
-      prop.value = prop.value ? JSON.parse(prop.value).value : null;
-    });
-  });
-  flowApproveHistoryList.value = getFlowApproveHistoryList(
-    res.flowApproveHistoryList,
-    allSteps.value
-  );
   if (res.currFlowTaskResult) {
+    currFlowTaskResultSetup.value = res.currFlowTaskResult.setup;
+    allSteps.value = [...res.flowTaskHistoryList, res.currFlowTaskResult];
+
     curStep.value = res.currFlowTaskResult.taskKey;
     const stepData = allSteps.value.find(
       (item) => item.taskKey === curStep.value
     );
     curStepData.value = stepData;
   } else {
+    allSteps.value = [...res.flowTaskHistoryList];
     curStepData.value = allSteps.value[0];
     curStep.value = curStepData.value.taskKey;
   }
+  allSteps.value = allSteps.value.sort((a, b) => a.setup - b.setup);
+  allSteps.value.forEach((item) => {
+    item.formProperty.forEach((prop) => {
+      prop.value = prop.value ? JSON.parse(prop.value).value : null;
+    });
+  });
+  flowApproveHistoryList.value = getFlowApproveHistoryList(
+    res.flowApproveHistoryList,
+    allSteps.value
+  );
 };
 const initEdit = async () => {
   loading.value = true;

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

@@ -32,11 +32,11 @@
                     row.createRealName
                   }}</t-form-item>
                 </t-col>
-                <t-col :span="3">
+                <!-- <t-col :span="3">
                   <t-form-item label="供应商">{{
                     row.supplierName
                   }}</t-form-item>
-                </t-col>
+                </t-col> -->
                 <t-col :span="3">
                   <t-form-item label="客户名称">{{
                     row.customName
@@ -54,7 +54,7 @@
                 </t-col>
                 <t-col :span="3">
                   <t-form-item label="异常日期">{{
-                    timestampFilter(row.exceptionTime)
+                    row.exceptionTime
                   }}</t-form-item>
                 </t-col>
                 <t-col :span="3">
@@ -91,6 +91,11 @@
                 </t-col>
               </t-row>
             </t-form>
+            <t-space class="sop-step-footer" style="flex-direction: row">
+              <t-button theme="primary" @click="emit('update:visible', false)"
+                >返回</t-button
+              >
+            </t-space>
             <!-- setup history -->
             <div v-if="flowApproveHistoryList.length" class="sop-step-history">
               <div class="sop-step-history-label" @click="toViewHistory">
@@ -158,9 +163,12 @@
 <script setup name="AbnormalDetailDialog">
 import { workHoursCheckDetailApi } from '@/api/work-hours';
 import { timeNumberToText } from '@/utils/tool';
-import { timestampFilter } from '@/utils/filter';
-import { watch } from 'vue';
-
+import { timestampFilter, customerTypeFilter } from '@/utils/filter';
+import { ref, watch } from 'vue';
+import {
+  ChevronLeftDoubleIcon,
+  ChevronRightDoubleIcon,
+} from 'tdesign-icons-vue-next';
 const emit = defineEmits(['update:visible', 'confirm']);
 const props = defineProps({
   visible: Boolean,
@@ -176,7 +184,7 @@ const stepHistoryShow = ref(false);
 const flowApproveHistoryList = ref([]);
 
 const getUrls = (type) => {
-  const list = props.attachmentPaths.split(',');
+  const list = props.row.attachmentPaths.split(',');
   const imgs = ['jpg', 'png', 'jpeg'];
   if (type === 'image') {
     return list.filter((item) => {
@@ -200,7 +208,7 @@ function getFlowApproveHistoryList(data) {
     nitem.duration =
       index === 0 ? '-' : timeNumberToText(item.createTime - lastTime);
     lastTime = item.createTime;
-    nitem.taskName = item.approveSetup;
+    nitem.taskName = item.approveSetup + '';
     return nitem;
   });
 }