Просмотр исходного кода

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

hhlxayunmei 2 лет назад
Родитель
Сommit
446eb20a45

+ 40
- 4
src/views/caseManagement/caseList.vue Просмотреть файл

@@ -5,7 +5,7 @@
5 5
       ref="queryForm"
6 6
       size="small"
7 7
       :inline="true"
8
-      label-width="68px"
8
+      label-width="98px"
9 9
     >
10 10
       <el-form-item label="案件编号" prop="caseNum">
11 11
         <el-input
@@ -15,6 +15,14 @@
15 15
           @keyup.enter.native="handleQuery"
16 16
         />
17 17
       </el-form-item>
18
+      <el-form-item label="申请人(机构)" prop="applicantName">
19
+        <el-input
20
+          v-model="queryParams.applicantName"
21
+          placeholder="请输入机构名称"
22
+          clearable
23
+          @keyup.enter.native="handleQuery"
24
+        />
25
+      </el-form-item>
18 26
       <el-form-item label="案件状态" prop="caseStatus">
19 27
         <el-select
20 28
           v-model="queryParams.caseStatus"
@@ -89,12 +97,12 @@
89 97
         prop="caseNum"
90 98
         :show-overflow-tooltip="true"
91 99
       />
92
-      <!-- <el-table-column
93
-        label="申请人"
100
+      <el-table-column
101
+        label="申请人(机构)"
94 102
         align="center"
95 103
         prop="caseAffiliates[0].name"
96 104
         :show-overflow-tooltip="true"
97
-      /> -->
105
+      />
98 106
       <el-table-column
99 107
         label="案件标的"
100 108
         align="center"
@@ -134,6 +142,15 @@
134 142
             v-hasPermi="['monitor:online:forceLogout']"
135 143
             >详情</el-button
136 144
           >
145
+          <!-- 案件日志 -->
146
+          <el-button
147
+            size="mini"
148
+            type="text"
149
+            icon="el-icon-zoom-in"
150
+            @click="caselogRow(scope.row)"
151
+            v-hasPermi="['monitor:online:forceLogout']"
152
+            >案件日志</el-button
153
+          >
137 154
           <el-button
138 155
             size="mini"
139 156
             type="text"
@@ -341,6 +358,12 @@
341 358
       @getcaseApply="getcaseApply"
342 359
       @paycancelRow="paycancelRow"
343 360
     ></payDialog>
361
+    <!-- 案件日志 -->
362
+    <caselogDialog
363
+    :showcaseLog="showcaseLog"
364
+    @cancelcaseLog="cancelcaseLog"
365
+    :flagLoading="flagLoading"
366
+    ></caselogDialog>
344 367
   </div>
345 368
 </template>
346 369
 
@@ -354,6 +377,7 @@ import adjudicaterecordDialog from "./components/adjudicaterecordDialog.vue";
354 377
 import trialincourtDialog from "./components/trialincourtDialog.vue";
355 378
 import payDialog from "./components/payDialog.vue";
356 379
 import filingreviewDialog from "./components/filingreviewDialog.vue";
380
+import caselogDialog from './components/caselogDialog.vue';
357 381
 
358 382
 import { caseApplicationDetail } from "@/api/pay/pay";
