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

src/views/caseFiling/archiveList.vue

@@ -62,14 +62,15 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList(queryParams)" />
     <!-- 弹窗 -->
-    <archiveDetailsDialog v-if="showarchiveDetails" :showarchiveDetails="showarchiveDetails" :videoList="videoList" :detailform="detailform"
+    <archiveDetailsDialog v-if="showarchiveDetails" :showarchiveDetails="showarchiveDetails" :caseDetail="caseDetail" :caseLog="caseLog" :videoList="videoList" :detailform="detailform"
       :flagLoading="flagLoading" @cancelpaymentdetails="cancelpaymentdetails" @updataList="updataList">
     </archiveDetailsDialog>
   </div>
 </template>
   
 <script>
-import { caseApplicationList, selectSignSealUrl } from "@/api/awardManagement/awardManagement";
+import { caseApplicationList, selectSignSealUrl,caseApplicationDetail } from "@/api/awardManagement/awardManagement";
+import { caseLogRecordList } from "@/api/caseManagement/caseManagement";
 import { adjudicationArchives, videoList } from "@/api/caseFiling/caseFiling";
 import archiveDetailsDialog from "./components/archiveDetailsDialog.vue";
 export default {
@@ -97,7 +98,9 @@ export default {
       detailform: {}, //详情数据
       showarchiveDetails: false, //详情数据弹框
       flagLoading: false, //详情弹框loading
-      videoList:""
+      videoList:"",
+      caseDetail:{},
+      caseLog:null
     };
   },
   created() {
@@ -137,6 +140,8 @@ export default {
     showDetail(row) {
       this.getDetail({ id: row.id });
       this.getvideoList({ caseId: row.id });
+      this.getCaseDetail({ id: row.id })
+      this.getCaseLog({caseAppliId :row.id})
       this.showarchiveDetails = true;
       this.flagLoading = true;
     },
@@ -153,10 +158,24 @@ export default {
     /** 查询详情 */
     getDetail(parms) {
       adjudicationArchives(parms).then((res) => {
-        this.detailform = res.data;
-        this.flagLoading = false;
+        // console.log(res,"PPPPPPPPPPPPPPPPPPPPPPPPP");
+        this.detailform = res.data.logisticsInfoVOList;
       });
     },
+    // 查询案件详情
+    getCaseDetail(params){
+      caseApplicationDetail(params).then(res=>{
+        this.caseDetail = res.data;
+        this.flagLoading = false;
+      })
+    },
+    // 查看案件日志
+    getCaseLog(params){
+      caseLogRecordList(params).then(res=>{
+        console.log(res,"LLLLLLLLLLL");
+        this.caseLog = res.rows;
+      })
+    }
   },
 };
 </script>

src/views/caseFiling/components/archiveDetailsDialog.vue

@@ -8,19 +8,19 @@
         <div class="noData" v-if="noData">暂无数据！</div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="案件信息" name="first">
-            <caseInfo :caseApplicationObj="caseApplicationObj"></caseInfo>
+            <caseInfo :caseApplicationObj="caseDetail"></caseInfo>
           </el-tab-pane>
           <el-tab-pane label="案件日志" name="second">
-            <caselogInfo :caselogDataArr="caselogDataArr"></caselogInfo>
+            <caselogInfo :caselogDataArr="caseLog"></caselogInfo>
           </el-tab-pane>
           <el-tab-pane label="快递信息" name="third">
-            <expressDeliveryInfo :deliveryDataArr="deliveryDataArr"></expressDeliveryInfo>
+            <expressDeliveryInfo :deliveryDataArr="detailform"></expressDeliveryInfo>
           </el-tab-pane>
-          <el-tab-pane style="display: flex;justify-content: space-between;flex-wrap: wrap;" label="案件视频" name="four">
+          <!-- <el-tab-pane label="案件视频" name="fourth"> -->
             <!-- <div @click="getVideo">chakanshipin</div> -->
-            <el-empty description="暂无视频" v-if="!videoFlag"></el-empty>
+            <!-- <el-empty description="暂无视频" v-if="!videoFlag"></el-empty>
             <video style="background-color: #181717;width: 400px;height: 200px;margin: 30px;" v-if="videoFlag" :src="headPath + item.annexPath" controls="controls" v-for="(item,index) in videoUrl" :key="index"></video>
-          </el-tab-pane>
+          </el-tab-pane> -->
         </el-tabs>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -35,7 +35,7 @@ import caseInfo from "./caseInfo.vue";
 import caselogInfo from "./caselogInfo.vue";
 import expressDeliveryInfo from "./expressDeliveryInfo.vue";
 export default {
-  props: ["showarchiveDetails", "detailform", "flagLoading", "videoList"],
+  props: ["showarchiveDetails", "detailform", "flagLoading", "videoList","caseDetail","caseLog"],
   components: {
     caseInfo,
     caselogInfo,
@@ -49,17 +49,17 @@ export default {
       deliveryDataArr: [], //快递信息
       noData: false,
       videoUrl:[],
-      headPath:"",
+      headPath:window.location.origin + "/API",
       videoFlag:false
     };
   },
   watch: {
-    detailform(newValue) {
-      this.headPath = window.location.origin + "/API";
+    showarchiveDetails(newValue) {
+      // this.headPath = ;
       if (newValue) {
-        this.caseApplicationObj = this.detailform.caseApplication;
-        this.caselogDataArr = this.detailform.caseLogRecordList;
-        this.deliveryDataArr = this.detailform.logisticsInfoVOList;
+        // this.caseApplicationObj = this.detailform.caseApplication;
+        // this.caselogDataArr = this.detailform.caseLogRecordList;
+        // this.deliveryDataArr = this.detailform.logisticsInfoVOList;
       }
     },
   },
@@ -97,6 +97,7 @@ export default {
 ::v-deep .el-tabs__content {
   height: 700px;
   overflow-y: scroll;
+  padding-bottom: 10%;
 }
 
 .loading {

src/views/caseManagement/caseList.vue

@@ -199,7 +199,7 @@
     </evidenceDialog>
 
     <!-- 开庭时间修改 -->
-    <timeDialog :timeVisable="timeVisable" @getcaseApply="getcaseApply" @cancelTime="cancelTime" :timeData="timeData">
+    <timeDialog :timeVisable="timeVisable" @getcaseApply="getcaseApply" @cancelTime="cancelTime" :timeData="timeData" :queryParams="queryParams">
     </timeDialog>
     <!-- 批量操作弹窗 -->
     <operateDialog :queryParams="queryParams" :operateStatus="operateStatus" :operateVisable="operateVisable"
@@ -685,6 +685,7 @@ export default {
       selectCaseApply({ id }).then((res) => {
         // this.visible = true;
         // this.formData = res.data;
+        this.form.caseName = res.data.caseName;
         this.adjudicatename = {
           applicantName: res.data.applicantName,
           respondentName: res.data.respondentName,

src/views/caseManagement/components/caseentryDialog.vue

@@ -15,6 +15,11 @@
               <el-input v-model="formData.caseNum" placeholder="请输入案件编号" :disabled="flag == '1'" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="案件名称：" prop="caseName">
+              <el-input v-model="formData.caseName" placeholder="请输入案件名称" :disabled="flag == '1'" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="案件标的：" prop="caseSubjectAmount">
               <el-input v-model="formData.caseSubjectAmount" placeholder="请输入案件标的"
@@ -622,6 +627,13 @@ export default {
             trigger: "blur",
           },
         ],
+        caseName: [
+          {
+            required: true,
+            message: "案件名称不能为空",
+            trigger: "blur",
+          },
+        ],
         loanStartDate: [
           {
             required: true,

src/views/caseManagement/components/courtReviewDialog.vue

@@ -39,7 +39,7 @@
         </el-tag>
       </div>
       <div v-if="noArbitrator || isAgreePendTral == 0">
-        <el-table :data="dataList" style="width: 100%" @selection-change="handleSelectionChange">
+        <el-table ref="selectTable" :data="dataList" style="width: 100%" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" v-if="noArbitrator || isAgreePendTral == 0">
           </el-table-column>
           <el-table-column label="仲裁员姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
@@ -67,7 +67,9 @@ export default {
   data() {
     return {
       hearDate: "",
-      courtReviewform: {},
+      courtReviewform: {
+        hearDate:null
+      },
       noArbitrator: false,
       isAgreePendTral: 1,
       total: 0,
@@ -87,9 +89,10 @@ export default {
     this.getarbitrAtor();
   },
   watch: {
-    showformateCourt(val) {
+    showcourtReview(val) {
       if (val) {
         this.isAgreePendTral = 1;
+        this.courtReviewform.hearDate = null
       }
     },
     form: {
@@ -112,6 +115,10 @@ export default {
     },
     // 勾选仲裁员
     handleSelectionChange(val) {
+      if (val.length > 1) {
+        this.$refs.selectTable.clearSelection();
+        this.$refs.selectTable.toggleRowSelection(val.pop());
+      }
       this.arbitrators = [];
       val.forEach((item) => {
         this.arbitrators.push({

src/views/caseManagement/components/formateCourtDialog.vue

@@ -40,6 +40,7 @@
       <div v-if="noArbitrator || isAgreePendTral == 0">
         <el-table
           :data="dataList"
+          ref="selectTable"
           style="width: 100%"
           @selection-change="handleSelectionChange"
         >
@@ -148,6 +149,10 @@ export default {
     },
     // 勾选仲裁员
     handleSelectionChange(val) {
+      if (val.length > 1) {
+        this.$refs.selectTable.clearSelection();
+        this.$refs.selectTable.toggleRowSelection(val.pop());
+      }
       this.arbitrators = [];
       val.forEach((item) => {
         this.arbitrators.push({

src/views/caseManagement/components/payDialog.vue

@@ -95,6 +95,10 @@ export default {
     },
     //选择支付方式(线上,线下)
     changPayType(data) {
+      if(data == 1){
+        document.getElementById("qrcodeImg").innerHTML = "";
+        this.payMain = ""
+      }
       this.submitForm.payType = data;
     },
     beforeUpload(flie, fileList) {
@@ -198,6 +202,9 @@ export default {
   watch:{
     openPay(val){
       if(val){
+      this.submitForm.payOrderList = []
+      this.paySelect = 1;
+      this.fileList = [];
       this.filedata.id = this.payId;
       this.submitForm.caseId = this.payId;
       }

src/views/caseManagement/components/timeDialog.vue

@@ -29,7 +29,7 @@ import { updateHeardate } from '@/api/caseManagement/caseManagement'
 import { getToken } from "@/utils/auth";
 import moment from "moment";
 export default {
-    props: ["timeVisable", "timeData"],
+    props: ["timeVisable", "timeData","queryParams"],
     data() {
         return {
             loanStartDate: "",
@@ -60,7 +60,7 @@ export default {
             updateHeardate(data).then(res => {
                 this.$modal.msgSuccess("修改成功");
                 this.cancel();
-                this.$emit("getcaseApply");
+                this.$emit("getcaseApply",this.queryParams);
             })
         },
         submitTime() {

src/views/caseManagement/components/trialincourtDialog.vue

@@ -264,6 +264,7 @@ export default {
     return {
       formData: {},
       user: "",
+      userId:1,
       showArbitrationresults: false,
       form2: {},
       applicateArr: [], //申请人案件资料
@@ -278,6 +279,7 @@ export default {
     showtrialincourt: {
       handler(val) {
         if (val) {
+          this.getUser();
           this.formData = this.form;
           this.applicateArr = [];
           this.quiltArr = [];
@@ -314,7 +316,7 @@ export default {
     },
   },
   created() {
-    this.getUser();
+    
   },
   methods: {
     // 详情显示，展示申请人案件文件
@@ -341,12 +343,14 @@ export default {
     getUser() {
       getUserProfile().then((response) => {
         this.user = response.data.userName;
+        this.userId =  response.data.userId;
       });
     },
     // 打开会议
     openmeeting() {
       window.open(
-        `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}`
+        // `http://localhost:8081/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}`
+        `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}`
       );
     },
     // 提交仲裁结果

src/views/deliveryRecord/emailRecord.vue

@@ -22,6 +22,7 @@
             <!-- <el-table-column label="证件号码" align="center" prop="caseNum" :show-overflow-tooltip="true" /> -->
             <el-table-column label="邮箱地址" align="center" prop="mailAddress" />
             <el-table-column label="发送时间" align="center" prop="sendTime" :show-overflow-tooltip="true" />
+            <el-table-column label="发送状态" align="center" prop="sendStatus" />
             <!-- <el-table-column label="文书类型" align="center" prop="hearDate" :show-overflow-tooltip="true" /> -->
             <!-- 缴费人 -->
             <!-- <el-table-column label="案件状态" align="center" prop="caseStatusName" /> -->
@@ -29,7 +30,7 @@
         </el-table>
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
             @pagination="getList(queryParams)" />
-       
+
     </div>
 </template>
   
@@ -42,7 +43,7 @@ import { getDicts } from '@/api/system/dict/data.js'
 export default {
     name: "paymentList",
     dicts: ["case_status"],
-    components: { },
+    components: {},
     data() {
         return {
             queryParams: {
@@ -83,6 +84,15 @@ export default {
             this.loading = true;
             emailList(parms).then((response) => {
                 this.dataList = response.rows;
+                this.dataList.forEach(item => {
+                    if (item.sendStatus == 0) {
+                        item.sendStatus = "未发送"
+                    } else if (item.sendStatus == 1) {
+                        item.sendStatus = "已发送"
+                    } else {
+                        item.sendStatus = "未发送"
+                    }
+                })
                 this.total = response.total;
                 this.loading = false;
             });

src/views/deliveryRecord/smsRecord.vue

@@ -20,6 +20,7 @@
             <el-table-column label="案件编号" align="center" prop="caseNum" :show-overflow-tooltip="true" />
             <el-table-column label="手机号" align="center" prop="phone" :show-overflow-tooltip="true" />
             <el-table-column label="发送时间" align="center" prop="sendTime" />
+            <el-table-column label="发送状态" align="center" prop="sendStatus" />
             <el-table-column label="发送内容" align="center" prop="sendContent" :show-overflow-tooltip="true" />
         </el-table>
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -77,6 +78,15 @@ export default {
             this.loading = true;
             smsList(data,params).then((response) => {
                 this.dataList = response.rows;
+                this.dataList.forEach(item=>{
+                    if(item.sendStatus == 0){
+                        item.sendStatus = "未发送"
+                    }else if(item.sendStatus == 1){
+                        item.sendStatus = "已发送"
+                    }else{
+                        item.sendStatus = "未发送"
+                    }
+                })
                 this.total = response.total;
                 this.loading = false;
             });

src/views/officialSeal/officialSealList.vue

@@ -117,12 +117,12 @@ export default {
                 this.total = response.total;
                 this.loading = false;
                 this.dataList.forEach(item => {
-                    if (item.identifyStatus == 0) {
+                    if (item.identifyStatus == 0 || item.identifyStatus == null) {
                         item.identifyStatus = '未认证'
                     } else {
                         item.identifyStatus = '已认证'
                     }
-                    if (item.isUse == 0) {
+                    if (item.isUse == 0 || item.isUse == null) {
                         item.isUse = '未启用'
                     } else {
                         item.isUse = '已启用'