bug fix

src/assets/styles/pages.scss

@@ -191,6 +191,14 @@
   background-color: $--color-text-gray-7;
   .el-timeline {
     padding: 0 10px;
+    &-item__tail {
+      border-color: #ddd;
+    }
+  }
+  .timeline-item-stop {
+    .el-timeline-item__tail {
+      border-left-style: dashed;
+    }
   }
 
   .el-timeline-item__node--success {

src/modules/base/components/ModifyExamConfigDetail.vue

@@ -624,6 +624,7 @@ export default {
     async submit() {
       const valid = await this.$refs.modalFormComp.validate().catch(() => {});
       if (!valid) return;
+      console.log(valid);
 
       if (this.isSubmit) return;
       this.isSubmit = true;

src/modules/exam/components/ApplyContent.vue

@@ -191,6 +191,7 @@
             hide-timestamp
             size="large"
             placement="top"
+            :class="{ 'timeline-item-stop': flow.nextIsNewFlow }"
           >
             <div class="flow-item">
               <p v-if="flow.createTime" class="flow-item-time">
@@ -650,8 +651,11 @@ export default {
         REJECT: "danger",
         END: "success"
       };
-
-      this.flowHistoryList = data.tfFlowViewLogResultList.map(item => {
+      let nextFlowId = "";
+      this.flowHistoryList = data.tfFlowViewLogResultList.map((item, index) => {
+        const nextItem = data.tfFlowViewLogResultList[index + 1];
+        nextFlowId = nextItem ? nextItem.flowId : item.flowId;
+        item.nextIsNewFlow = nextFlowId !== item.flowId;
         item.type = FLOW_STATUS[item.approveOperation];
         item.attachments = item.paperAttachmentId
           ? JSON.parse(item.paperAttachmentId)
@@ -667,6 +671,7 @@ export default {
         approveOperation: flowIsEnd ? "END" : "",
         approveUserName: data.currFlowTaskResult.approveUserNames, //审批人
         createTime: null,
+        nextIsNewFlow: false,
         attachments: []
       });
     },

src/modules/exam/views/TaskApplyManage.vue

@@ -150,7 +150,7 @@
             >
             <el-button
               v-if="
-                (scope.row.setup === 1 || scope.row.setup === null) &&
+                scope.row.auditStatus === 'START' &&
                   checkPrivilege('link', 'edit')
               "
               class="btn-primary"
@@ -159,7 +159,10 @@
               >立即申请</el-button
             >
             <el-button
-              v-if="scope.row.setup === 2 && checkPrivilege('link', 'end')"
+              v-if="
+                scope.row.auditStatus === 'AUDITING' &&
+                  checkPrivilege('link', 'end')
+              "
               class="btn-danger"
               type="text"
               @click="toCancel(scope.row)"