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

src/api/caseManagement/caseManagement.js

@@ -33,3 +33,11 @@ export function submitCaseApplicationCheck(data) {
     data: data,
   });
 }
+// 生成裁决书
+export function document(data) {
+  return request({
+    url: "/adjudication/document",
+    method: "post",
+    data: data,
+  });
+}

src/views/awardManagement/components/paymentdetailsDialog.vue

@@ -1,40 +1,119 @@
 <template>
   <div>
-    <el-dialog :title="title" :visible="openDialog" width="1000px" @close="cancel" :destroy-on-close="true">
-      <el-descriptions title="案件信息" border style="margin-bottom: 30px;">
-        <el-descriptions-item label="案件编号">{{form.caseNum}}</el-descriptions-item>
-        <el-descriptions-item label="案件标的">{{form.caseSubjectAmount}}</el-descriptions-item>
-        <el-descriptions-item label="借款开始日期">{{form.loanStartDate}}</el-descriptions-item>
-        <el-descriptions-item label="借款结束日期">{{form.loanEndDate}}</el-descriptions-item>
-        <el-descriptions-item label="合同编号">{{form.contractNumber}}</el-descriptions-item>
-        <el-descriptions-item label="申请人主张欠本金">{{form.claimPrinciOwed}}</el-descriptions-item>
-        <el-descriptions-item label="申请人主张欠利息">{{form.claimInterestOwed}}</el-descriptions-item>
-        <el-descriptions-item label="申请人主张违约金">{{form.claimLiquidDamag}}</el-descriptions-item>
-        <el-descriptions-item label="申请人案件证据资料">{{form.aaa}}</el-descriptions-item>
-        <el-descriptions-item label="被申请人案件证据资料">{{form.aaa}}</el-descriptions-item>
-        <el-descriptions-item label="裁决书附件">{{form.aaa}}</el-descriptions-item>
+    <el-dialog
+      :title="title"
+      :visible="openDialog"
+      width="1000px"
+      @close="cancel"
+      :destroy-on-close="true"
+    >
+      <el-descriptions title="案件信息" border style="margin-bottom: 30px">
+        <el-descriptions-item label="案件编号">{{
+          form.caseNum
+        }}</el-descriptions-item>
+        <el-descriptions-item label="案件标的">{{
+          form.caseSubjectAmount
+        }}</el-descriptions-item>
+        <el-descriptions-item label="借款开始日期">{{
+          form.loanStartDate
+        }}</el-descriptions-item>
+        <el-descriptions-item label="借款结束日期">{{
+          form.loanEndDate
+        }}</el-descriptions-item>
+        <el-descriptions-item label="合同编号">{{
+          form.contractNumber
+        }}</el-descriptions-item>
+        <el-descriptions-item label="申请人主张欠本金">{{
+          form.claimPrinciOwed
+        }}</el-descriptions-item>
+        <el-descriptions-item label="申请人主张欠利息">{{
+          form.claimInterestOwed
+        }}</el-descriptions-item>
+        <el-descriptions-item label="申请人主张违约金">{{
+          form.claimLiquidDamag
+        }}</el-descriptions-item>
+        <el-descriptions-item label="申请人案件证据资料">{{
+          form.aaa
+        }}</el-descriptions-item>
+        <el-descriptions-item label="被申请人案件证据资料">{{
+          form.aaa
+        }}</el-descriptions-item>
+        <el-descriptions-item label="裁决书附件">{{
+          form.aaa
+        }}</el-descriptions-item>
       </el-descriptions>
-      <el-form ref="form" :model="arbitrateRecord" label-width="300px" label-position="left">
-        <el-form-item label="经庭审质证，对各方提供的证据认定如下" prop="caseNum">
-          <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.evidenDetermi" />
+      <el-form
+        ref="form"
+        :model="arbitrateRecord"
+        label-width="300px"
+        label-position="left"
+        :rules="rules"
+      >
+        <el-form-item
+          label="经庭审质证，对各方提供的证据认定如下"
+          prop="evidenDetermi"
+        >
+          <el-input
+            type="textarea"
+            autosize
+            placeholder="请输入内容"
+            v-model="arbitrateRecord.evidenDetermi"
+          />
         </el-form-item>
