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

src/api/caseManagement/caseManagement.js

@@ -1,11 +1,20 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 确定仲裁方式
-export function arbitrateMethod(data,id) {
+export function arbitrateMethod(data, id) {
   return request({
-    url: '/arbitrate/method',
-    method: 'put',
+    url: "/arbitrate/method",
+    method: "put",
     params: data,
-    data:id
-  })
-}
+    data: id,
+  });
+}
+// 书面审理
+export function writtenHear(data, id) {
+  return request({
+    url: "/arbitrate/writtenHear",
+    method: "post",
+    params: data,
+    data: id,
+  });
+}

src/views/caseManagement/caseList.vue

@@ -115,7 +115,7 @@
         prop="hearDate"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="案件状态" align="center" prop="caseStatus" />
+      <el-table-column label="案件状态" align="center" prop="caseStatusName" />
       <el-table-column
         label="操作"
         align="center"
@@ -284,7 +284,9 @@
     <!-- 书面审理 -->
     <adjudicaterecordDialog
       :showadjudicaterecord="showadjudicaterecord"
+      :form="form"
       @canceladjudicaterecord="canceladjudicaterecord"
+      @getcaseApply="getcaseApply"
     ></adjudicaterecordDialog>
     <!-- 开庭审理 -->
     <trialincourtDialog
@@ -372,9 +374,9 @@ export default {
       this.loading = true;
       caseApply(this.queryParams).then((response) => {
         this.dataList = response.rows;
-        this.dataList.forEach((item) => {
-          item.caseStatus = item.caseStatus == 0 ? "立案申请" : "待缴费";
-        });
+        // this.dataList.forEach((item) => {
+        //   item.caseStatus = item.caseStatus == 0 ? "立案申请" : "待缴费";
+        // });
         this.total = response.total;
         this.loading = false;
       });
@@ -519,8 +521,10 @@ export default {
     },
     // 书面审理
     adjudicaterecordRow(row) {
-      console.log(row, "书面审理");
+      // console.log(row, "书面审理");
       this.showadjudicaterecord = true;
+      this.form = row;
+      // this.getInfo(row)
     },
     canceladjudicaterecord() {
       this.showadjudicaterecord = false;

src/views/caseManagement/components/adjudicaterecordDialog.vue

@@ -79,14 +79,14 @@
             <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="案件顾问：" prop="claimPrinciOwed">
             <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="12">
-          <el-form-item label="案件状态：" prop="claimPrinciOwed">
-            <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
+          <el-form-item label="案件状态：" prop="caseStatus">
+            <el-input v-model="formData.caseStatus" placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -94,11 +94,7 @@
             <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="案件资料：" prop="claimPrinciOwed">
-            <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
-          </el-form-item>
-        </el-col>
+
         <el-col :span="12">
           <el-form-item label="开庭日期：" prop="loanEndDate">
             <el-date-picker
@@ -109,26 +105,51 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="案件资料：" prop="claimPrinciOwed">
+            <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
       </el-form>
-      <el-form ref="textform" :model="form2" label-width="150px">
+      <el-form ref="form2" :model="form2" label-width="150px">
         <el-col :span="24">
-          <el-form-item label="案情描述：">
+          <el-form-item
+            label="案情描述："
+            prop="accidentDescription"
+            :rules="[
+              {
+                required: true,
+                message: '请进行案情描述',
+                trigger: 'blur',
+              },
+            ]"
+          >
             <el-input
               type="textarea"
               autosize
               placeholder="请进行案情描述"
-              v-model="textarea1"
+              v-model="form2.accidentDescription"
             >
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="仲裁结果：">
+          <el-form-item
+            label="仲裁结果："
+            prop="arbitrationResult"
+            :rules="[
+              {
+                required: true,
+                message: '请输入仲裁结果',
+                trigger: 'blur',
+              },
+            ]"
+          >
             <el-input
               type="textarea"
               autosize
               placeholder="请输入仲裁结果"
-              v-model="textarea2"
+              v-model="form2.arbitrationResult"
             >
             </el-input>
           </el-form-item>
@@ -143,19 +164,46 @@
 </template>
 
 <script>
+import { writtenHear } from "@/api/caseManagement/caseManagement.js";
+
 export default {
-  props: ["showadjudicaterecord"],
+  props: ["showadjudicaterecord", "form"],
   data() {
     return {
-      // key: value
       formData: {},
-      form2:{},
-      textarea1:'',
-      textarea2:'',
+      form2: {},
     };
   },
+  watch: {
+    showadjudicaterecord: {
+      handler(val) {
+        if (val) {
+          this.formData = this.form;
+          this.form2 = {};
+        }
+      },
+    },
+  },
   methods: {
-    submitForm() {},
+    submitForm() {
+      this.$refs["form2"].validate((valid) => {
+        if (valid) {
+          writtenHear(
+            {
+              accidentDescription: this.form2.accidentDescription,
+              arbitrationResult: this.form2.arbitrationResult,
+            },
+            { id: this.formData.id }
+          )
+            .then((res) => {
+              this.$modal.msgSuccess("提交成功");
+              this.cancel();
+              this.$emit("getcaseApply");
+            })
+            .catch((err) => {});
+        }
+      });
+    },
     cancel() {
       this.$emit("canceladjudicaterecord");
     },