合并

src/views/caseManagement/components/mediationCaseDetails.vue

@@ -1,15 +1,12 @@
 <template>
     <div>
         <el-dialog title="案件流程" :visible="processVisable" @close="cancel" center :distroy-on-close="true">
-            <div>
-                <!-- <el-steps class="steps" :active="caseStatus">
-                    <el-step :title="item.caseNodeName || item.content" v-for="(item,index) in pageData.allCasenode" :key="index" :description="(item.createNickName || '') + (item.caseNodeTime || '')+(item.nextRoleName || '')"></el-step>
-                   
-                </el-steps> -->
-                <el-steps :active="finishCasenode.length">
-                    <el-step :title="item.content"  v-for="(item,index) in finishCasenode" :key="index"></el-step>
-                    <el-step :title="item.content" v-for="(item,index) in inCasenode" :key="index"></el-step>
-                    <el-step :title="item.content"  v-for="(item,index) in nextCasenode" :key="index"></el-step>
+            <div class="loading" v-if="flagLoading">
+                <i class="el-icon-loading"></i>
+            </div>
+            <div v-else>
+                <el-steps class="steps" :active="finishCasenode.length">
+                    <el-step :title="item.content" :description="(item.createNickName || '') + (item.caseNodeTime || '')+(item.nextRoleName || '')" v-for="(item,index) in stepNumber" :key="index"></el-step>
                 </el-steps>
             </div>
             <div slot="footer" class="dialog-footer">
@@ -29,8 +26,8 @@ export default {
             pageData:{},
             caseStatus:0,
             finishCasenode:[],
-            inCasenode:[],
-            nextCasenode:[]
+            stepNumber:[],
+            flagLoading:true
             
         };
     },
@@ -50,9 +47,12 @@ export default {
         },
         selectCaseProgressFn(data){
             selectCaseProgress(data).then(res=>{
-                this.finishCasenode = res.data.data.finishCasenode
-                this.inCasenode = res.data.data.inCasenode
-                this.nextCasenode = res.data.data.nextCasenode
+                let finishCasenode = res.data.data.finishCasenode;;
+                this.finishCasenode = finishCasenode;
+                let inCasenode = res.data.data.inCasenode;
+                let nextCasenode = res.data.data.nextCasenode;
+                this.stepNumber= [...finishCasenode,...inCasenode,...nextCasenode];
+                this.flagLoading =false
                 
             })
         }
@@ -80,4 +80,14 @@ export default {
     background: #ffffff;
     border-radius: 20px;
     }
+    .loading {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+        .el-icon-loading {
+            font-size: 50px;
+        }
+    }
 </style>

src/views/caseManagement/components/mediationCaseLog.vue

@@ -7,7 +7,7 @@
       center
       :distroy-on-close="true"
     >
-      <!-- <div class="loading" v-if="flagLoading">
+      <div class="loading" v-if="flagLoading">
         <i class="el-icon-loading"></i>
       </div>
       <div v-else>
@@ -22,7 +22,7 @@
             <p>{{ activity.content }}</p>
           </el-timeline-item>
         </el-timeline>
-      </div> -->
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel" class="endbutton1"
           ><span>取 消</span></el-button