-        <el-form-item label="仲裁庭经审理查明(写明仲裁庭认定的事实)" prop="caseSubjectAmount">
-          <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.factDetermi" />
+        <el-form-item
+          label="仲裁庭经审理查明(写明仲裁庭认定的事实)"
+          prop="factDetermi"
+        >
+          <el-input
+            type="textarea"
+            autosize
+            placeholder="请输入内容"
+            v-model="arbitrateRecord.factDetermi"
+          />
         </el-form-item>
-        <el-form-item label="综上所述" prop="caseNum">
-          <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.caseSketch" />
+        <el-form-item label="综上所述" prop="caseSketch">
+          <el-input
+            type="textarea"
+            autosize
+            placeholder="请输入内容"
+            v-model="arbitrateRecord.caseSketch"
+          />
         </el-form-item>
-        <el-form-item label="本庭认为" prop="feePayable">
-          <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.arbitrateThink" />
+        <el-form-item label="本庭认为" prop="arbitrateThink">
+          <el-input
+            type="textarea"
+            autosize
+            placeholder="请输入内容"
+            v-model="arbitrateRecord.arbitrateThink"
+          />
         </el-form-item>
-        <el-form-item label="裁决如下" prop="caseStatusName">
-          <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.rulingFollows" />
+        <el-form-item label="裁决如下" prop="rulingFollows">
+          <el-input
+            type="textarea"
+            autosize
+            placeholder="请输入内容"
+            v-model="arbitrateRecord.rulingFollows"
+          />
         </el-form-item>
-        <el-form-item label="核验裁决书意见：" prop="caseStatusName">
-          <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.verificaOpinion" />
+        <el-form-item label="核验裁决书意见：" prop="verificaOpinion">
+          <el-input
+            type="textarea"
+            autosize
+            placeholder="请输入内容"
+            v-model="arbitrateRecord.verificaOpinion"
+          />
         </el-form-item>
-        <el-form-item label="审核裁决书意见：" prop="caseStatusName" v-if="flag == 2">
-          <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />
+        <el-form-item
+          label="审核裁决书意见："
+          prop="checkOpinion"
+          v-if="flag == 2"
+        >
+          <el-input
+            type="textarea"
+            autosize
+            placeholder="请输入内容"
+            v-model="arbitrateRecord.checkOpinion"
+          />
         </el-form-item>
       </el-form>
       <!-- 画布 -->
@@ -43,12 +122,22 @@
         <vue-esign ref="esign" :width="900" :height="300" bgColor="#ffffff" />
       </div>
       <!-- 清除画布 -->
-      <el-button v-if="flag == 3" type="info" @click="handleReset">清除画布</el-button>
+      <el-button v-if="flag == 3" type="info" @click="handleReset"
+        >清除画布</el-button
+      >
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm(0)" v-if="flag == 1">提 交</el-button>
-        <el-button type="primary" @click="submitForm(1)" v-if="flag == 2">同 意</el-button>
-        <el-button type="danger" @click="submitForm(2)" v-if="flag == 2">驳 回</el-button>
-        <el-button type="primary" @click="submitForm(3)" v-if="flag == 3">提 交</el-button>
+        <el-button type="primary" @click="submitForm(0)" v-if="flag == 1"
+          >提 交</el-button
+        >
+        <el-button type="primary" @click="submitForm(1)" v-if="flag == 2"
+          >同 意</el-button
+        >
+        <el-button type="danger" @click="submitForm(2)" v-if="flag == 2"
+          >驳 回</el-button
+        >
+        <el-button type="primary" @click="submitForm(3)" v-if="flag == 3"
+          >提 交</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -58,7 +147,7 @@
 <script>
 import {
   verificationArbitrateRecord,
-  checkArbitrateRecord
+  checkArbitrateRecord,
 } from "@/api/awardManagement/awardManagement";
 export default {
   props: ["openDialog", "title", "flag", "detailform"],
@@ -66,7 +155,59 @@ export default {
     return {
       // key: value
       form: {},
-      arbitrateRecord:{}
+      arbitrateRecord: {},
+      // 表单校验
+      rules: {
+        evidenDetermi: [
+          {
+            required: true,
+            message: "不能为空",
+            trigger: "blur",
+          },
+        ],
+        factDetermi: [
+          {
+            required: true,
+            message: "不能为空",
+            trigger: "blur",
+          },
+        ],
+        caseSketch: [
+          {
+            required: true,
+            message: "不能为空",
+            trigger: "blur",
+          },
+        ],
+        arbitrateThink: [
+          {
+            required: true,
+            message: "不能为空",
+            trigger: "blur",
+          },
+        ],
+        rulingFollows: [
+          {
+            required: true,
+            message: "不能为空",
+            trigger: "blur",
+          },
+        ],
+        verificaOpinion: [
+          {
+            required: true,
+            message: "意见不能为空",
+            trigger: "blur",
+          },
+        ],
+        // checkOpinion: [
+        //   {
+        //     required: true,
+        //     message: "意见不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
+      },
     };
   },
   watch: {
@@ -85,35 +226,50 @@ export default {
   methods: {
     // 校验裁决书
     verificationArbitrateRecordFn(parms) {
-      verificationArbitrateRecord(parms).then(res=>{
+      verificationArbitrateRecord(parms).then((res) => {
         this.cancel();
         this.$emit("updataList");
-        this.$message('成功');
-      })
+        this.$message("成功");
+      });
     },
     //审核裁决书
     checkArbitrateRecordFn(parms) {
-      checkArbitrateRecord(parms).then(res=>{
+      checkArbitrateRecord(parms).then((res) => {
         this.cancel();
         this.$emit("updataList");
-        this.$message('成功');
-      })
+        this.$message("成功");
+      });
     },
     submitForm(parms) {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
           if (parms == 0) {
-        this.verificationArbitrateRecordFn({id:this.form.id,arbitrateRecord:this.arbitrateRecord})
+            this.verificationArbitrateRecordFn({
+              id: this.form.id,
+              arbitrateRecord: this.arbitrateRecord,
+            });
           } else if (parms == 1) {
-        this.checkArbitrateRecordFn({id:this.form.id,agreeOrNotCheck:1,arbitrateRecord:this.arbitrateRecord})
+            this.checkArbitrateRecordFn({
+              id: this.form.id,
+              agreeOrNotCheck: 1,
+              arbitrateRecord: this.arbitrateRecord,
+            });
           } else if (parms == 2) {
-        this.checkArbitrateRecordFn({id:this.form.id,agreeOrNotCheck:2,arbitrateRecord:this.arbitrateRecord})
+            this.checkArbitrateRecordFn({
+              id: this.form.id,
+              agreeOrNotCheck: 2,
+              arbitrateRecord: this.arbitrateRecord,
+            });
           }
+        }
+      });
     },
     cancel() {
       this.$emit("cancelpaymentdetails");
     },
     // 清除画布
     handleReset() {
-      this.$refs['esign'].reset() //清空画布
+      this.$refs["esign"].reset(); //清空画布
     },
   },
 };

src/views/caseManagement/caseList.vue

@@ -370,6 +370,7 @@ import {
   submitCaseApply,
   selectCaseApply,
 } from "@/api/caseAccess/caseEntry";
+import { document } from "@/api/caseManagement/caseManagement";
 
 export default {
   name: "caseList",
@@ -632,8 +633,15 @@ export default {
       console.log(row, "生成裁决书");
       this.$modal
         .confirm("确定生成裁决书吗？")
-        .then(function () {})
-        .then((res) => {})
+        .then(function () {
+          return document({ id: row.id });
+        })
+        .then((res) => {
+          if (res.code == 200) {
+            this.getcaseApply(this.queryParams);
+            this.$modal.msgSuccess("裁决书生成成功");
+          }
+        })
         .catch(() => {});
     },
     // 归档