合并

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