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

src/views/caseManagement/caseList.vue

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

src/views/caseManagement/components/paymentdetailsDialog.vue

@@ -1,12 +1,6 @@
 <template>
   <div>
-    <el-dialog
+    <el-dialog :title="title" :visible="openDialog" @close="cancel" :destroy-on-close="true" center>
-      :title="title"
-      :visible="openDialog"
-      @close="cancel"
-      :destroy-on-close="true"
-      center
-    >
       <el-form ref="form" :model="form" label-width="120px">
         <el-form-item label="案件编号：" prop="caseNum">
           <el-input v-model="form.caseNum" placeholder="" :disabled="true" />
@@ -15,11 +9,7 @@
           <el-input v-model="form.caseSubjectAmount" :disabled="true" />
         </el-form-item>
         <el-form-item label="缴费人：" prop="applicantName">
-          <el-input
+          <el-input v-model="form.applicantName" placeholder="" :disabled="true" />
-            v-model="form.applicantName"
-            placeholder=""
-            :disabled="true"
-          />
         </el-form-item>
         <el-form-item label="缴费金额：" prop="feePayable">
           <el-input v-model="form.feePayable" :disabled="true" />
@@ -37,13 +27,9 @@
           </el-tag>
         </el-form-item> -->
         <el-form-item label="缴费凭证：" prop="caseStatusName">
-          <div
+          <div style="color: #104fad; cursor: pointer" v-for="(item, index) in form.caseAttachList" :key="index"
-            style="color: #104fad; cursor: pointer"
+            @click="preview(item.annexPath)">
-            v-for="(item, index) in form.caseAttachList"
+            <span v-if="item.annexType == 8">{{ item.annexName }}</span>
-            :key="index"
-            @click="preview(item.annexPath)"
-          >
-           <span v-if="item.annexType==8">{{ item.annexName }}</span> 
           </div>
           <!-- <el-tag>{{ form.caseStatusName }}</el-tag> -->
         </el-form-item>
@@ -55,31 +41,15 @@
           </el-radio-group>
         </el-form-item>
         <!-- 缴费驳回原因-->
-        <el-form-item
+        <el-form-item label="拒绝原因：" v-if="agreeOrNotCheck == 0" prop="caseCheckReject" :rules="[
-          label="拒绝原因："
+      { required: true, message: '请输入驳回原因', trigger: 'blur' },
-          v-if="agreeOrNotCheck == 0"
+    ]">
-          prop="caseCheckReject"
+          <el-input type="textarea" :rows="2" placeholder="请输入驳回原因" v-model="form.caseCheckReject"></el-input>
-          :rules="[
-            { required: true, message: '请输入驳回原因', trigger: 'blur' },
-          ]"
-        >
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入驳回原因"
-            v-model="form.caseCheckReject"
-          ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
+        <el-button type="primary" @click="submitForm" v-if="flag == 0" class="endbutton"
-          type="primary"
+          :loading="loadingSubmit">确认已缴费</el-button>
-          @click="submitForm"
-          v-if="flag == 0"
-          class="endbutton"
-          :loading="loadingSubmit"
-          >确认已缴费</el-button
-        >
         <el-button @click="cancel" class="endbutton1">取 消</el-button>
       </div>
     </el-dialog>
@@ -89,7 +59,7 @@
 <script>
 import { confirmPay } from "@/api/pay/pay";
 export default {
-  props: ["openDialog", "title", "flag", "detailform", "queryParams","getcaseApply"],
+  props: ["openDialog", "title", "flag", "detailform", "queryParams", "getcaseApply"],
   data() {
     return {
       // key: value
@@ -123,9 +93,9 @@ export default {
     // 确认缴费
     submitForm() {
       let paramsVal = {
-        ids:[this.form.id],
+        ids: [this.form.id],
-        agreeOrNotCheck:this.agreeOrNotCheck,
+        agreeOrNotCheck: this.agreeOrNotCheck,
-        caseCheckReject:this.form.caseCheckReject
+        caseCheckReject: this.form.caseCheckReject
       }
       this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -136,13 +106,10 @@ export default {
               type: "success",
             });
             this.loadingSubmit = false;
-            if (res.code == 200) {
+            this.$emit("getcaseApply", this.queryParams);
-                this.getcaseApply(this.queryParams)
-            //   this.getList();
-            }
           }).catch((err) => {
-              this.loadingSubmit = false;
+            this.loadingSubmit = false;
-            });
+          });
           this.cancel();
         }
       });