瀏覽代碼

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

hanchaobo 2 年之前
父節點
當前提交
5d9919fbfa

+ 8
- 0
src/api/caseManagement/caseManagement.js 查看文件

@@ -164,3 +164,11 @@ export function caseApplicationList(data) {
164 164
       params: data
165 165
   })
166 166
 }
167
+// 根据案件id查询当前登陆人是否为仲裁员
168
+export function secretaryRoleByUserId(data) {
169
+  return request({
170
+      url: '/video/secretaryRoleByUserId',
171
+      method: 'get',
172
+      params: data
173
+  })
174
+}

+ 8
- 2
src/views/caseManagement/caseList.vue 查看文件

@@ -5,7 +5,7 @@
5 5
         <el-input style="width:180px" v-model="queryParams.caseNum" placeholder="请输入案件编号" clearable @keyup.enter.native="handleQuery" />
6 6
       </el-form-item>
7 7
       <el-form-item label="案件批号" prop="caseNum">
8
-        <el-input style="width:180px" v-model="queryParams.batchNumber" placeholder="请输入案件批号" clearable @keyup.enter.native="handleQuery" />
8
+        <el-input style="width:180px" @input="handleInput" v-model="queryParams.batchNumber" placeholder="请输入案件批号" clearable @keyup.enter.native="handleQuery" />
9 9
       </el-form-item>
10 10
       <!-- <el-form-item label="申请人" prop="applicantName"> -->
11 11
         <!-- <el-input
@@ -150,7 +150,9 @@
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)">审核仲裁方式</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>
154 156
           <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="adjudicaterecordRow(scope.row)" v-if="scope.row.caseStatus == 9 &&
155 157
             scope.row.arbitratMethod == 2 &&
156 158
             checkPermi(['caseManagement:list:hear']) && btnStatus
@@ -518,6 +520,10 @@ export default {
518 520
     this.getInstitution();
519 521
   },
