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

src/views/awardManagement/components/MailawardDialog.vue

@@ -0,0 +1,76 @@
+<template>
+  <!-- 送达裁决书页面 -->
+  <div>
+    <el-dialog
+      title="是否确认发送裁决书"
+      :visible="openMailawardDialog"
+      @close="cancel"
+      :destroy-on-close="true"
+      center
+    >
+      <el-form ref="form" :model="formData" label-width="150px">
+        <el-col :span="24">
+          <el-form-item label="申请人电子邮件：" prop="emailNum">
+            <el-input
+              v-model="formData.emailNum"
+              placeholder="请输入电子邮件"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="被申请人电子邮件：" prop="emailNum">
+            <el-input
+              v-model="formData.emailNum"
+              placeholder="请输入电子邮件"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="申请人快递单号：" prop="trackingNum">
+            <el-input
+              v-model="formData.trackingNum"
+              placeholder="请输入快递单号"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="被申请人快递单号：" prop="trackingNum">
+            <el-input
+              v-model="formData.trackingNum"
+              placeholder="请输入快递单号"
+            />
+          </el-form-item>
+        </el-col>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="" @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ["openMailawardDialog", "mailawardata"],
+  data() {
+    return {
+      formData: {},
+    };
+  },
+  methods: {
+    submitForm() {},
+    cancel() {
+      this.$emit("closeMailaward");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-dialog {
+  width: 550px;
+  background: #ffffff;
+  border-radius: 20px;
+}
+</style>

src/views/awardManagement/listofAwards.vue

@@ -46,7 +46,8 @@
                         v-hasPermi="['monitor:online:forceLogout']">签名</el-button>
                     <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>
-                    <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 15" @click="showModel(scope.row, 5)"
+                        <!-- v-if="scope.row.caseStatus == 15"   送达裁决书 -->
+                    <el-button size="mini" type="text" icon="el-icon-edit"  @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>
@@ -72,6 +73,12 @@
         <!-- 弹窗 -->
         <paymentdetailsDialog :openDialog="openDialog" :detailform="detailform" :title="title" :flag="flag"
             @cancelpaymentdetails="cancelpaymentdetails" @updataList="updataList"></paymentdetailsDialog>
+        <!-- 送达裁决书页面 -->
+        <mailawardDialog 
+        :openMailawardDialog="openMailawardDialog" 
+        @closeMailaward="closeMailaward"
+        :mailawardata="mailawardata"
+        ></mailawardDialog>
     </div>
 </template>
   
@@ -81,11 +88,12 @@ import {
     caseApplicationDetail,
 } from "@/api/awardManagement/awardManagement";
 import paymentdetailsDialog from "./components/paymentdetailsDialog.vue";
+import mailawardDialog from './components/MailawardDialog.vue';
 
 export default {
     name: "paymentList",
     dicts: ["case_status"],
-    components: { paymentdetailsDialog },
+    components: { paymentdetailsDialog, mailawardDialog },
     data() {
         return {
             queryParams: {
@@ -113,6 +121,8 @@ export default {
             detailform: {}, //缴费详情数据
             openDialog: false, //缴费详情数据弹框
             flag: null,
+            openMailawardDialog: false,  //送达裁决书页面
+            mailawardata: {},   //裁决书送达界面数据
         };
     },
     created() {
@@ -169,6 +179,16 @@ export default {
         cancelpaymentdetails() {
             this.openDialog = false;
         },
+        // 送达裁决书弹框
+        showMailaward(row) {
+            // console.log(row,'ppppppppppppppppp');
+            this.mailawardata = row;
+            this.openMailawardDialog = true
+        },
+        // 关闭送达裁决书弹框
+        closeMailaward(row) {
+            this.openMailawardDialog = false
+        },
         /** 查询详情 */
         getDetail(parms) {
             caseApplicationDetail(parms).then((res) => {

src/views/caseManagement/components/caseentryDialog.vue

@@ -918,6 +918,11 @@ export default {
                     ...this.form2.paymentArr,
                     ...this.form3.paymentArr1,
                   ];
+                  this.formData.caseAttachList = [
+                    {
+                      annexId: 106,
+                    },
+                  ];
                   if (this.formData.id) {
                     editCaseApply({
                       ...this.formData,