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

src/api/awardManagement/awardManagement.js

@@ -122,4 +122,12 @@ export function regenerationDocument(data) {
         method: 'post',
         data: data
     })
-}
+}
+// 根据案件id
+export function emailByCaseId(data) {
+    return request({
+        url: '/adjudication/emailByCaseId',
+        method: 'get',
+        params: data
+    })
+}

src/views/awardManagement/components/MailawardDialog.vue

@@ -93,20 +93,17 @@
 <script>
 import { adjudicationDelivery, adjudicationService } from "@/api/awardManagement/awardManagement";
 export default {
-  props: ["openMailawardDialog", "mailawardata"],
+  props: ["openMailawardDialog", "mailawardata", "emailobj"],
   data() {
     return {
-      formData: {},
+      formData: this.emailobj,
     };
   },
   watch: {
-    openMailawardDialog: {
+    emailobj: {
       handler(val) {
         if (val) {
-          this.formData = {
-            appEmail: "3118891075@qq.com",//申请人邮箱
-            resEmail: "1129801211@qq.com",//被申请人邮箱
-          };
+          this.formData = this.emailobj
         }
       },
     },
@@ -117,6 +114,9 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           // adjudicationDelivery({
+            delete this.formData.id
+            delete this.formData.apptrackingNum
+            delete this.formData.restrackingNum
           adjudicationService({
             id: this.mailawardata.id,
             ...this.formData,

src/views/awardManagement/listofAwards.vue

@@ -94,7 +94,7 @@
             @cancelpaymentdetails="cancelpaymentdetails" @updataList="updataList"></paymentdetailsDialog>
         <!-- 送达裁决书页面 -->
         <mailawardDialog :openMailawardDialog="openMailawardDialog" @closeMailaward="closeMailaward"
-            @updataList="updataList" :mailawardata="mailawardata"></mailawardDialog>
+            @updataList="updataList" :mailawardata="mailawardata" :emailobj="emailobj"></mailawardDialog>
         <!-- 快递信息页面 -->
         <expressDeliveryDialog :showDelivery="showDelivery" :deliveryDataArr="deliveryDataArr"
             @closeDeliveryModel="closeDeliveryModel" :flagLoading="flagLoading"></expressDeliveryDialog>
@@ -114,7 +114,8 @@ import {
     adjudicationStamp,
     selectSignUrl,
     selectSealUrl,
-    selectSignSealUrl
+    selectSignSealUrl,
+    emailByCaseId
 } from "@/api/awardManagement/awardManagement";
 import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
 import mailawardDialog from './components/MailawardDialog.vue';
@@ -138,7 +139,7 @@ export default {
             total: 0,
             // 表格数据
             list: [],
-
+            emailobj: {},//邮箱存储
             // 弹出层标题
             title: "",
             payTitle: "",
@@ -329,12 +330,19 @@ export default {
         // 送达裁决书弹框
         showMailaward(row) {
             this.mailawardata = row;
+            this.emailByCaseIdFn(row.id)
             this.openMailawardDialog = true
         },
         // 关闭送达裁决书弹框
         closeMailaward(row) {
             this.openMailawardDialog = false
         },
+        // 根据案件id查询邮件
+        emailByCaseIdFn(val) {
+            emailByCaseId({id: val}).then((res) => {
+                this.emailobj = res.data
+            })
+        },
         /** 查询详情 */
         getDetail(parms) {
             caseApplicationDetail(parms).then((res) => {

src/views/caseManagement/caseList.vue

@@ -49,13 +49,13 @@
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="batchApplication"
           v-hasPermi="['caseManagement:list:import']">案件批量导入</el-button>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(0)"
-          v-hasPermi="['caseManagement:list:submit']">案件批量提交</el-button>
+          v-hasPermi="['caseManagement:list:Batchsubmit']">案件批量提交</el-button>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(1)"
           v-hasPermi="['caseManagement:list:delete']">案件批量删除</el-button>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(2)"
           v-hasPermi="['caseManagement:list:check']">案件批量立案审查</el-button>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="operateClick(4)"
-          v-hasPermi="['caseManagement:list:hear']">批量生成裁决书</el-button>
+          v-hasPermi="['caseManagement:list:Batchgeneration']">批量生成裁决书</el-button>
       </el-col>
     </el-row>
     <el-table v-loading="loading" :data="dataList" style="width: 100%">

src/views/caseManagement/components/caseentryDialog.vue

@@ -190,6 +190,27 @@
                 <el-input v-model="item.contactTelphone" placeholder="请输入" />
               </el-form-item>
             </el-col>
+            <!-- 新增申请人邮箱 -->
+            <el-col :span="12">
+              <el-form-item label="邮箱" :prop="'paymentArr.' + index + '.email'" :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="item.email"
+                placeholder="请输入电子邮件"
+              />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="单位地址：" :prop="'paymentArr.' + index + '.workAddress'" :rules="[
                 {
@@ -394,6 +415,26 @@
                 <el-input v-model="itm.contactTelphone" placeholder="请输入" />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="邮箱" :prop="'paymentArr1.' + index + '.email'" :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="itm.email"
+                  placeholder="请输入电子邮件"
+                />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="单位地址：" :prop="'paymentArr1.' + index + '.workAddress'" :rules="[
                 {
@@ -581,6 +622,7 @@ export default {
             name: "",
             identityNum: "",
             contactTelphone: "",
+            email: "",
             workAddress: "",
             workTelphone: "",
             contactAddress: "",
@@ -598,6 +640,7 @@ export default {
             name: "",
             identityNum: "",
             contactTelphone: "",
+            email: "",
             workAddress: "",
             workTelphone: "",
             contactAddress: "",
@@ -753,6 +796,7 @@ export default {
                 name: "",
                 identityNum: "",
                 contactTelphone: "",
+                email: "",
                 workAddress: "",
                 workTelphone: "",
                 contactAddress: "",
@@ -767,6 +811,7 @@ export default {
                 name: "",
                 identityNum: "",
                 contactTelphone: "",
+                email: "",
                 workAddress: "",
                 workTelphone: "",
                 contactAddress: "",
@@ -868,6 +913,7 @@ export default {
         name: "",
         identityNum: "",
         contactTelphone: "",
+        email: "",
         workAddress: "",
         workTelphone: "",
         contactAddress: "",
@@ -883,6 +929,7 @@ export default {
         name: "",
         identityNum: "",
         contactTelphone: "",
+        email: "",
         workAddress: "",
         workTelphone: "",
         contactAddress: "",