소스 검색

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Frontend into gyj

gyj 2 년 전
부모
커밋
dd8c361b67

+ 7
- 7
src/views/caseManagement/caseList.vue 파일 보기

@@ -150,9 +150,7 @@
150 150
           <el-button size="mini" type="text" icon="el-icon-check" @click="courtreviewRow(scope.row)" v-if="scope.row.caseStatus == 5 &&
151 151
             checkPermi(['caseManagement:list:checkgroup']) && btnStatus
152 152
             ">组庭审核</el-button>
153
-          <el-button size="mini" type="text" icon="el-icon-sort" @click="choosetrialmethodRow(scope.row)" v-if="scope.row.caseStatus == 7 &&
154
-            checkPermi(['caseManagement:list:checkarbitrationway']) && btnStatus
155
-            ">审核仲裁方式</el-button>
153
+          <el-button size="mini" type="text" icon="el-icon-sort" @click="choosetrialmethodRow(scope.row)">审核仲裁方式</el-button>
156 154
           <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="adjudicaterecordRow(scope.row)" v-if="scope.row.caseStatus == 9 &&
157 155
             scope.row.arbitratMethod == 2 &&
158 156
             checkPermi(['caseManagement:list:hear']) && btnStatus
@@ -203,7 +201,7 @@
203 201
                     <el-button size="mini" type="text" icon="el-icon-edit"
204 202
                     v-if="scope.row.caseStatus == 16 && checkPermi(['caseManagement:list:archive']) && btnStatus"
205 203
                         @click="showCasefilingModel(scope.row, 6)">案件归档</el-button>
206
-                    <el-button size="mini" type="text" icon="el-icon-tickets" @click="detailsAwardList(scope.row)">案件详情</el-button>                    
204
+                    <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="detailsAwardList(scope.row)">案件详情</el-button>                     -->
207 205
             <!-- 暂时隐藏后期可能会放其他地方 -->
208 206
           <!-- <el-button v-if="checkPermi(['caseManagement:list:listEvidence']) && scope.row.caseStatus <= 1 && btnStatus"
209 207
             size="mini" type="text" icon="el-icon-upload" @click="uploadCase(scope.row)">上传证据目录</el-button> -->
@@ -225,7 +223,7 @@
225 223
       @pagination="getcaseApply(queryParams)" />
226 224
 
227 225
     <!-- 立案申请弹框 -->
228
-    <caseentryDialog :visible="visible" @cancel="cancel" :form="form" :queryParams="queryParams"
226
+    <caseentryDialog :visible="visible" @cancel="cancel" :form="form" :detailsAwardForm="detailsAwardForm" :queryParams="queryParams"
229 227
       :dialogtitle="dialogtitle" :getcaseApply="getcaseApply" :flag="flag" :caseAttachList="caseAttachList"
230 228
       :initpaymentArr="initpaymentArr" :initpaymentArr1="initpaymentArr1" :columnValues="columnValues"></caseentryDialog>
231 229
     <!-- 批量申请弹框 openbatch-->
@@ -305,9 +303,9 @@
305 303
      <!-- 送达裁决书页面 -->
306 304
      <mailawardDialog :openMailawardDialog="openMailawardDialog" @closeMailaward="closeMailaward"  :mailawardata="mailawardata" :emailobj="emailobj"  @getcaseApply="getcaseApply" :queryParams="queryParams"></mailawardDialog>
307 305
      <!-- 裁决书案件详情 -->
308
-     <detailsAward :showarchiveDetails="showarchiveDetails" @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :videoList="videoList"
306
+     <!-- <detailsAward :showarchiveDetails="showarchiveDetails" @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :videoList="videoList"
309 307
         :flagLoadingS="flagLoadingS" :trialTranscripts="trialTranscripts"
310
-      ></detailsAward>
308
+      ></detailsAward> -->
311 309
   </div>
312 310
 </template>
313 311
 
@@ -398,6 +396,7 @@ export default {
398 396
   },
