Merge branch 'hhl' of SH-Arbitrate/Arbitrate-Frontend into dev

src/api/caseManagement/caseManagement.js

@@ -97,3 +97,11 @@ export function updateHeardate(data) {
     data: data,
   });
 }
+// 案件快递信息查询 
+export function logistics(data) {
+  return request({
+    url: "/adjudication/logistics",
+    method: "get",
+    params: data,
+  })
+}

src/views/caseFiling/archiveList.vue

@@ -70,7 +70,7 @@
   
 <script>
 import { caseApplicationList, selectSignSealUrl,caseApplicationDetail } from "@/api/awardManagement/awardManagement";
-import { caseLogRecordList } from "@/api/caseManagement/caseManagement";
+import { caseLogRecordList, logistics } from "@/api/caseManagement/caseManagement";
 import { adjudicationArchives, videoList } from "@/api/caseFiling/caseFiling";
 import archiveDetailsDialog from "./components/archiveDetailsDialog.vue";
 export default {
@@ -95,7 +95,7 @@ export default {
       // 校验表单
       rules: {},
       dataList: [],
-      detailform: {}, //详情数据
+      detailform: [], //详情数据
       showarchiveDetails: false, //详情数据弹框
       flagLoading: false, //详情弹框loading
       videoList:"",
@@ -138,7 +138,8 @@ export default {
     },
     // model框显示
     showDetail(row) {
-      this.getDetail({ id: row.id });
+      // this.getDetail({ id: row.id });
+      this.logisticsFn({ id: row.id })
       this.getvideoList({ caseId: row.id });
       this.getCaseDetail({ id: row.id })
       this.getCaseLog({caseAppliId :row.id})
@@ -156,11 +157,18 @@ export default {
       })
     },
     /** 查询详情 */
-    getDetail(parms) {
-      adjudicationArchives(parms).then((res) => {
+    // getDetail(parms) {
+    //   adjudicationArchives(parms).then((res) => {
+    //     console.log(res,"PPPPPPPPPPPPPPPPPPPPPPPPP");
+    //     this.detailform = res.data.logisticsInfoVOList;
+    //   });
+    // },
+    // 查询快递单号信息 logistics
+    logisticsFn(params) {
+      logistics(params).then((res) => {
         // console.log(res,"PPPPPPPPPPPPPPPPPPPPPPPPP");
-        this.detailform = res.data.logisticsInfoVOList;
-      });
+        this.detailform = res.data;
+      })
     },
     // 查询案件详情
     getCaseDetail(params){
@@ -172,8 +180,8 @@ export default {
     // 查看案件日志
     getCaseLog(params){
       caseLogRecordList(params).then(res=>{
-        console.log(res,"LLLLLLLLLLL");
-        this.caseLog = res.rows;
+        // console.log(res,"LLLLLLLLLLL");
+        this.caseLog = res.data;
       })
     }
   },

src/views/caseFiling/components/caselogInfo.vue

@@ -1,9 +1,6 @@
 <template>
   <div>
-    <div class="loading" v-if="flagLoading">
-      <i class="el-icon-loading"></i>
-    </div>
-    <div v-else>
+    <div>
       <div class="noData" v-if="noData">暂无数据！</div>
       <el-timeline v-else>
         <el-timeline-item
@@ -21,7 +18,7 @@
 
 <script>
 export default {
-  props: ["flagLoading", "caselogDataArr"],
+  props: ["caselogDataArr"],
   data() {
     return {
       activities: [],

src/views/caseFiling/components/expressDeliveryInfo.vue

@@ -1,9 +1,6 @@
 <template>
   <div>
-    <div class="loading" v-if="flagLoading">
-      <i class="el-icon-loading"></i>
-    </div>
-    <div v-else>
+    <div>
       <div class="deliverName">
         <span>申请人快递信息：</span>
         {{ expressOne.company }} {{ expressOne.no }}
@@ -39,7 +36,7 @@
 
 <script>
 export default {
-  props: ["deliveryDataArr", "flagLoading"],
+  props: ["deliveryDataArr"],
   data() {
     return {
       reverse: true,
@@ -48,9 +45,10 @@ export default {
       expressTwo: {},
     };
   },
-  created() {
+  watch: {
+    deliveryDataArr() {
     console.log(this.deliveryDataArr, "deliveryDataArr");
-    if (this.deliveryDataArr && this.deliveryDataArr.length > 0) {
+      if (this.deliveryDataArr && this.deliveryDataArr.length > 0) {
       this.deliveryDataArr.forEach((item) => {
         if (item.identityType == 1) {
           let applicantdata = item.logisticsInfo;
@@ -75,6 +73,7 @@ export default {
         }
       });
     }
+    }
   },
   methods: {
     cancel() {

src/views/caseManagement/caseList.vue

@@ -539,7 +539,7 @@ export default {
         caseAppliId: val.id,
       };
       caseLogRecordList(params).then((res) => {
-        this.caselogDataArr = res.rows;
+        this.caselogDataArr = res.data;
         this.flagLoading = false;
       });
     },

src/views/caseManagement/components/courtReviewDialog.vue

@@ -3,7 +3,7 @@
     <!-- 组庭确认页面 -->
     <el-dialog title="组庭确认" :visible="showcourtReview" @close="cancel" :destroy-on-close="true" center>
       <el-form ref="courtReviewform" :model="courtReviewform">
-        <el-form-item label="开庭日期：" prop="hearDate" :rules="[
+        <!-- <el-form-item label="开庭日期：" prop="hearDate" :rules="[
           {
             required: true,
             message: '请选择开庭日期',
@@ -15,7 +15,7 @@
               placeholder="选择日期">
             </el-date-picker>
           </div>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="是否同意组庭：">
           <el-radio-group v-model="isAgreePendTral">
             <el-radio :label="1">是</el-radio>

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">智慧仲裁后台管理系统</h3>
+      <h3 class="title">智慧仲裁系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">智慧仲裁后台管理系统</h3>
+      <h3 class="title">智慧仲裁系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />