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

src/api/pay/pay.js

@@ -42,4 +42,15 @@ export function confirmPay(data) {
       method: 'put',
       data: data
     })
-  }
+  }
+//确认缴费查看案件详情接口（新修改显示案件缴费状态）
+export function selectCaseApplicationConfirm(data) {
+  return request({
+    url: '/caseApplication/selectCaseApplicationConfirm',
+    // headers: {
+    //   isToken: false
+    // },
+    method: 'post',
+    data: data
+  })
+} 

src/views/caseManagement/caseList.vue

@@ -103,7 +103,7 @@
       <el-table-column
         label="仲裁方式"
         align="center"
-        prop="arbitratMethod"
+        prop="arbitratMethodName"
         :show-overflow-tooltip="true"
       />
       <!-- 仲裁员 -->
@@ -178,17 +178,17 @@
             v-hasPermi="['monitor:online:forceLogout']"
             >立案审查</el-button
           >
-          <el-popconfirm title="是否进行缴费" @confirm="payStatus(scope.row)">
-            <el-button
-              size="mini"
-              type="text"
-              slot="reference"
-              icon="el-icon-tickets"
-              v-if="scope.row.caseStatus == 2"
-              v-hasPermi="['monitor:online:forceLogout']"
-              >缴费</el-button
-            >
-          </el-popconfirm>
+          <!-- <el-popconfirm title="是否进行缴费" @confirm="payStatus(scope.row)"> -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-tickets"
+            @click="payStatus(scope.row)"
+            v-if="scope.row.caseStatus == 2"
+            v-hasPermi="['monitor:online:forceLogout']"
+            >缴费</el-button
+          >
+          <!-- </el-popconfirm> -->
 
           <!-- <el-button
             size="mini"
@@ -245,7 +245,6 @@
           >
           <el-button
             size="mini"
-            slot="reference"
             type="text"
             icon="el-icon-document"
             @click="generateawardRow(scope.row)"
