From aea5507a914baffc27109da1a771d381f4558ab1 Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Fri, 21 Jul 2023 14:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/BookingLedger/list/index.vue |   2 +-
 src/views/system/ServiceFlow/addForm.vue    | 148 +++++++-------------
 src/views/system/ServiceFlow/index.vue      |   1 +
 src/views/system/ServiceItems/index.vue     |   1 +
 src/views/system/ServiceStatus/index.vue    |   1 +
 5 files changed, 58 insertions(+), 95 deletions(-)

diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 03a7923..55f84c4 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -206,7 +206,7 @@
                 </template>
                 <template #atd="{ row, rowIndex }">
                   <a-spin :spinning="row.atdLoading">
-                    <a-icon v-if="row.atd" style="cursor: pointer;" @click="handleRefshAtd(row, rowIndex)" type="reload" />
+                    <a-icon v-if="!row.atd" style="cursor: pointer;" @click="handleRefshAtd(row, rowIndex)" type="reload" />
                     <span v-if="row.atd"> {{ row.atd.substring(0, 10) }}</span>
                   </a-spin>
                 </template>
diff --git a/src/views/system/ServiceFlow/addForm.vue b/src/views/system/ServiceFlow/addForm.vue
index 937513b..c66f8e8 100644
--- a/src/views/system/ServiceFlow/addForm.vue
+++ b/src/views/system/ServiceFlow/addForm.vue
@@ -116,7 +116,7 @@
         <a-button @click="handleUnable" type="danger">
           取消启用
         </a-button>
-        <a-button @click="handleSubmitEnable" type="primary">
+        <a-button @click="handleSubmit" type="primary">
           保存并启用
         </a-button>
         <a-button @click="handlePub" type="primary">
@@ -303,24 +303,22 @@
       <a-spin :spinning="timeLoading">
         <div v-if="timeForm.activitiesList && timeForm.activitiesList.length > 0" class="time">
           <div class="time-title">{{ this.timeForm.serviceProjectName }}</div>
-          <div style=" position: absolute;top: 10px;left: 51px;display:flex">
-            <div class="top" v-for="item in timeForm.activitiesList" :key="item.actId">
-              <div class="right">
-                <div class="line" :class="{ active: item.isYield == 1 }"></div>
-              </div>
-              <div class="left">
-                <div class="point" :class="{ active: item.isYield == 1 }"></div>
-              </div>
+          <div class="item" v-for="(item,index) in timeForm.activitiesList" :key="item.actId">
+            <div class="top">
+              <div class="line" :class="{active:item.isYield==1}"></div>
+              <div class="point" :class="{active:item.isYield==1}"></div>
+              <div class="line" v-if="index!=timeForm.activitiesList.length-1" :class="{active:item.isYield==1}"></div>
             </div>
-          </div>
-          <div class="item" v-for="item in timeForm.activitiesList" :key="item.actId">
             <div class="bottom">
-              <div class="text"> {{ item.showName }}</div>
-              <div class="text" v-if="item.isYield == 1"> {{ item.actDate.substring(0, 10) }}</div>
-              <div class="sub">
-                <div class="subItem" :key="ite.actId" v-for="ite in item.subList">
-                  <div class="pointSub" :class="{ active: ite.isYield == 1 }"></div>
-                  {{ ite.showName }}
+              <div :title="item.showName+item.actDate">{{ item.showName }}</div>
+              <div v-if="item.isYield==1">{{ item.actDate?item.actDate.substring(0,11):'' }}</div>
+              <div class="subList">
+                <div class="sub" v-for="ite in item.subList" :key="ite.actId">
+                  <div :class="{active:ite.isYield==1}" class="subPoint"></div>
+                  <div :title="ite.showName+ite.actDate" class="text">
+                    <span style="margin-right: 4px;">{{ ite.showName }}</span>
+                    <span>{{ ite.actDate?ite.actDate.substring(0,11):'' }}</span>
+                  </div>
                 </div>
               </div>
             </div>
