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

src/api/caseManagement/caseManagement.js

@@ -49,3 +49,11 @@ export function evidenceUpload(data) {
     data: data,
   });
 }
+// 案件日志列表查询
+export function caseLogRecordList(data) {
+  return request({
+    url: "/caseLogRecord/list",
+    method: "get",
+    params: data,
+  });
+}

src/views/caseManagement/caseList.vue

@@ -146,7 +146,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-zoom-in"
+            icon="el-icon-notebook-2"
             @click="caselogRow(scope.row)"
             v-hasPermi="['monitor:online:forceLogout']"
             >案件日志</el-button
@@ -355,6 +355,7 @@
       :payTitle="payTitle"
       :form="form"
       :payForm="payForm"
+      :queryParams="queryParams"
       @getcaseApply="getcaseApply"
       @paycancelRow="paycancelRow"
     ></payDialog>
@@ -386,7 +387,7 @@ import {
   submitCaseApply,
   selectCaseApply,
 } from "@/api/caseAccess/caseEntry";
-import { document } from "@/api/caseManagement/caseManagement";
+import { document, caseLogRecordList } from "@/api/caseManagement/caseManagement";
 
 export default {
   name: "caseList",
@@ -540,6 +541,10 @@ export default {
     // 案件日志
     caselogRow(row) {
       this.showcaseLog = true;
+    },
+    // 查询案件日志信息
+    caseLogRecordListFn() {
+
     },
     // 关闭案件日志
     cancelcaseLog() {

src/views/caseManagement/components/caseentryDialog.vue

@@ -696,14 +696,14 @@ export default {
       }, //被申请人主体信息
       // 表单校验
       rules: {
-        caseNum: [
-          {
-            required: true,
-            message: "案件编号不能为空",
-            trigger: "blur",
-          },
-          { max: 20, message: "长度应小于20个字符", trigger: "blur" },
-        ],
+        // caseNum: [
+        //   {
+        //     required: true,
+        //     message: "案件编号不能为空",
+        //     trigger: "blur",
+        //   },
+        //   { max: 20, message: "长度应小于20个字符", trigger: "blur" },
+        // ],
         caseSubjectAmount: [
           {
             required: true,

src/views/caseManagement/components/payDialog.vue

@@ -47,7 +47,7 @@
 import { casePay, selectCaseApplicationConfirm } from "@/api/pay/pay";
 import QRCode from "qrcodejs2";
 export default {
-  props: ["openPay", "payTitle", "form", "payForm"],
+  props: ["openPay", "payTitle", "form", "payForm", "queryParams"],
   data() {
     return {
       // key: value

src/views/caseManagement/components/trialincourtDialog.vue

@@ -300,7 +300,7 @@ export default {
     // 打开会议
     openmeeting() {
       // window.open('https://txroom.xayunmei.com');
-      window.open(`https://txroom.xayunmei.com/#/home?name=${this.user}`);
+      window.open(`https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}`);
     },
     // 提交仲裁结果
     openArbitrationresults() {