@@ -398,7 +397,7 @@ export default {
       // 查询参数
       queryParams: {
         caseNum: undefined,
-        caseStatusList: [0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 16],
+        caseStatusList: [0, 1, 2, 5, 6, 7, 8, 9, 10, 16],
         hearDate: "",
         caseStatus: null,
         pageNum: 1,
@@ -444,10 +443,14 @@ export default {
       this.loading = true;
       caseApply(val).then((response) => {
         this.dataList = response.rows;
-        this.dataList.forEach((item) => {
-          item.arbitratMethod =
-            item.arbitratMethod == 1 ? "视频仲裁" : "书面仲载";
-        });
+        // this.dataList.forEach((item) => {
+        //   if (item.arbitratMethod == 1) {
+        //     item.arbitratMethod = "视频仲裁";
+        //   }
+        //   if (item.arbitratMethod == 2) {
+        //     item.arbitratMethod = "书面仲裁";
+        //   }
+        // });
         this.total = response.total;
         this.loading = false;
       });
@@ -461,13 +464,13 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      (this.queryParams.caseStatusList = [0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 16]),
+      (this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10, 16]),
         this.getcaseApply(this.queryParams);
     },
     // 案件录入
     filingApplication() {
       this.form = {};
-      this.paymentArr = [
+      this.initpaymentArr = [
         {
           identityType: 1,
           name: "",
@@ -481,7 +484,7 @@ export default {
           contactAddressAgent: "",
         },
       ];
-      this.paymentArr1 = [
+      this.initpaymentArr1 = [
         {
           identityType: 2,
           name: "",
@@ -546,10 +549,17 @@ export default {
     paycancelRow(row) {
       this.openPay = false;
     },
+    // 是否进行缴费
     payStatus(val) {
       this.getDetail({ id: val.id });
-      this.openPay = true;
       this.payTitle = "缴费";
+      this.$modal
+        .confirm("是否进行缴费？")
+        .then()
+        .then(() => {
+          this.openPay = true;
+        })
+        .catch(() => {});
     },
     getDetail(parms) {
       caseApplicationDetail(parms).then((res) => {

src/views/caseManagement/components/caseentryDialog.vue

@@ -25,6 +25,7 @@
               <el-input
                 v-model="formData.caseNum"
                 placeholder="请输入案件编号"
+                :disabled="flag == '1'"
               />
             </el-form-item>
           </el-col>
@@ -652,7 +653,7 @@ export default {
           {
             required: true,
             message: "案件编号不能为空",
-            trigger: ["change", "blur"],
+            trigger: "blur",
           },
           { max: 20, message: "长度应小于20个字符", trigger: "blur" },
         ],
@@ -660,9 +661,8 @@ export default {
           {
             required: true,
             message: "案件标的不能为空",
-            trigger: ["change", "blur"],
+            trigger: "blur",
           },
-          // { type: "Number", message: "案件标的必须为数字值" },
         ],
         loanStartDate: [
           {
@@ -751,6 +751,36 @@ export default {
               this.form3.paymentArr1 = this.initpaymentArr1;
             }, 1000);
           }
+          if (this.flag == "2") {
+            this.form2.paymentArr = [
+              {
+                identityType: 1,
+                name: "",
+                identityNum: "",
+                contactTelphone: "",
+                workAddress: "",
+                workTelphone: "",
+                contactAddress: "",
+                nameAgent: "",
+                contactTelphoneAgent: "",
+                contactAddressAgent: "",
+              },
+            ];
+            this.form3.paymentArr1 = [
+              {
+                identityType: 2,
+                name: "",
+                identityNum: "",
+                contactTelphone: "",
+                workAddress: "",
+                workTelphone: "",
+                contactAddress: "",
+                nameAgent: "",
+                contactTelphoneAgent: "",
+                contactAddressAgent: "",
+              },
+            ];
+          }
         }
       },
       deep: true,
@@ -835,22 +865,24 @@ export default {
                       ...this.formData,
                       caseAffiliates: this.formData.caseAffiliates,
                     }).then((res) => {
-                      this.$modal.msgSuccess("修改成功");
-                      this.$emit("cancel");
-                      this.getcaseApply(this.queryParams);
+                      if (res.code == 200) {
+                        this.$modal.msgSuccess("修改成功");
+                        this.$emit("cancel");
+                        this.getcaseApply(this.queryParams);
+                      }
                     });
                   } else {
                     addCaseApply({
                       ...this.formData,
                       caseAffiliates: this.formData.caseAffiliates,
                     }).then((response) => {
-                      this.$modal.msgSuccess("新增成功");
-                      this.$emit("cancel");
-                      this.getcaseApply(this.queryParams);
+                      if (response.code == 200) {
+                        this.$modal.msgSuccess("新增成功");
+                        this.$emit("cancel");
+                        this.getcaseApply(this.queryParams);
+                      }
                     });
                   }
-                  // this.$emit("cancel");
-                  // this.getcaseApply();
                 }
               });
             }

src/views/caseManagement/components/filingreviewDialog.vue

@@ -47,7 +47,7 @@ export default {
       };
       submitCaseApplicationCheck(paramsdata)
         .then((res) => {
-          this.$modal.msgSuccess("审查成功");
+          this.$modal.msgSuccess("提交成功");
           this.cancel();
           this.$emit("getcaseApply", this.queryParams);
         })

src/views/caseManagement/components/formateCourtDialog.vue

@@ -145,8 +145,6 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-dialog {
-  width: 422px;
-  height: 245px;
   background: #ffffff;
   border-radius: 20px;
 }

src/views/caseManagement/components/payDialog.vue

@@ -10,27 +10,27 @@
       center
     >
       <el-descriptions title="订单信息">
-        <el-descriptions-item label="案件编号：">{{
+        <el-descriptions-item label="案件编号">{{
           form.caseNum
         }}</el-descriptions-item>
-        <el-descriptions-item label="申请人：">{{
-          form.applicant
+        <el-descriptions-item label="申请人">{{
+          form.applicantName
         }}</el-descriptions-item>
-        <el-descriptions-item label="案件标的：">{{
+        <el-descriptions-item label="案件标的">{{
           form.caseSubjectAmount
         }}</el-descriptions-item>
-        <el-descriptions-item label="案件应缴费用：">{{
+        <el-descriptions-item label="案件应缴费用">{{
           form.feePayable
         }}</el-descriptions-item>
-        <el-descriptions-item label="被申请人：">{{
-          form.respondent
+        <el-descriptions-item label="被申请人">{{
+          form.respondentName
         }}</el-descriptions-item>
-        <el-descriptions-item label="申请人仲裁诉求：">{{
-          form.arbitratClaims
-        }}</el-descriptions-item>
-        <el-descriptions-item label="案件状态：">{{
+        <el-descriptions-item label="案件状态">{{
           form.caseStatusName
         }}</el-descriptions-item>
+        <el-descriptions-item label="申请人仲裁诉求">{{
+          form.arbitratClaims
+        }}</el-descriptions-item>
       </el-descriptions>
       <div class="payType">
         <span>请选择支付方式：</span>

src/views/caseManagement/components/trialincourtDialog.vue

@@ -270,7 +270,7 @@ import { getUserProfile } from "@/api/system/user";
 import { writtenHear } from "@/api/caseManagement/caseManagement.js";
 
 export default {
-  props: ["showtrialincourt", "adjudicatename", "form"],
+  props: ["showtrialincourt", "adjudicatename", "form", "queryParams"],
   data() {
     return {
       formData: {},

src/views/paymentManagement/components/paymentdetailsDialog.vue

@@ -35,6 +35,9 @@
         <el-form-item label="案件状态：" prop="caseStatusName">
           <el-input v-model="form.caseStatusName" placeholder="" />
         </el-form-item>
+        <el-form-item label="支付状态：" prop="paymentStatusName">
+          <el-input v-model="form.paymentStatusName" placeholder="" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
@@ -80,9 +83,11 @@ export default {
           message: "确认成功",
           type: "success",
         });
+        if (res.code == 200) {
+          this.getList();
+        }
       });
       this.cancel();
-      this.getList();
     },
     cancel() {
       this.$emit("cancelpaymentdetails");

src/views/paymentManagement/paymentList.vue

@@ -132,7 +132,7 @@
 <script>
 import {
   caseApplicationList,
-  caseApplicationDetail,
+  selectCaseApplicationConfirm,
   casePay,
 } from "@/api/pay/pay";
 import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
@@ -237,7 +237,7 @@ export default {
     },
     /** 查询详情 */
     getDetail(parms) {
-      caseApplicationDetail(parms).then((res) => {
+      selectCaseApplicationConfirm(parms).then((res) => {
         // console.log(res,'resesrrsrrsrrsrsr');
         // if (res.data.caseStatus == 2) {
         //   res.data.caseStatusName = "待缴费确认";

vue.config.js

@@ -11,8 +11,8 @@ const name = process.env.VUE_APP_TITLE || '智慧仲裁管理系统' // 网页
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
-// const API = 'http://121.40.189.20:9001'  //测试
-const API = 'http://192.168.3.77:8080' //Q
+const API = 'http://121.40.189.20:9001'  //测试
+// const API = 'http://192.168.3.77:8080' //Q
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions