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

src/api/awardManagement/awardManagement.js

@@ -42,4 +42,12 @@ export function checkArbitrateRecord(data) {
         method: 'post',
         data: data
     })
+}
+// 裁决书送达 
+export function adjudicationDelivery(data) {
+    return request({
+        url: '/adjudication/delivery',
+        method: 'post',
+        data: data
+    })
 }

src/views/awardManagement/components/MailawardDialog.vue

@@ -10,33 +10,85 @@
     >
       <el-form ref="form" :model="formData" label-width="150px">
         <el-col :span="24">
-          <el-form-item label="申请人电子邮件：" prop="emailNum">
+          <el-form-item
+            label="申请人电子邮件："
+            prop="appEmail"
+            :rules="[
+              {
+                required: true,
+                message: '邮箱地址不能为空',
+                trigger: 'blur',
+              },
+              {
+                pattern:
+                  /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
+                message: '请输入正确的邮箱地址',
+                trigger: 'blur',
+              },
+            ]"
+          >
             <el-input
-              v-model="formData.emailNum"
+              v-model="formData.appEmail"
               placeholder="请输入电子邮件"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="被申请人电子邮件：" prop="emailNum">
+          <el-form-item
+            label="被申请人电子邮件："
+            prop="resEmail"
+            :rules="[
+              {
+                required: true,
+                message: '邮箱地址不能为空',
+                trigger: 'blur',
+              },
+              {
+                pattern:
+                  /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
+                message: '请输入正确的邮箱地址',
+                trigger: 'blur',
+              },
+            ]"
+          >
             <el-input
-              v-model="formData.emailNum"
+              v-model="formData.resEmail"
               placeholder="请输入电子邮件"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="申请人快递单号：" prop="trackingNum">
+          <el-form-item
+            label="申请人快递单号："
+            prop="apptrackingNum"
+            :rules="[
+              {
+                required: true,
+                message: '快递单号不能为空',
+                trigger: 'blur',
+              },
+            ]"
+          >
             <el-input
-              v-model="formData.trackingNum"
+              v-model="formData.apptrackingNum"
               placeholder="请输入快递单号"
             />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="被申请人快递单号：" prop="trackingNum">
+          <el-form-item
+            label="被申请人快递单号："
+            prop="restrackingNum"
+            :rules="[
+              {
+                required: true,
+                message: '快递单号不能为空',
+                trigger: 'blur',
+              },
+            ]"
+          >
             <el-input
-              v-model="formData.trackingNum"
+              v-model="formData.restrackingNum"
               placeholder="请输入快递单号"
             />
           </el-form-item>
@@ -51,6 +103,7 @@
 </template>
 
 <script>
+import { adjudicationDelivery } from "@/api/awardManagement/awardManagement";
 export default {
   props: ["openMailawardDialog", "mailawardata"],
   data() {
@@ -59,7 +112,24 @@ export default {
     };
   },
   methods: {
-    submitForm() {},
+    submitForm() {
+      // adjudicationDelivery
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          adjudicationDelivery({
+            id: this.mailawardata.id,
+            ...this.formData,
+          })
+            .then((res) => {
+              if (res.code == 200) {
+                this.$emit("updataList");
+                this.cancel();
+              }
+            })
+            .catch((err) => {});
+        }
+      });
+    },
     cancel() {
       this.$emit("closeMailaward");
     },

src/views/awardManagement/listofAwards.vue

@@ -47,7 +47,7 @@
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 14" @click="showModel(scope.row, 4)"
                         v-hasPermi="['monitor:online:forceLogout']">用印申请</el-button>
                         <!-- v-if="scope.row.caseStatus == 15"   送达裁决书 -->
-                    <el-button size="mini" type="text" icon="el-icon-edit"  @click="showMailaward(scope.row)"
+                    <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 15"  @click="showMailaward(scope.row)"
                         v-hasPermi="['monitor:online:forceLogout']">送达裁决书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 16" @click="showModel(scope.row, 6)"
                         v-hasPermi="['monitor:online:forceLogout']">案件归档</el-button>
@@ -77,6 +77,7 @@
         <mailawardDialog 
         :openMailawardDialog="openMailawardDialog" 
         @closeMailaward="closeMailaward"
+        @updataList="updataList"
         :mailawardata="mailawardata"
         ></mailawardDialog>
     </div>