合并

src/api/caseManagement/caseManagement.js

@@ -135,3 +135,11 @@ export function selectCaseProgress(data) {
     data: data,
   })
 }
+// 查看案件日志
+export function listCaseLogRecord(data) {
+  return request({
+    url: "/mssignSeal/listCaseLogRecord",
+    method: "post",
+    data: data,
+  })
+}

src/views/caseManagement/caseList.vue

@@ -100,7 +100,7 @@
             :caseFlowNumber="caseFlowNumber">
         </mediationCaseDetails>
         <!-- 案件日志 -->
-        <mediationCaseLog :showcaseLog="showcaseLog" @cancelcaseLog="cancelcaseLog"></mediationCaseLog>
+        <mediationCaseLog :showcaseLog="showcaseLog" @cancelcaseLog="cancelcaseLog" :caselogDataArr="caselogDataArr" :flagLoading="flagLoading"></mediationCaseLog>
         <!-- 证据修改 -->
         <evidenceDialog :evidenceVisable="evidenceVisable" @cancelEvidence="cancelEvidence" :evidenceData="evidenceData">
         </evidenceDialog>
@@ -133,7 +133,7 @@
 </template>
 
 <script>
-import { caseApplicationList, caseApplicationSelectById, submitCaseApply, selectPaymentDetail, sealApply, selectSealUrl } from '@/api/caseManagement/caseManagement.js'
+import { caseApplicationList, caseApplicationSelectById,submitCaseApply,selectPaymentDetail,sealApply,selectSealUrl,listCaseLogRecord} from '@/api/caseManagement/caseManagement.js'
 import { listDept } from '@/api/system/dept.js'
 import { queryCaseFlowInfo } from '@/api/caseprocessManagement/caseprocessManagement.js'
 import moment from "moment";
@@ -194,17 +194,19 @@ export default {
             openDialog: false,//确认缴费和缴费详情
             detailform: {}, //缴费详情数据
             evidenceVisable: false,//证据修改弹窗
-            payTitle: "",//缴费标题
-            paymentConfirma: {},//缴费确认
-            showAcceptance: false,//案件受理弹框
-            caseAcceptanceData: {},//案件受理数据
-            mediatorVisable: false,//选择调解员弹窗
-            timeVisable: false,//预约时间弹窗
-            confirmVisable: false,//确认时间/调解员
             mediationVisable:false,//待调解弹窗
-            caseFlowNumber: {},//案件流程数据
-            mediatorData: {},
             mediationData:{},
+            payTitle:"",//缴费标题
+            paymentConfirma:{},//缴费确认
+            showAcceptance:false,//案件受理弹框
+            caseAcceptanceData:{},//案件受理数据
+            mediatorVisable:false,//选择调解员弹窗
+            timeVisable:false,//预约时间弹窗
+            confirmVisable:false,//确认时间/调解员
+            caseFlowNumber:{},//案件流程数据
+            caselogDataArr:[],//案件日志数据
+            flagLoading: true, //案件日志弹框loading
+            mediatorData:{},
             flag: null,
             caseData: {},
             evidenceData: {},
@@ -530,8 +532,14 @@ export default {
             this.processVisable = false
         },
         //案件日志
-        caseLog() {
+        caseLog(row) {
+            this.caseLogNumber = row
             this.showcaseLog = true
+            this.flagLoading = true;
+            listCaseLogRecord({caseId:row.id}).then(res=>{
+                    this.caselogDataArr = res.data
+                    this.flagLoading = false;
+            })
         },
         cancelcaseLog() {
             this.showcaseLog = false

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>
+            <div class="loading" v-if="flagLoading">
-                <!-- <el-steps class="steps" :active="caseStatus">
+                <i class="el-icon-loading"></i>
-                    <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>
+            </div>
-                   
+            <div v-else>
-                </el-steps> -->
+                <el-steps class="steps" :active="finishCasenode.length">
-                <el-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-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>
                 </el-steps>
             </div>
             <div slot="footer" class="dialog-footer">
@@ -29,8 +26,8 @@ export default {
             pageData:{},
             caseStatus:0,
             finishCasenode:[],
-            inCasenode:[],
+            stepNumber:[],
-            nextCasenode:[]
+            flagLoading:true
             
         };
     },
@@ -50,9 +47,12 @@ export default {
         },
         selectCaseProgressFn(data){
             selectCaseProgress(data).then(res=>{
-                this.finishCasenode = res.data.data.finishCasenode
+                let finishCasenode = res.data.data.finishCasenode;;
-                this.inCasenode = res.data.data.inCasenode
+                this.finishCasenode = finishCasenode;
-                this.nextCasenode = res.data.data.nextCasenode
+                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