359 383
 import {
@@ -377,6 +401,7 @@ export default {
377 401
     trialincourtDialog,
378 402
     payDialog,
379 403
     filingreviewDialog,
404
+    caselogDialog
380 405
   },
381 406
   data() {
382 407
     return {
@@ -393,6 +418,7 @@ export default {
393 418
         caseStatusList: [0, 1, 2, 5, 6, 7, 8, 9, 10, 16],
394 419
         hearDate: "",
395 420
         caseStatus: null,
421
+        applicantName: "",
396 422
         pageNum: 1,
397 423
         pageSize: 10,
398 424
       },
@@ -420,6 +446,8 @@ export default {
420 446
       payTitle: "",
421 447
       payForm: {},
422 448
       caseAttachList: [], //案件质证资料
449
+      showcaseLog: false, //案件日志弹框显示
450
+      flagLoading: false, //案件日志弹框loading
423 451
     };
424 452
   },
425 453
   created() {
@@ -509,6 +537,14 @@ export default {
509 537
       this.dialogtitle = "立案详情";
510 538
       this.getInfo(row);
511 539
     },
540
+    // 案件日志
541
+    caselogRow(row) {
542
+      this.showcaseLog = true;
543
+    },
544
+    // 关闭案件日志
545
+    cancelcaseLog() {
546
+      this.showcaseLog = false;
547
+    },
512 548
     // 修改
513 549
     editRow(row) {
514 550
       this.flag = "1";

+ 10
- 19
src/views/caseManagement/components/caseentryDialog.vue Просмотреть файл

@@ -24,7 +24,7 @@
24 24
         <el-divider></el-divider>
25 25
         <el-row>
26 26
           <el-col :span="12">
27
-            <el-form-item label="案件编号:" prop="caseNum">
27
+            <el-form-item label="案件编号:" prop="caseNum" v-if="flag !== '2'">
28 28
               <el-input
29 29
                 v-model="formData.caseNum"
30 30
                 placeholder="请输入案件编号"
@@ -216,7 +216,7 @@
216 216
           <el-row>
217 217
             <el-col :span="12">
218 218
               <el-form-item
219
-                label="申请人姓名"
219
+                label="申请人(机构):"
220 220
                 :prop="'paymentArr.' + index + '.name'"
221 221
                 :rules="[
222 222
                   {
@@ -231,21 +231,8 @@
231 231
             </el-col>
232 232
             <el-col :span="12">
233 233
               <el-form-item
234
-                label="身份证号:"
234
+                label="代码:"
235 235
                 :prop="'paymentArr.' + index + '.identityNum'"
236
-                :rules="[
237
-                  {
238
-                    required: true,
239
-                    message: '身份证号不能为空',
240
-                    trigger: 'blur',
241
-                  },
242
-                  {
243
-                    pattern:
244
-                      /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
245
-                    message: '请输入正确的身份证号码',
246
-                    trigger: 'blur',
247
-                  },
248
-                ]"
249 236
               >
250 237
                 <el-input v-model="item.identityNum" placeholder="请输入" />
251 238
               </el-form-item>
@@ -318,7 +305,7 @@
318 305
           </el-row>
319 306
           <div style="display:inline-flex">
320 307
               <div class="infoIcon"></div>
321
-              <div class="caseInfo">代理人信息:</div>
308
+              <div class="caseInfo2">代理人信息:</div>
322 309
           </div>
323 310
           <!-- <p>代理人信息:</p> -->
324 311
           <el-row>
@@ -542,7 +529,7 @@
542 529
           </el-row>
543 530
           <div style="display:inline-flex">
544 531
               <div class="infoIcon"></div>
545
-              <div class="caseInfo">代理人信息:</div>
532
+              <div class="caseInfo2">代理人信息:</div>
546 533
           </div>
547 534
           <!-- <p>代理人信息:</p> -->
548 535
           <el-row>
@@ -815,7 +802,7 @@ export default {
815 802
           if (this.flag == "1" || this.flag == "0") {
816 803
             this.form2.paymentArr = this.initpaymentArr;
817 804
             this.form3.paymentArr1 = this.initpaymentArr1;
818
-            console.log(this.caseAttachList, "caseAttachList");
805
+            console.log(this.caseAttachList,this.flag, "caseAttachList--flag");
819 806
             this.caseAttachList.forEach((item) => {
820 807
               console.log(item, "iytem");
821 808
               if (item.annexType == 2) {
@@ -1064,6 +1051,10 @@ export default {
1064 1051
   font-size: 17px;
1065 1052
   font-weight: 600;
1066 1053
 }
1054
+.caseInfo2 {
1055
+  font-size: 15px;
1056
+  font-weight: 550;
1057
+}
1067 1058
 .infoIcon {
1068 1059
   width: 4px;
1069 1060
   // height: 17px;

+ 133
- 0
src/views/caseManagement/components/caselogDialog.vue Просмотреть файл

@@ -0,0 +1,133 @@
1
+<template>
2
+  <div>
3
+    <el-dialog
4
+      title="案件日志"
5
+      :visible="showcaseLog"
6
+      @close="cancel"
7
+      center
8
+      :distroy-on-close="true"
9
+    >
10
+      <div class="loading" v-if="flagLoading">
11
+        <i class="el-icon-loading"></i>
12
+      </div>
13
+      <div v-else>
14
+        <el-timeline>
15
+          <el-timeline-item
16
+            v-for="(activity, index) in activities"
17
+            :key="index"
18
+            :timestamp="activity.timestamp"
19
+            placement="top"
20
+          >
21
+            <el-card>
22
+              <h4>{{ activity.doOperate }}</h4>
23
+              <p>{{ activity.content }}</p>
24
+            </el-card>
25
+          </el-timeline-item>
26
+          <!-- <el-timeline-item timestamp="2018/4/3" placement="top">
27
+            <el-card>
28
+              <h4>更新 Github 模板</h4>
29
+              <p>王小虎 提交于 2018/4/3 20:46</p>
30
+            </el-card>
31
+          </el-timeline-item>
32
+          <el-timeline-item timestamp="2018/4/2" placement="top">
33
+            <el-card>
34
+              <h4>更新 Github 模板</h4>
35
+              <p>王小虎 提交于 2018/4/2 20:46</p>
36
+            </el-card>
37
+          </el-timeline-item> -->
38
+        </el-timeline>
39
+      </div>
40
+      <div slot="footer" class="dialog-footer">
41
+        <el-button @click="cancel" class="endbutton1"
42
+          ><span>取 消</span></el-button
43
+        >
44
+      </div>
45
+    </el-dialog>
46
+  </div>
47
+</template>
48
+
49
+<script>
50
+export default {
51
+  props: ["showcaseLog", "flagLoading"],
52
+  data() {
53
+    return {
54
+      // key: value
55
+      reverse: true,
56
+      activities: [
57
+        {
58
+          content: "韩超勃 申请于 2023/10/3 20:46",
59
+          timestamp: "申请",
60
+          doOperate: "申请立案"
61
+        },
62
+        {
63
+          content: "韩超勃 提交于 2023/10/4 20:46",
64
+          timestamp: "提交",
65
+          doOperate: "提交立案"
66
+        },
67
+        {
68
+          content: "氢气球 立案审查 2023/10/3 20:46",
69
+          timestamp: "立案审查",
70
+          doOperate: "立案审查"
71
+        },
72
+        {
73
+          content: "风格的 提交于 2023/10/3 20:46",
74
+          timestamp: "提交",
75
+          doOperate: "提交立案"
76
+        },
77
+        {
78
+          content: "乖乖 提交于 2023/10/3 20:46",
79
+          timestamp: "提交",
80
+          doOperate: "提交立案"
81
+        },
82
+        {
83
+          content: "烤羊腿 提交于 2023/10/3 20:46",
84
+          timestamp: "提交",
85
+          doOperate: "提交立案"
86
+        },
87
+      ],
88
+    };
89
+  },
90
+  methods: {
91
+    cancel() {
92
+      this.$emit("cancelcaseLog");
93
+    },
94
+  },
95
+};
96
+</script>
97
+
98
+<style lang="scss" scoped>
99
+::v-deep .el-dialog__body {
100
+  height: 700px !important;
101
+  overflow: auto !important;
102
+}
103
+::v-deep .el-dialog {
104
+  width: 800px;
105
+  background: #ffffff;
106
+  border-radius: 20px;
107
+}
108
+.endbutton1 {
109
+  width: 154px;
110
+  height: 37px;
111
+  background: #ffffff;
112
+  border: 1px solid #d0d0d0;
113
+  border-radius: 19px;
114
+  span {
115
+    width: 31px;
116
+    height: 13px;
117
+    font-size: 16px;
118
+    font-family: Microsoft YaHei;
119
+    font-weight: 400;
120
+    color: #959595;
121
+  }
122
+}
123
+.loading {
124
+  width: 100%;
125
+  height: 100%;
126
+  display: flex;
127
+  justify-content: center;
128
+  align-items: center;
129
+  .el-icon-loading {
130
+    font-size: 50px;
131
+  }
132
+}
133
+</style>