@@ -703,10 +701,10 @@ export default {
     },
     handleSubmitEnable() {
       const { form: { validateFields } } = this
-      this.confirmLoading = true
       validateFields((errors, values) => {
         if (!errors) {
           values.pkId = null
+          this.confirmLoading = true
           StatusSkuBaseSavAndEnable(values).then((res) => {
             this.confirmLoading = false
             if (res.data.succ) {
@@ -805,7 +803,6 @@ export default {
   display: flex;
   align-items: flex-start;
   padding-top: 10px;
-  position: relative;
 
   .time-title {
     padding: 10px;
@@ -817,86 +814,49 @@ export default {
   .active {
     background: rgb(2, 167, 240) !important;
   }
-
-  .item {
-    margin-top: 20px;
-    &:nth-child(3) {
-      margin-left: 92px;
-      margin-right: 50px;
-    }
-
-    &:nth-child(4) {
-      margin-right: 30px;
-    }
-
-    &:nth-child(5) {
-      margin-right: 73px;
-    }
-
-    &:nth-child(6) {
-      margin-right: 30px;
-    }
-
-    &:nth-child(7) {
-      margin-right: 55px;
+  .item{
+    min-width: 120px;
+    margin-right: -3px;
+    .top{
+      display: flex;
+      align-items: center;
+      .line{
+        width: 45%;
+        height: 2px;
+        background: rgb(215, 215, 215);
+      }
+      .point{
+        width: 11px;
+        height: 11px;
+        border-radius: 50%;
+        background: rgb(215, 215, 215);
+        margin: 0 3px;
+      }
     }
-
-    &:nth-child(8) {
-      margin-right: 30px;
+    .bottom{
+      text-align: center;
+      margin-top: 10px;
     }
-
-    &:nth-child(9) {
-      margin-right: 41px;
+    .subList{
+      margin-top: 10px;
+      padding-left: 10px;
     }
-  }
-
-  .line {
-    width: 100px;
-    height: 2px;
-    background: rgb(215, 215, 215);
-  }
-
-  .point {
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    margin: 0 6px;
-    background: rgb(215, 215, 215);
-  }
-
-  .left {
-    text-align: center;
-    position: relative;
-
-    .text {
-      margin-top: 3px;
+    .sub{
+      margin-top: 4px;
+      display: flex;
+      align-items: center;
+      .subPoint{
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        background: rgb(215, 215, 215);
+        margin-right: 3px;
+      }
+      .text{
+        
+      }
     }
   }
 
-  .right {
-    padding-top: 5px;
-  }
-
-  .top {
-    display: flex
-  }
-
-  .subItem {
-    display: flex;
-    align-items: center;
-    margin-top: 5px;
-
-    .pointSub {
-      width: 10px;
-      height: 10px;
-      background: rgb(215, 215, 215);
-      border-radius: 50%;
-      margin-right: 3px;
-    }
-
-    .active {
-      background: rgb(2, 167, 240) !important;
-    }
-  }
 }
 </style>
diff --git a/src/views/system/ServiceFlow/index.vue b/src/views/system/ServiceFlow/index.vue
index 9e8214d..eef10ef 100644
--- a/src/views/system/ServiceFlow/index.vue
+++ b/src/views/system/ServiceFlow/index.vue
@@ -306,6 +306,7 @@ export default {
           this.getList()
           this.modelObj = res.data
           this.$refs.manyModel.bcFileFlag = true
+          this.selectedRowKeys = []
         })
       } else {
         this.$message.warning('请选择')
diff --git a/src/views/system/ServiceItems/index.vue b/src/views/system/ServiceItems/index.vue
index cfe039b..a80ba06 100644
--- a/src/views/system/ServiceItems/index.vue
+++ b/src/views/system/ServiceItems/index.vue
@@ -233,6 +233,7 @@ export default {
           this.getList()
           this.modelObj = res.data
           this.$refs.manyModel.bcFileFlag = true
+          this.selectedRowKeys = []
         })
       } else {
         this.$message.warning('请选择')
diff --git a/src/views/system/ServiceStatus/index.vue b/src/views/system/ServiceStatus/index.vue
index 951a043..d88cbe6 100644
--- a/src/views/system/ServiceStatus/index.vue
+++ b/src/views/system/ServiceStatus/index.vue
@@ -238,6 +238,7 @@ export default {
           this.getList()
           this.modelObj = res.data
           this.$refs.manyModel.bcFileFlag = true
+          this.selectedRowKeys = []
         })
       } else {
         this.$message.warning('请选择')