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

src/views/caseManagement/caseList.vue

@@ -107,7 +107,7 @@
         </evidenceDialog>
         <!-- 缴费 -->
         <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId" :payForm="payForm"
-            :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"></payDialog>
+            :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow" :formPayDetailAffiliate="formPayDetailAffiliate"></payDialog>
         <!-- 缴费确认查看详情 -->
         <paymentdetailsDialog :openDialog="openDialog" @cancelpaymentdetails="cancelpaymentdetails" :title="payTitle"
             :detailform="detailform" :queryParams="queryParams" :flag="flag" :paymentConfirma="paymentConfirma" @getList="getList">
@@ -213,6 +213,7 @@ export default {
             flagLoading: true, //案件日志弹框loading
             confirmTionVisable:false,//确认调解书弹窗
             addModifyData:null,//新增修改传的参数
+            formPayDetailAffiliate:{},
             mediatorData:{},
             flag: null,
             caseData: {},
@@ -296,7 +297,11 @@ export default {
                 pageNum: 1,
                 pageSize: 100000
             }).then(res => {
-                this.buttonList = res.rows;
+                res.rows.forEach(item => {
+                    if(item.id !=11 && item.id !=17){
+                        this.buttonList.push(item)
+                    }
+                });               
             })
         },
         /** 新增案件 */
@@ -369,6 +374,7 @@ export default {
         getDetail(parms) {
             caseApplicationSelectById(parms).then((res) => {
                 this.formPayDetail = res.data;
+                this.formPayDetailAffiliate = res.data.affiliate;
                 this.payForm.feePayable = res.data.feePayable;
                 this.payForm.caseId = res.data.id;
             });

src/views/caseManagement/components/addCase.vue

@@ -92,8 +92,16 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="24" v-if="modelFlag">
-                        <el-form-item label="证据">
-                            <div v-for="(item, index) in formData.caseAttachList" :key="index">
+                        <el-form-item label="证据:">
+                            <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType==2">
+                                <div style="color: blue;cursor: pointer;" @click="fileDetil(item.annexPath)">{{
+                                    item.annexName }}</div>
+                            </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24" v-if="modelFlag">
+                        <el-form-item label="调解书:">
+                            <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType==7">
                                 <div style="color: blue;cursor: pointer;" @click="fileDetil(item.annexPath)">{{
                                     item.annexName }}</div>
                             </div>
@@ -424,6 +432,7 @@ export default {
             this.respondentEvidence = [];
             caseApplicationSelectById({ id: data }).then((res => {
                 this.formData = res.data;
+                console.log(this.formData)
                 this.formData.caseAttachList.forEach(item => {
                     if (item.annexType == 2) {
                         this.applicantEvidence.push(item)

src/views/caseManagement/components/confirmMediation.vue

@@ -47,6 +47,14 @@
               <el-input v-model="formData.mediatorName" placeholder="请输入" :disabled="true" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="调解书:">
+                   <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType==7">
+                      <div style="color: blue;cursor: pointer;" @click="fileDetil(item.annexPath)">{{
+                      item.annexName }}</div>
+                    </div>
+            </el-form-item>
+          </el-col>
         </el-row>
         <div class="payupload">
           <span>上传修改后调解书</span>
@@ -94,6 +102,7 @@ export default {
       formData: {
         affiliate: {}
       },
+      fileURL: window.location.origin + "/API",
       annexId:null,
       headers: {
         Authorization: "Bearer " + getToken()
@@ -110,6 +119,10 @@ export default {
         this.formData = res.data;
       });
     },
+    /** 查看申请书 */
+    fileDetil(val) {
+            window.open(this.fileURL + val)
+    },
     UploadUrl() {
       return window.location.origin + "/API/common/upload";
     },

src/views/caseManagement/components/payDialog.vue

@@ -7,7 +7,7 @@
           formPayDetail.caseNum
         }}</el-descriptions-item>
         <el-descriptions-item label="申请人">{{
-          formPayDetail.affiliate.applicationOrganName || ''
+          formPayDetailAffiliate.applicationOrganName || ''
         }}</el-descriptions-item>
         <el-descriptions-item label="案件标的">{{
           formPayDetail.caseSubjectAmount
@@ -16,13 +16,13 @@
           formPayDetail.feePayable
         }}</el-descriptions-item>
         <el-descriptions-item label="被申请人">{{
-          formPayDetail.affiliate.respondentName
+          formPayDetailAffiliate.respondentName
         }}</el-descriptions-item>
-        <!-- <el-descriptions-item label="案件状态">
+        <el-descriptions-item label="案件状态">
           <el-tag size="mini" type='danger' effect="dark">
             {{ formPayDetail.caseStatusName }}
           </el-tag>
-        </el-descriptions-item> -->
+        </el-descriptions-item>
       </el-descriptions>
       <div class="paySelectType">
         <el-radio-group v-model="paySelect" @input="changPayType">
@@ -64,7 +64,7 @@ import { casePay, confirmPayDig } from "@/api/pay/pay";
 import QRCode from "qrcodejs2";
 import { getToken } from "@/utils/auth";
 export default {
-  props: ["openPay", "payTitle", "formPayDetail", "payForm", "queryParams","payId"],
+  props: ["openPay", "payTitle", "formPayDetail", "payForm", "queryParams","payId","formPayDetailAffiliate"],
   data() {
     return {
       // key: value