399 397
   data() {
400 398
     return {
399
+      detailsAwardForm: {},
401 400
       // 遮罩层
402 401
       loading: true,
403 402
       // 总条数
@@ -959,6 +958,7 @@ export default {
959 958
         version: row.version
960 959
       }
961 960
       selectCaseApply(params).then((res) => {
961
+        this.detailsAwardForm = res.data;
962 962
         // 证据清单
963 963
         this.caseAttachListR = res.data.caseAttachList;
964 964
         // this.visible = true;

+ 641
- 588
src/views/caseManagement/components/caseentryDialog.vue
파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
파일 보기


+ 18
- 51
src/views/caseManagement/components/paymentdetailsDialog.vue 파일 보기

@@ -1,12 +1,6 @@
1 1
 <template>
2 2
   <div>
3
-    <el-dialog
4
-      :title="title"
5
-      :visible="openDialog"
6
-      @close="cancel"
7
-      :destroy-on-close="true"
8
-      center
9
-    >
3
+    <el-dialog :title="title" :visible="openDialog" @close="cancel" :destroy-on-close="true" center>
10 4
       <el-form ref="form" :model="form" label-width="120px">
11 5
         <el-form-item label="案件编号:" prop="caseNum">
12 6
           <el-input v-model="form.caseNum" placeholder="" :disabled="true" />
@@ -15,11 +9,7 @@
15 9
           <el-input v-model="form.caseSubjectAmount" :disabled="true" />
16 10
         </el-form-item>
17 11
         <el-form-item label="缴费人:" prop="applicantName">
18
-          <el-input
19
-            v-model="form.applicantName"
20
-            placeholder=""
21
-            :disabled="true"
22
-          />
12
+          <el-input v-model="form.applicantName" placeholder="" :disabled="true" />
23 13
         </el-form-item>
24 14
         <el-form-item label="缴费金额:" prop="feePayable">
25 15
           <el-input v-model="form.feePayable" :disabled="true" />
@@ -37,13 +27,9 @@
37 27
           </el-tag>
38 28
         </el-form-item> -->
39 29
         <el-form-item label="缴费凭证:" prop="caseStatusName">
40
-          <div
41
-            style="color: #104fad; cursor: pointer"
42
-            v-for="(item, index) in form.caseAttachList"
43
-            :key="index"
44
-            @click="preview(item.annexPath)"
45
-          >
46
-           <span v-if="item.annexType==8">{{ item.annexName }}</span> 
30
+          <div style="color: #104fad; cursor: pointer" v-for="(item, index) in form.caseAttachList" :key="index"
31
+            @click="preview(item.annexPath)">
32
+            <span v-if="item.annexType == 8">{{ item.annexName }}</span>
47 33
           </div>
48 34
           <!-- <el-tag>{{ form.caseStatusName }}</el-tag> -->
49 35
         </el-form-item>
@@ -55,31 +41,15 @@
55 41
           </el-radio-group>
56 42
         </el-form-item>
57 43
         <!-- 缴费驳回原因-->
58
-        <el-form-item
59
-          label="拒绝原因:"
60
-          v-if="agreeOrNotCheck == 0"
61
-          prop="caseCheckReject"
62
-          :rules="[
63
-            { required: true, message: '请输入驳回原因', trigger: 'blur' },
64
-          ]"
65
-        >
66
-          <el-input
67
-            type="textarea"
68
-            :rows="2"
69
-            placeholder="请输入驳回原因"
70
-            v-model="form.caseCheckReject"
71
-          ></el-input>
44
+        <el-form-item label="拒绝原因:" v-if="agreeOrNotCheck == 0" prop="caseCheckReject" :rules="[
45
+      { required: true, message: '请输入驳回原因', trigger: 'blur' },
46
+    ]">
47
+          <el-input type="textarea" :rows="2" placeholder="请输入驳回原因" v-model="form.caseCheckReject"></el-input>
72 48
         </el-form-item>
73 49
       </el-form>
74 50
       <div slot="footer" class="dialog-footer">
75
-        <el-button
76
-          type="primary"
77
-          @click="submitForm"
78
-          v-if="flag == 0"
79
-          class="endbutton"
80
-          :loading="loadingSubmit"
81
-          >确认已缴费</el-button
82
-        >
51
+        <el-button type="primary" @click="submitForm" v-if="flag == 0" class="endbutton"
52
+          :loading="loadingSubmit">确认已缴费</el-button>
83 53
         <el-button @click="cancel" class="endbutton1">取 消</el-button>
84 54
       </div>
85 55
     </el-dialog>
@@ -89,7 +59,7 @@
89 59
 <script>
90 60
 import { confirmPay } from "@/api/pay/pay";
91 61
 export default {
92
-  props: ["openDialog", "title", "flag", "detailform", "queryParams","getcaseApply"],
62
+  props: ["openDialog", "title", "flag", "detailform", "queryParams", "getcaseApply"],
93 63
   data() {
94 64
     return {
95 65
       // key: value
@@ -123,9 +93,9 @@ export default {
123 93
     // 确认缴费
124 94
     submitForm() {
125 95
       let paramsVal = {
126
-        ids:[this.form.id],
127
-        agreeOrNotCheck:this.agreeOrNotCheck,
128
-        caseCheckReject:this.form.caseCheckReject
96
+        ids: [this.form.id],
97
+        agreeOrNotCheck: this.agreeOrNotCheck,
98
+        caseCheckReject: this.form.caseCheckReject
129 99
       }
130 100
       this.$refs["form"].validate((valid) => {
131 101
         if (valid) {
@@ -136,13 +106,10 @@ export default {
136 106
               type: "success",
137 107
             });
138 108
             this.loadingSubmit = false;
139
-            if (res.code == 200) {
140
-                this.getcaseApply(this.queryParams)
141
-            //   this.getList();
142
-            }
109
+            this.$emit("getcaseApply", this.queryParams);
143 110
           }).catch((err) => {
144
-              this.loadingSubmit = false;
145
-            });
111
+            this.loadingSubmit = false;
112
+          });
146 113
           this.cancel();
147 114
         }
148 115
       });