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

src/views/awardManagement/components/paymentdetailsDialog.vue

@@ -33,19 +33,31 @@
           form.claimLiquidDamag
         }}</el-descriptions-item>
         <el-descriptions-item label="申请人案件证据资料">
-          <span @click="toFile(2)">
+          <p
-            <a href="#">{{ applicantFile }}</a>
+            @click="toFile(index, 2)"
-          </span>
+            v-for="(item, index) in applicantFileArr"
+            :key="index"
+          >
+            <a href="#">{{ item }}</a>
+          </p>
         </el-descriptions-item>
         <el-descriptions-item label="被申请人案件证据资料">
-          <span @click="toFile(6)">
+          <p
-            <a href="#">{{ respondentFile }}</a>
+            v-for="(item, index) in respondentFileArr"
-          </span>
+            :key="index"
+            @click="toFile(index, 6)"
+          >
+            <a href="#">{{ item }}</a>
+          </p>
         </el-descriptions-item>
         <el-descriptions-item label="裁决书附件">
-          <span @click="toFile(3)">
+          <p
-            <a href="#">{{ awardFile }}</a>
+            v-for="(item, index) in awardFileArr"
-          </span>
+            :key="index"
+            @click="toFile(index, 3)"
+          >
+            <a href="#">{{ item }}</a>
+          </p>
         </el-descriptions-item>
       </el-descriptions>
       <el-form
@@ -62,6 +74,7 @@
           <el-input
             type="textarea"
             autosize
+            :disabled="flag == 2 || flag == 1"
             placeholder="请输入内容"
             v-model="arbitrateRecord.evidenDetermi"
           />
@@ -73,6 +86,7 @@
           <el-input
             type="textarea"
             autosize
+            :disabled="flag == 2 || flag == 1"
             placeholder="请输入内容"
             v-model="arbitrateRecord.factDetermi"
           />
@@ -81,6 +95,7 @@
           <el-input
             type="textarea"
             autosize
+            :disabled="flag == 2 || flag == 1"
             placeholder="请输入内容"
             v-model="arbitrateRecord.caseSketch"
           />
@@ -89,6 +104,7 @@
           <el-input
             type="textarea"
             autosize
+            :disabled="flag == 2 || flag == 1"
             placeholder="请输入内容"
             v-model="arbitrateRecord.arbitrateThink"
           />
@@ -97,6 +113,7 @@
           <el-input
             type="textarea"
             autosize
+            :disabled="flag == 2 || flag == 1"
             placeholder="请输入内容"
             v-model="arbitrateRecord.rulingFollows"
           />
@@ -105,6 +122,7 @@
           <el-input
             type="textarea"
             autosize
+            :disabled="flag == 2"
             placeholder="请输入内容"
             v-model="arbitrateRecord.verificaOpinion"
           />
@@ -214,24 +232,29 @@ export default {
           },
         ],
       },
