28093

src/mods/AppMyPlan/progressDetail.vue

@@ -78,6 +78,8 @@
       <div class="detail-list" v-if="currIndex == 1">
         <div class="step-item" v-for="(item, index) in stepList" :key="index">
           <div class="line"></div>
+
+          <div class="step-items">
             <div class="detail-left">
               <image class="avatar" v-if="item.stepAvatar && item.userName" :src="item.stepAvatar" />
               <span v-if="!item.stepAvatar && item.userName">{{ item.userName.substr(item.userName.length - 2) }}</span>
@@ -87,6 +89,7 @@
               <image class="detail-left__icon" src="/static/img/gou.png" v-if="index === 0 || ['0', '1', '6', '5'].indexOf(item.stepType) > -1" />
               <image class="detail-left__icon" src="/static/img/point.png" v-else-if="item.stepType !== '2'" />
             </div>
+
             <div class="detail-right">
               <div class="detail-right__title">
                 <h2>{{ item.title }}</h2>
@@ -107,10 +110,16 @@
                 </span>
                 <i style="color: #f14242"> {{ item.title2Desc }}</i>
               </div>
-            <div class="detail-right__subtitle" v-if="item.stepType === '2'">
+
+              <div class="detail-right__subtitle" v-if="item.opinion && item.stepType === '2'" style="padding: 5px 0">
                 <span>审批意见：</span>
-              <i style="color: #333">{{ item.opinion || '-' }}</i>
+                <i style="color: #333">{{ item.opinion }}</i>
               </div>
+
+              <div class="detail-right__subtitle" v-if="item.stepType != 2 && item.opinion" style="padding: 5px 0">
+                <i style="color: #333">{{ item.opinion }}</i>
+              </div>
+
               <div class="detail-right__subtitle detail-right__text" style="display: block" v-if="item.candidateFieldInfos && item.candidateFieldInfos.length" v-for="(candidateField, z) in item.candidateFieldInfos" :key="z">
                 <span>{{ candidateField.fieldName }}</span>
                 <i style="color: #343d65; display: contents">{{ candidateField.dictionaryCode ? $dict.getLabel(candidateField.dictionaryCode, candidateField.fieldValue) || '-' : candidateField.fieldValue || '-' }}</i>
@@ -133,6 +142,9 @@
               </div>
             </div>
           </div>
+
+          <!-- <div class="opinions" v-if="item.opinion && item.stepType != 2">{{ item.opinion }}</div> -->
+        </div>
       </div>
     </div>
   </div>
@@ -332,9 +344,10 @@ view {
 }
 
 .step-item {
-  display: flex;
-  position: relative;
   padding-bottom: 88px;
+  position: relative;
+  .step-items {
+    display: flex;
 
     &:last-child {
       padding-bottom: 0;
@@ -514,8 +527,27 @@ view {
         text-align: center;
         border-radius: 50%;
         background: #2266ff;
+        z-index: 999;
       }
     }
+  }
+  .line {
+    position: absolute;
+    height: 100%;
+    width: 1px;
+    left: 40px;
+    background: #eee;
+  }
+  .opinions {
+    padding-top: 10px;
+    margin-left: 120px;
+    line-height: 46px;
+  }
+}
+.step-item:last-child {
+  .line {
+    background: none;
+  }
 }
 
 .status {