520 522
   methods: {
523
+    handleInput(event) {
524
+      const value = event;
525
+      this.queryParams.batchNumber = value.replace(/[^\d]/g, ''); // 去除非数字字符
526
+    },
521 527
     cancel() {
522 528
       this.visible = false;
523 529
     },

+ 23
- 17
src/views/caseManagement/components/trialincourtDialog.vue 查看文件

@@ -184,7 +184,7 @@
184 184
             <div>{{ startTime }}</div>
185 185
           </el-form-item>
186 186
         </el-col>
187
-        <el-col :span="24">
187
+        <el-col :span="24" v-if="submitFlag">
188 188
           <el-form-item label="上传裁决书:">
189 189
             <el-upload
190 190
               class="upload-demo"
@@ -210,13 +210,13 @@
210 210
             </el-upload>
211 211
           </el-form-item>
212 212
         </el-col>
213
-        <el-col :span="24">
213
+        <el-col :span="24" v-if="submitFlag">
214 214
           <el-form-item label="上传庭审笔录:">
215 215
             <el-upload
216 216
               class="upload-demo"
217 217
               ref="fileupload"
218 218
               accept=".doc,.docx"
219
-              :action="UploadUrl()"
219
+              :action="UploadUrlsT()"
220 220
               :on-success="handlSuccess"
221 221
               :on-remove="handleRemove"
222 222
               :on-preview="handlePreview"
@@ -242,7 +242,7 @@
242 242
       <el-button
243 243
         @click="openArbitrationresults"
244 244
         type="primary"
245
-        v-if="this.awardArr.length <= 0"
245
+        v-if="this.awardArr.length <= 0 && submitFlag"
246 246
         >确认会议结果</el-button>
247 247
       <div slot="footer" class="dialog-footer">
248 248
         <el-button
@@ -252,6 +252,7 @@
252 252
           "
253 253
           @click="submitResults"
254 254
           :loading="loadingSub"
255
+          v-if="submitFlag"
255 256
           >提交</el-button
256 257
         >
257 258
         <el-button @click="cancel" class="endbutton1"
@@ -468,24 +469,27 @@ import {
468 469
   creatTrialRecord,
469 470
   creatTrialRecordnew,
470 471
   document,
471
-  changeCaseStatus
472
+  changeCaseStatus,
473
+  secretaryRoleByUserId
472 474
 } from "@/api/caseManagement/caseManagement.js";
473 475
 import { reserveConferenceList } from "@/api/meeting/index.js";
474 476
 export default {
475 477
   props: ["showtrialincourt", "adjudicatename", "form", "queryParams"],
476 478
   data() {
477 479
     return {
480
+      submitFlag: false,
478 481
       formData: {},
479 482
       headers: {
480 483
         Authorization: "Bearer " + getToken(),
481 484
       },
482 485
       filedata: {
483 486
         annexType: 7,
484
-        id: 0,
487
+        id: null,
485 488
       },
486 489
       filedatas: {
487 490
         annexType: 3,
488
-        id:null
491
+        officeFlag:1,
492
+        caseId:null
489 493
       },
490 494
       upLife: "",
491 495
       user: "",
@@ -560,6 +564,12 @@ export default {
560 564
   },
561 565
   created() {},
562 566
   methods: {
567
+    // 根据案件id和用户id查询当前登陆人是否为仲裁员
568
+    secretaryRoleByUserIdFn(data){
569
+      secretaryRoleByUserId(data).then(res=>{
570
+        this.submitFlag = res.data.isSecretaryRole;
571
+      })
572
+    },
563 573
     // 根据案件id查询会议号
564 574
     reserveConferenceListFn(data) {
565 575
       reserveConferenceList(data).then((res) => {
@@ -583,7 +593,6 @@ export default {
583 593
     },
584 594
     //裁决书文件
585 595
     awardToFile(item) {
586
-      console.log(item,"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL");
587 596
       // window.open(
588 597
       //   window.location.origin + "/API" + this.awardArr[index].annexPath,
589 598
       //   "_black"
@@ -605,6 +614,7 @@ export default {
605 614
       getUserProfile().then((response) => {
606 615
         this.user = response.data.userName;
607 616
         this.userId = response.data.userId;
617
+        this.secretaryRoleByUserIdFn({caseId:this.form.id,userId:this.userId})
608 618
       });
609 619
     },
610 620
     // 打开会议
@@ -714,10 +724,6 @@ export default {
714 724
         });
715 725
       }
716 726
     },
717
-    // 上传庭审笔录
718
-    UploadUrl() {
719
-      return window.location.origin + "/API/evidence/uploadRecord";
720
-    },
721 727
     // 文件上传成功
722 728
     handlSuccess(res, file) {
723 729
       // this.fileList.push(file);
@@ -760,6 +766,9 @@ export default {
760 766
     },
761 767
     // 上传裁决书
762 768
     UploadUrls() {
769
+      return window.location.origin + "/API/video/upload";
770
+    },
771
+    UploadUrlsT() {
763 772
       return window.location.origin + "/API/evidence/uploadRecord";
764 773
     },
765 774
     beforeRemoves(file,fileList){
@@ -780,17 +789,14 @@ export default {
780 789
                 this.adjudicatename.caseAttachList = res.data.caseAttachList;
781 790
                  this.adjudicatename.caseAttachList.forEach(item=>{
782 791
                   if(item.annexType==3){
783
-                    this.awardArr.push({
784
-                    annexName: item.annexName,
785
-                    annexPath: item.annexPath,
786
-                  });
792
+                    this.awardArr.push(item);
787 793
                   }
788 794
                  })
789 795
                 
790 796
               });
791 797
     },
792 798
     beforeAvatarUploads(){
793
-      this.filedatas.id = this.formData.id;
799
+      this.filedatas.caseId = this.formData.id;
794 800
     }
795 801
   },
796 802
 };

+ 2
- 2
vue.config.js 查看文件

@@ -12,8 +12,8 @@ const name = process.env.VUE_APP_TITLE || '智慧仲裁管理系统' // 网页
12 12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
13 13
 
14 14
 // const API = 'http://121.40.189.20:9001'  //生产
15
-//  const API = 'http://121.40.189.20:8001'  //测试
16
-const API = 'http://172.16.1.26:8001'  //Bs
15
+ const API = 'http://121.40.189.20:8001'  //测试
16
+// const API = 'http://172.16.1.26:8001'  //Bs
17 17
 // const API = 'http://192.168.3.77:9001' //Q
18 18
 // const API = 'http://172.16.1.26:8001' //W
19 19