-      applicantFile: "", //申请人
+      applicantFileArr: [], //申请人
-      applicantPath: "", //申请人
+      applicantPathArr: [], //申请人
-      respondentFile: "", //被申请人
+      respondentFileArr: [], //被申请人
-      respondentPath: "", //被申请人
+      respondenPathArr: [], //被申请人
-      awardFile: "", //裁决书
+      awardFileArr: [], //裁决书
-      awardPath: "", //裁决书
+      awardPathArr: [], //裁决书
     };
   },
   watch: {
-    openDialog: {
+    detailform: {
       handler(val) {
         if (val) {
-          setTimeout(() => {
+          (this.applicantFileArr = []), //申请人
-            this.form = this.detailform;
+            (this.applicantPathArr = []), //申请人
-            this.arbitrateRecord = this.form.arbitrateRecord;
+            (this.respondentFileArr = []), //被申请人
-            console.log(this.form, "this.form");
+            (this.respondenPathArr = []), //被申请人
-            this.evidenceFile(this.form);
+            (this.awardFileArr = []), //裁决书
-          }, 1000);
+            (this.awardPathArr = []), //裁决书
+            setTimeout(() => {
+              this.form = this.detailform;
+              this.arbitrateRecord = this.form.arbitrateRecord;
+              this.evidenceFile(this.form);
+            }, 1000);
         }
       },
     },
@@ -241,27 +264,28 @@ export default {
     evidenceFile(val) {
       if (val) {
         val.caseAttachList.forEach((item) => {
-          if ((item.annexType = 2)) {
+          if (item.annexType == 2) {
-            this.applicantFile = item.annexName;
+            this.applicantFileArr.push(item.annexName);
-            this.applicantPath = item.annexPath;
+            this.applicantPathArr.push(item.annexPath);
-          } else if ((item.annexType = 6)) {
+          } else if (item.annexType == 6) {
-            this.respondentFile = item.annexName;
+            this.respondentFileArr.push(item.annexName);
-            this.respondenPath = item.annexPath;
+            this.respondenPathArr.push(item.annexPath);
-          } else if ((item.annexType = 3)) {
+          } else if (item.annexType == 3) {
-            this.awardFile = item.annexName;
+            this.awardFileArr.push(item.annexName);
-            this.awardPath = item.annexPath;
+            this.awardPathArr.push(item.annexPath);
           }
         });
       }
     },
-    toFile(val) {
+    // 预览文件
+    toFile(index, val) {
       let headPath = window.location.origin + "/API";
       if (val == 2) {
-        window.open(headPath + this.applicantPath, "_black");
+        window.open(headPath + this.applicantPathArr[index], "_blank");
       } else if (val == 6) {
-        window.open(headPath + this.respondenPath, "_black");
+        window.open(headPath + this.respondenPathArr[index], "_blank");
       } else if (val == 3) {
-        window.open(headPath + this.awardPath, "_black");
+        window.open(headPath + this.awardPathArr[index], "_blank");
       }
     },
     // 校验裁决书

src/views/awardManagement/listofAwards.vue

@@ -182,7 +182,6 @@ export default {
         },
         // 送达裁决书弹框
         showMailaward(row) {
-            // console.log(row,'ppppppppppppppppp');
             this.mailawardata = row;
             this.openMailawardDialog = true
         },

src/views/caseManagement/components/caseentryDialog.vue

@@ -785,12 +785,13 @@ export default {
     };
   },
   watch: {
-    visible: {
+    initpaymentArr: {
       handler(val) {
         if (val) {
+          this.applicateArr = [];
+          this.quiltArr = [];
           this.formData = this.form;
           if (this.flag == "1" || this.flag == "0") {
-            setTimeout(() => {
               this.form2.paymentArr = this.initpaymentArr;
               this.form3.paymentArr1 = this.initpaymentArr1;
               console.log(this.caseAttachList, "caseAttachList");
@@ -803,11 +804,10 @@ export default {
                 }
               });
               this.fileList = this.caseAttachList;
-              this.fileList.forEach((item)=> {
+              this.fileList.forEach((item) => {
-                item["name"]=item.annexName;
+                item["name"] = item.annexName;
                 item["certificatePath"] = item.annexPath;
-              })
+              });
-            }, 1000);
           }
           if (this.flag == "2") {
             this.form2.paymentArr = [
@@ -857,7 +857,7 @@ export default {
       } else {
         this.$message.warning("暂不支持预览");
       }
-},
+    },
 
     // 文件上传成功
     handlSuccess(res, file) {

src/views/caseManagement/components/choosetrialmethodDaiog.vue

@@ -2,26 +2,42 @@
   <div>
     <!-- 选择仲裁方式页面 -->
     <el-dialog
-      title="审核开庭方式"
+      title="审核仲裁方式"
       :visible="showchoosetrialmethod"
       width="500px"
       @close="cancel"
       :destroy-on-close="true"
     >
-      <div class="radiobox">
+      <el-descriptions>
+        <el-descriptions-item label="当前仲裁方式：">
+          <el-tag size="small">{{
+            choosetrialmethodata.arbitratMethodName
+          }}</el-tag>
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <!-- <div class="radiobox">
         <el-radio-group v-model="radio">
           <el-radio :label="0">拒绝开庭方式</el-radio>
           <el-radio :label="1">同意开庭方式</el-radio>
         </el-radio-group>
-      </div>
+      </div> -->
 
-      <div slot="footer" class="dialog-footer">
+      <!-- <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" class="endbutton"
           ><span>提 交</span></el-button
         >
         <el-button @click="cancel" class="endbutton1"
           ><span> 取 消</span></el-button
         >
+      </div> -->
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm(1)" class="endbutton"
+          ><span>同 意</span></el-button
+        >
+        <el-button class="endbutton1" @click="submitForm(0)"
+          ><span>拒 绝</span></el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -33,15 +49,13 @@ export default {
   name: "showchoosetrialmethodDialog",
   props: ["showchoosetrialmethod", "choosetrialmethodata", "queryParams"],
   data() {
-    return {
+    return {};
-      radio: 1,
-    };
   },
   methods: {
     // 审核仲裁方式 arbitrateMethod
-    submitForm() {
+    submitForm(val) {
       let paramsdata = {
-        opinion: this.radio,
+        opinion: val,
       };
       let id = {
         id: this.choosetrialmethodata.id,
@@ -50,7 +64,7 @@ export default {
         .then((res) => {
           this.$modal.msgSuccess("提交成功");
           this.cancel();
-          this.$emit("getcaseApply",this.queryParams);
+          this.$emit("getcaseApply", this.queryParams);
         })
         .catch((err) => {});
     },

src/views/caseManagement/components/trialincourtDialog.vue

@@ -299,8 +299,8 @@ export default {
     },
     // 打开会议
     openmeeting() {
-      window.open('https://txroom.xayunmei.com');
+      // 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}`);
     },
     // 提交仲裁结果
     openArbitrationresults() {