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

src/api/caseManagement/caseManagement.js

@@ -245,4 +245,4 @@ export function getIdType() {
     url: '/system/dict/data/type/id_type',
     method: 'get',
   })
-}
+}

src/api/deliveryRecord/deliveryRecord.js

@@ -25,4 +25,36 @@ export function updateSendContent(data) {
         method: 'post',
         data: data,
     })
+}
+// 分页查询短信
+export function recordList(data) {
+    return request({
+        url: '/shortMessage/recordList',
+        method: 'get',
+        params: data
+    })
+}
+// 重新发送短信
+export function reSendShortMessage(data) {
+    return request({
+        url: 'shortMessage/reSendShortMessage',
+        method: 'post',
+        data: data,
+    })
+}
+// 重新发送邮件
+export function reSendMailRecord(data) {
+    return request({
+        url: 'sendMailRecord/reSendMailRecord',
+        method: 'post',
+        data: data,
+    })
+}
+// 更新邮件发送记录
+export function update(data) {
+    return request({
+        url: 'sendMailRecord/update',
+        method: 'post',
+        data: data,
+    })
 }

src/api/login.js

@@ -65,6 +65,14 @@ export function sendCode(data) {
 		params:data
 	})
 }
+// 获取邮箱验证码
+export function sendEmailCode(data) {
+	return request({
+		url: '/weChatUser/sendEmailCode',
+		method: 'get',
+		params:data
+	})
+}
 // 注册方法
 export function wxregister(data) {
 	return request({

src/main.js

@@ -4,7 +4,7 @@ import Cookies from 'js-cookie'
 
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
-
+import './assets/icons' // icon
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
 import App from './App'

src/utils/permission.js

@@ -47,4 +47,23 @@ export function checkRole(value) {
     console.error(`need roles! Like checkRole="['admin','editor']"`)
     return false
   }
+}
+
+/**
+ * 状态权限校验
+ * @param {Number} value 校验值
+ * @returns {Boolean}
+ */
+export function statusRole(value) {
+  let caseStatusStr = sessionStorage.getItem('caseStatus');
+  let caseStatus = [];
+  caseStatus = JSON.parse(caseStatusStr);
+  if (caseStatus.length == 0) {
+    return false
+  }
+  if (caseStatus.includes(value)) {
+    return true
+  } else {
+    return false
+  }
 }

src/views/caseManagement/components/addCase.vue

@@ -104,15 +104,15 @@
             </div>
             <el-divider></el-divider>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <el-form-item label="选择机构或自然人" prop="organizeFlag">
               <el-radio-group v-model="formData.organizeFlag" :disabled="modelFlag" @change="clearValidate">
                 <el-radio :label="0">自然人</el-radio>
                 <el-radio :label="1">机构</el-radio>
               </el-radio-group>
             </el-form-item>
-          </el-col>
-          <el-col :span="24">
+          </el-col> -->
+          <el-col :span="24"  v-if="buttonFlag">
             <el-button type="primary" icon="el-icon-circle-plus-outline" @click='addApplicant'
               style="margin-bottom: 40px;">新增申请人信息</el-button>
           </el-col>
@@ -124,8 +124,16 @@
               </div>
               <el-divider></el-divider>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
-              <el-form-item label="申请机构名称" :prop="'affiliate.applicant.' + index + '.applicant.name'" :rules="[
+            <el-col :span="24">
+              <el-form-item label="选择机构或自然人">
+                <el-radio-group v-model="item.applicant.organizeFlag" :disabled="modelFlag" @change="clearValidate">
+                  <el-radio :label="0">自然人</el-radio>
+                  <el-radio :label="1">机构</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
+              <el-form-item label="机构名称" :prop="'affiliate.applicant.' + index + '.applicant.name'" :rules="[
       {
         required: true,
         message: '申请机构名称不能为空',
@@ -135,7 +143,7 @@
                 <el-input v-model="item.applicant.name" placeholder="请输入申请机构名称" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
               <el-form-item label="申请人" :prop="'affiliate.applicant.' + index + '.applicant.name'" :rules="[
       {
         required: true,
@@ -146,7 +154,7 @@
                 <el-input v-model="item.applicant.name" placeholder="请输入申请人姓名" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
               <el-form-item label="是否为操作人" :prop="'affiliate.applicant.' + index + '.applicant.operatorFlag'" :rules="[
       {
         required: true,
@@ -162,7 +170,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
               <el-form-item label-width="140px" label="统一社会信用代码"
                 :prop="'affiliate.applicant.' + index + '.applicant.code'" :rules="[
       {
@@ -190,7 +198,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
               <el-form-item :prop="'affiliate.applicant.' + index + '.applicant.idType'" label="证件类型" :rules="[
       {
         required: true,
@@ -206,7 +214,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
               <el-form-item label="证件号码" :prop="'affiliate.applicant.' + index + '.applicant.idCard'" :rules="[
       {
         required: true,
@@ -214,11 +222,32 @@
         trigger: 'blur',
       },
     ]">
-                <el-input v-model="item.applicant.idCard" placeholder="请输入申请人的证件号码" />
+                <el-input v-model="item.applicant.idCard" @blur="handleBlurApplicant(index)"
+                  placeholder="请输入申请人的证件号码" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
+              <el-form-item label-width="140px" label="出生年月："
+                :prop="'affiliate.applicant.' + index + '.applicant.birth'">
+                <el-date-picker disabled v-model="item.applicant.birth" type="date" placeholder="申请人出生年月日">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
+              <el-form-item label="性别：" :prop="'affiliate.applicant.' + index + '.applicant.sex'" :rules="[
+      {
+        required: true,
+        message: '请选择性别',
+      },
+    ]">
+                <el-radio-group v-model="item.applicant.sex" disabled>
+                  <el-radio :label="'0'">男</el-radio>
+                  <el-radio :label="'1'">女</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label="申请人邮箱" :prop="'affiliate.applicant.' + index + '.applicant.email'" :rules="[
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
+              <el-form-item label="邮箱" :prop="'affiliate.applicant.' + index + '.applicant.email'" :rules="[
       {
         required: true,
         message: '申请人邮箱不能为空',
@@ -234,8 +263,8 @@
                 <el-input v-model="item.applicant.email" placeholder="请输入申请人邮箱" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label="申请人电话" :prop="'affiliate.applicant.' + index + '.applicant.phone'" :rules="formData.affiliate.nationality == 0 ? [
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
+              <el-form-item label="电话" :prop="'affiliate.applicant.' + index + '.applicant.phone'" :rules="formData.affiliate.nationality == 0 ? [
       {
         required: true,
         message: '申请人联系电话不能为空',
@@ -250,7 +279,7 @@
                 <el-input v-model="item.applicant.phone" placeholder="请输入申请人联系电话" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
               <el-form-item label="法定代表人" :prop="'affiliate.applicant.' + index + '.applicant.compLegalPerson'" :rules="[
       {
         required: true,
@@ -262,7 +291,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="申请人住所" :prop="'affiliate.applicant.' + index + '.applicant.home'" :rules="[
+              <el-form-item label="住所" :prop="'affiliate.applicant.' + index + '.applicant.home'" :rules="[
       {
         required: true,
         message: '申请人住所不能为空',
@@ -273,7 +302,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="申请人联系地址" :prop="'affiliate.applicant.' + index + '.applicant.address'" :rules="[
+              <el-form-item label="联系地址" :prop="'affiliate.applicant.' + index + '.applicant.address'" :rules="[
       {
         required: true,
         message: '申请人联系地址不能为空',
@@ -290,8 +319,8 @@
               </div>
               <el-divider></el-divider>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
-              <el-form-item label="代理人联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'" :rules="[
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
+              <el-form-item label="联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'" :rules="[
       {
         required: true,
         message: '代理人联系电话不能为空',
@@ -306,13 +335,13 @@
                 <el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label="代理人联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'">
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
+              <el-form-item label="联系电话" :prop="'affiliate.applicant.' + index + '.applicantAgent.phone'">
                 <el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
-              <el-form-item label="代理人姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'" :rules="[
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
+              <el-form-item label="姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'" :rules="[
       {
         required: true,
         message: '代理人姓名不能为空',
@@ -322,8 +351,8 @@
                 <el-input v-model="item.applicantAgent.name" placeholder="请输入代理人姓名" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label="代理人姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'">
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
+              <el-form-item label="姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'">
                 <el-input v-model="item.applicantAgent.name" placeholder="请输入代理人姓名" />
               </el-form-item>
             </el-col>
@@ -337,8 +366,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
-              <el-form-item label="代理人邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
+              <el-form-item label="邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
       {
         required: true,
         message: '代理人邮箱不能为空',
@@ -354,8 +383,8 @@
                 <el-input v-model="item.applicantAgent.email" placeholder="请输入代理人邮箱" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label="代理人邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
+            <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
+              <el-form-item label="邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
       {
         pattern:
           /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
@@ -366,12 +395,12 @@
                 <el-input v-model="item.applicantAgent.email" placeholder="请输入代理人邮箱" />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12"  v-if="buttonFlag">
               <el-button type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
                 @click='deleteApplicant(item)'>删除</el-button>
             </el-col>
           </div>
-          <el-col :span="24">
+          <el-col :span="24"  v-if="buttonFlag">
             <el-button type="primary" icon="el-icon-circle-plus-outline" @click='addRes'
               style="margin-bottom: 40px;">新增被申请人信息</el-button>
           </el-col>
@@ -383,8 +412,16 @@
               </div>
               <el-divider></el-divider>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label="被申请人姓名" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
+            <el-col :span="24">
+              <el-form-item label="选择机构或自然人">
+                <el-radio-group v-model="item.res.organizeFlag" :disabled="modelFlag" @change="clearValidateRes">
+                  <el-radio :label="0">自然人</el-radio>
+                  <el-radio :label="1">机构</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
+              <el-form-item label="被申请人" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
       {
         required: true,
         message: '被申请人姓名不能为空',
@@ -394,18 +431,18 @@
                 <el-input v-model="item.res.name" placeholder="请输入被申请人姓名" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
-              <el-form-item label="被申请机构名称" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
+            <el-col :span="12" v-if="item.res.organizeFlag == 1">
+              <el-form-item label="机构名称" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
       {
         required: true,
-        message: '被申请机构名称不能为空',
+        message: '机构名称不能为空',
         trigger: 'blur',
       },
     ]">
-                <el-input v-model="item.res.name" placeholder="请输入被申请机构名称" />
+                <el-input v-model="item.res.name" placeholder="请输入机构名称" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
               <el-form-item label="是否为操作人" :prop="'affiliate.res.' + index + '.res.operatorFlag'">
                 <el-select v-model="item.res.operatorFlag" placeholder="请选择" auto-complete="off" style="width: 100%;">
                   <el-option v-for="item in roleTypeList" :key="item.id" :label="item.value" :value="item.id">
@@ -414,8 +451,39 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label-width="140px" label="被申请人联系电话" :prop="'affiliate.res.' + index + '.res.phone'" :rules="[
+            <el-col :span="12">
+              <el-form-item :prop="'affiliate.res.' + index + '.res.nationality'" label="国籍" :rules="[
+      {
+        required: true,
+        message: '国籍不能为空',
+        trigger: 'blur',
+      },
+    ]">
+                <el-select v-model="item.res.nationality" placeholder="请选择国籍" auto-complete="off" style="width: 100%;">
+                  <el-option v-for="item in nationalityList" :key="item.id" :label="item.value" :value="item.id">
+
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
+              <el-form-item :prop="'affiliate.res.' + index + '.res.idType'" label="证件类型" :rules="[
+      {
+        required: true,
+        message: '证件类型不能为空',
+        trigger: 'blur',
+      },
+    ]">
+                <el-select v-model="item.res.idType" placeholder="证件类型" auto-complete="off" style="width: 100%;">
+                  <el-option v-for="item in idTypeList" :key="Number(item.dictValue)" :label="item.dictLabel"
+                    :value="Number(item.dictValue)">
+
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
+              <el-form-item label-width="140px" label="联系电话" :prop="'affiliate.res.' + index + '.res.phone'" :rules="[
       {
         required: true,
         message: '被申请人联系电话不能为空',
@@ -431,18 +499,29 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label-width="150px" label="被申请人住所" :prop="'affiliate.res.' + index + '.res.home'" :rules="[
+              <el-form-item label-width="150px" label="住所" :prop="'affiliate.res.' + index + '.res.home'" :rules="[
       {
         required: true,
-        message: '被申请人住所不能为空',
+        message: '住所不能为空',
         trigger: 'blur',
       },
     ]">
-                <el-input v-model="item.res.home" placeholder="请输入被申请人住所" />
+                <el-input v-model="item.res.home" placeholder="请输入住所" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label="被申请人邮箱" :prop="'affiliate.res.' + index + '.res.email'" :rules="[
+            <el-col :span="12">
+              <el-form-item label="联系地址" :prop="'affiliate.res.' + index + '.res.address'" :rules="[
+      {
+        required: true,
+        message: '联系地址不能为空',
+        trigger: 'blur',
+      },
+    ]">
+                <el-input v-model="item.res.address" placeholder="请输入联系地址" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
+              <el-form-item label="邮箱" :prop="'affiliate.res.' + index + '.res.email'" :rules="[
       {
         required: true,
         message: '被申请人邮箱不能为空',
@@ -458,8 +537,8 @@
                 <el-input v-model="item.res.email" placeholder="请输入被申请人邮箱" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label-width="140px" label="被申请人身份证号" :prop="'affiliate.res.' + index + '.res.idCard'"
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
+              <el-form-item label-width="140px" label="身份证号" :prop="'affiliate.res.' + index + '.res.idCard'"
                 :rules="[
       {
         required: true,
@@ -476,7 +555,7 @@
                 <el-input v-model="item.res.idCard" @blur="handleBlur(index)" placeholder="请输入被申请人身份证号" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
+            <el-col :span="12" v-if="item.res.organizeFlag == 1">
               <el-form-item label-width="140px" label="统一社会信用代码" :prop="'affiliate.res.' + index + '.res.code'" :rules="[
       {
         required: true,
@@ -487,7 +566,7 @@
                 <el-input v-model="item.res.code" placeholder="请输入统一社会信用代码" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
+            <el-col :span="12" v-if="item.res.organizeFlag == 1">
               <el-form-item label="法定代表人" :prop="'affiliate.res.' + index + '.res.compLegalPerson'" :rules="[
       {
         required: true,
@@ -498,14 +577,14 @@
                 <el-input v-model="item.res.compLegalPerson" placeholder="请输入法定代表人" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label-width="140px" label="被申请人出生年月：" :prop="'affiliate.res.' + index + '.res.birth'">
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
+              <el-form-item label-width="140px" label="出生年月：" :prop="'affiliate.res.' + index + '.res.birth'">
                 <el-date-picker disabled v-model="item.res.birth" type="date" placeholder="被申请人出生年月日">
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label="被申请人性别：" :prop="'affiliate.res.' + index + '.res.sex'" :rules="[
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
+              <el-form-item label="性别：" :prop="'affiliate.res.' + index + '.res.sex'" :rules="[
       {
         required: true,
         message: '请选择性别',
@@ -524,8 +603,8 @@
               </div>
               <el-divider></el-divider>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
-              <el-form-item label="代理人联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'" :rules="[
+            <el-col :span="12" v-if="item.res.organizeFlag == 1">
+              <el-form-item label="联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'" :rules="[
       {
         required: true,
         message: '代理人联系电话不能为空',
@@ -540,13 +619,13 @@
                 <el-input v-model="item.resAgent.phone" placeholder="请输入代理人联系电话" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label="代理人联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'">
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
+              <el-form-item label="联系电话" :prop="'affiliate.res.' + index + '.resAgent.phone'">
                 <el-input v-model="item.resAgent.phone" placeholder="请输入代理人联系电话" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
-              <el-form-item label="代理人姓名" :prop="'affiliate.res.' + index + '.resAgent.name'" :rules="[
+            <el-col :span="12" v-if="item.res.organizeFlag == 1">
+              <el-form-item label="姓名" :prop="'affiliate.res.' + index + '.resAgent.name'" :rules="[
       {
         required: true,
         message: '代理人姓名不能为空',
@@ -566,13 +645,13 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label="代理人姓名" :prop="'affiliate.res.' + index + '.resAgent.name'">
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
+              <el-form-item label="姓名" :prop="'affiliate.res.' + index + '.resAgent.name'">
                 <el-input v-model="item.resAgent.name" placeholder="请输入代理人姓名" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
-              <el-form-item label="代理人邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
+            <el-col :span="12" v-if="item.res.organizeFlag == 1">
+              <el-form-item label="邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
       {
         required: true,
         message: '代理人邮箱不能为空',
@@ -588,8 +667,8 @@
                 <el-input v-model="item.resAgent.email" placeholder="请输入代理人邮箱" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
-              <el-form-item label="代理人邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
+            <el-col :span="12" v-if="item.res.organizeFlag == 0">
+              <el-form-item label="邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
       {
         pattern:
           /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
@@ -605,7 +684,7 @@
                 <el-input type="textarea" v-model="item.value"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12"  v-if="buttonFlag">
               <el-button type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
                 @click='deleteRes(item)'>删除</el-button>
             </el-col>
@@ -700,7 +779,8 @@ export default {
                 nationality: 1,
                 birth: "",
                 sex: "1",
-                operatorFlag: 1
+                operatorFlag: 1,
+                organizeFlag: 0,
               },
               applicantAgent: {
                 roleType: 2,
@@ -716,7 +796,8 @@ export default {
                 nationality: 1,
                 birth: "",
                 sex: "1",
-                operatorFlag: 1
+                operatorFlag: 1,
+                organizeFlag: 0,
               },
             },
           ],
@@ -736,7 +817,8 @@ export default {
                 nationality: 1,
                 birth: "",
                 sex: "0",
-                operatorFlag: 1
+                operatorFlag: 1,
+                organizeFlag: 0,
               },
               resAgent: {
                 roleType: 4,
@@ -752,7 +834,8 @@ export default {
                 nationality: 1,
                 birth: "",
                 sex: "",
-                operatorFlag: 1
+                operatorFlag: 1,
+                organizeFlag: 0,
               }
             }
           ]
@@ -854,7 +937,8 @@ export default {
                     nationality: 1,
                     birth: "",
                     sex: "1",
-                    operatorFlag: 1
+                    operatorFlag: 1,
+                    organizeFlag: 0,
                   },
                   applicantAgent: {
                     roleType: 2,
@@ -870,7 +954,8 @@ export default {
                     nationality: 1,
                     birth: "",
                     sex: "1",
-                    operatorFlag: 1
+                    operatorFlag: 1,
+                    organizeFlag: 0,
                   }
                 },
               ],
@@ -890,7 +975,8 @@ export default {
                     nationality: 1,
                     birth: "",
                     sex: "0",
-                    operatorFlag: 1
+                    operatorFlag: 1,
+                    organizeFlag: 0,
                   },
                   resAgent: {
                     roleType: 4,
@@ -906,7 +992,8 @@ export default {
                     nationality: 1,
                     birth: "",
                     sex: "",
-                    operatorFlag: 1
+                    operatorFlag: 1,
+                    organizeFlag: 0,
                   }
                 }
               ]
@@ -920,6 +1007,8 @@ export default {
           this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber);
           this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType);
           this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality);
+          this.$set(this.formData.affiliate.applicant[0].applicant, "sex", this.getUserInfoList.sex);
+          this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList.birth);
         }
         this.activeName = "first";
         this.showmediate = false;
@@ -953,12 +1042,15 @@ export default {
     getUserInfoFn() {
       getUserInfo().then(res => {
         this.getUserInfoList = res.data;
+        console.log(this.getUserInfoList.sex)
         this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName);
         this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard);
         this.$set(this.formData.affiliate.applicant[0].applicant, "email", this.getUserInfoList.email);
         this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber);
         this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType);
         this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality);
+        this.$set(this.formData.affiliate.applicant[0].applicant, "sex", this.getUserInfoList.sex);
+        this.$set(this.formData.affiliate.applicant[0].applicant, "birth", this.getUserInfoList.birth);
       })
     },
     /** 根据案件id获取对应信息 */
@@ -1072,14 +1164,40 @@ export default {
     },
     successZip(res) {
       this.formZipData = res.data;
-      this.$set(this.formData, 'organizeFlag', 0);
-      this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
-      this.$set(this.formData, 'facts', this.formZipData.facts);
-      this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData.affiliate.applicant[0].applicant.home);
-      this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.formZipData.affiliate.applicant[0].applicant.address);
-      this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone);
-      this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name);
-      this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email);
+      if (this.formData.affiliate.applicant[0].applicant.organizeFlag == 0) {
+        this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
+        this.$set(this.formData, 'facts', this.formZipData.facts);
+        this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData.affiliate.applicant[0].applicant.home);
+        this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.formZipData.affiliate.applicant[0].applicant.address);
+        this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone);
+        this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name);
+        this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email);
+        this.$set(this.formData.affiliate.applicant[0].applicant, 'sex', this.formZipData.affiliate.applicant[0].applicant.sex);
+        this.$set(this.formData.affiliate.applicant[0].applicant, 'birth', this.formZipData.affiliate.applicant[0].applicant.birth);
+      } else if (this.formData.affiliate.applicant[0].applicant.organizeFlag == 1) {
+        this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
+        this.$set(this.formData, 'facts', this.formZipData.facts);
+        this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData
+          .affiliate.applicant[0]
+          .applicant.name);
+        this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData
+          .affiliate.applicant[0].applicant.code);
+        this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData
+          .affiliate.applicant[0]
+          .applicant.home);
+        this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this
+          .formZipData.affiliate.applicant[0]
+          .applicant.address);
+        this.$set(this.formData.affiliate.applicant[0].applicant, 'compLegalPerson', this
+          .formZipData.affiliate.applicant[0]
+          .applicant.compLegalPerson);
+        this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData
+          .affiliate.applicant[0]
+          .applicant.email);
+        this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData
+          .affiliate.applicant[0]
+          .applicant.phone);
+      }
       this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
       this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
       this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
@@ -1109,27 +1227,25 @@ export default {
       });
     },
     clearValidate(val) {
+      console.log(val)
       if (val == 0) {
         this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName);
         this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard);
         this.$set(this.formData.affiliate.applicant[0].applicant, "email", this.getUserInfoList.email);
         this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber);
+        this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType);
+        this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality);
         if (this.formZipData.affiliate) {
-          this.$set(this.formData, 'organizeFlag', 0);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0);
           this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
           this.$set(this.formData, 'facts', this.formZipData.facts);
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate.applicant[0].applicant.name);
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.formZipData.affiliate.applicant[0].applicant.address);
-          this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'phone', this.formZipData.affiliate.applicant[0].applicantAgent.phone);
-          this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'name', this.formZipData.affiliate.applicant[0].applicantAgent.name);
-          this.$set(this.formData.affiliate.applicant[0].applicantAgent, 'email', this.formZipData.affiliate.applicant[0].applicantAgent.email);
-          this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
-          this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
-          this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
-          this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
-          this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
-          this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
-          this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
+          this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName);
+          this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard);
+          this.$set(this.formData.affiliate.applicant[0].applicant, "email", this.getUserInfoList.email);
+          this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber);
+          this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType);
+          this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality);
+
         } else {
           this.formData.affiliate.applicant[0].applicantAgent.name = null;
           this.formData.affiliate.applicant[0].applicantAgent.email = null;
@@ -1140,27 +1256,63 @@ export default {
         this.$set(this.formData.affiliate.applicant[0].applicantAgent, "email", this.getUserInfoList.email);
         this.$set(this.formData.affiliate.applicant[0].applicantAgent, "phone", this.getUserInfoList.phonenumber);
         if (this.formZipData.affiliate) {
-          this.$set(this.formData, 'organizeFlag', 1);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 1);
           this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
           this.$set(this.formData, 'facts', this.formZipData.facts);
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData.affiliate.applicant[0].applicant.name);
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData.affiliate.applicant[0].applicant.code);
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData.affiliate.applicant[0].applicant.email);
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData.affiliate.applicant[0].applicant.phone);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData
+            .affiliate.applicant[0]
+            .applicant.name);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'code', this.formZipData
+            .affiliate.applicant[0].applicant.code);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.formZipData
+            .affiliate.applicant[0]
+            .applicant.home);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this
+            .formZipData.affiliate.applicant[0]
+            .applicant.address);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'compLegalPerson', this
+            .formZipData.affiliate.applicant[0]
+            .applicant.compLegalPerson);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'email', this.formZipData
+            .affiliate.applicant[0]
+            .applicant.email);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', this.formZipData
+            .affiliate.applicant[0]
+            .applicant.phone);
+        } else {
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'name', null);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'idCard', null);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'email', null);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', null);
+        }
+      }
+      this.$refs["ruleForm"].clearValidate()
+    },
+    clearValidateRes(val) {
+      if (val == 0) {
+        if (this.formZipData.affiliate) {
+          this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);
           this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
           this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
           this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
-          this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate.res[0].res.sex);
+          this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
+          this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
+          this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
+          this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
+        }
+      } else if (val == 1) {
+        if (this.formZipData.affiliate) {
+          this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 1);
+          this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
+          this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
+          this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
+          this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
           this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
           this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
           this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
-        } else {
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'name', null);
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'idCard', null);
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'email', null);
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', null);
         }
       }
+      console.log(val)
       this.$refs["ruleForm"].clearValidate()
     },
     cancel() {
@@ -1180,6 +1332,18 @@ export default {
         this.formData.affiliate.res[index].res.birth = res.respondentBirth;
       });
     },
+    // 申请人身份证
+    handleBlurApplicant(index) {
+      console.log(index)
+      let idCards = {
+        idCard: this.formData.affiliate.applicant[index].applicant.idCard,
+      };
+      getInfoByIdCard(idCards).then((res) => {
+        this.formData.affiliate.applicant[index].applicant.sex = res.respondentSex;
+        // console.log(res.respondentBirth);
+        this.formData.affiliate.applicant[index].applicant.birth = res.respondentBirth;
+      });
+    },
     /**删除新增信息某一项 */
     deleteDetali(item) {
       var index = this.formData.affiliate.indexOf(item)
@@ -1204,7 +1368,8 @@ export default {
           nationality: 1,
           birth: "",
           sex: "1",
-          operatorFlag: 1
+          operatorFlag: 1,
+          organizeFlag: 0,
         },
         applicantAgent: {
           roleType: 2,
@@ -1220,7 +1385,8 @@ export default {
           nationality: 1,
           birth: "",
           sex: "1",
-          operatorFlag: 1
+          operatorFlag: 1,
+          organizeFlag: 0,
         },
       },);
     },
@@ -1241,7 +1407,8 @@ export default {
           nationality: 1,
           birth: "",
           sex: "1",
-          operatorFlag: 1
+          operatorFlag: 1,
+          organizeFlag: 0,
         },
         resAgent: {
           roleType: 4,
@@ -1257,7 +1424,8 @@ export default {
           nationality: 1,
           birth: "",
           sex: "1",
-          operatorFlag: 1
+          operatorFlag: 1,
+          organizeFlag: 0,
         },
       },);
     },

src/views/caseManagement/components/mediation.vue

@@ -57,7 +57,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="是否用印申请" v-if="formData.mediaResult == 1">
-             <el-radio-group v-model="sealFlag">
+             <el-radio-group v-model="formData.sealFlag" :disabled="!selectRoido">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
             </el-radio-group>
@@ -156,7 +156,8 @@ export default {
       // isReconci:0,
       formData: {
         affiliate: {},
-        mediaResult:1
+        mediaResult:1,
+        sealFlag:1,
       },
       user: "",
       userId: null,
@@ -177,7 +178,8 @@ export default {
   },
   watch: {
     mediationVisable(val) {
-      this.formData.mediaResult = 1
+      this.formData.mediaResult = 1;
+      this.formData.sealFlag = 1;
       this.recordArr = [];
       this.recordArrMediate = [];
       if (this.mediationData.mediationMethod == "1") {
@@ -238,8 +240,12 @@ export default {
           this.formData = res.data;
           this.formData.mediaResult = 1;
         }
-       
-        console.log(this.formData)
+        if(res.data.sealFlag==1||res.data.sealFlag==0){
+           this.formData = res.data;
+        }else{
+          this.formData = res.data;
+          this.formData.sealFlag = 1;
+        }
         this.applicateArr = res.data.caseAttachList;
         res.data.caseAttachList.forEach(item => {
           if (item.annexType == 6) {
@@ -282,6 +288,7 @@ export default {
         caseFlowId: this.mediationData.caseFlowId,
         batchNumber: "",
         mediaResult: this.formData.mediaResult,
+        sealFlag:this.formData.sealFlag
       }).then(res => {
         caseApplicationSelectById({
           id: this.mediationData.id

src/views/deliveryRecord/components/emailEdits.vue

@@ -0,0 +1,57 @@
+<template>
+    <div>
+        <el-dialog title="编辑内容" :visible="emailVidable"  @close="cancel" center
+            :distroy-on-close="true">
+            <div>
+                <el-input type="textarea" :rows="6" placeholder="请输入内容" v-model="sendData">
+                </el-input>
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel" class="endbutton1" round><span>取 消</span></el-button>
+                <el-button @click="submitSend" class="endbutton1" type="primary" round><span>确 认</span></el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    updateSendContent,update
+} from "@/api/deliveryRecord/deliveryRecord.js";
+export default {
+    props: ["emailVidable", "emailRow","queryParams"],
+    data() {
+        return {
+            sendData:''
+        };
+    },
+    watch: {
+        emailVidable(val){
+            if(val){
+                this.sendData = this.emailRow.mailContent;
+            }
+        }
+    },
+    methods: {
+        cancel() {
+            this.$emit("cancelEmail");
+        },
+        submitSend() {
+            console.log(this.emailRow.mailContent)
+            this.updateSendContentFn({
+                id:this.emailRow.id,
+                mailContent:this.sendData
+            })
+        },
+        updateSendContentFn(data){
+            update(data).then(res=>{
+                this.$message.success('更新成功');
+                this.$emit("cancelEmail");
+                this.$emit('getList',this.queryParams);
+            })
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/deliveryRecord/components/resend.vue

@@ -2,10 +2,12 @@
     <div>
         <el-dialog title="修改内容" :visible="resendVidable" v-if="resendVidable" @close="cancel" center
             :distroy-on-close="true">
-            <div>
-                <el-input type="textarea" :rows="6" placeholder="请输入内容" v-model="sendData">
-                </el-input>
-            </div>
+            <div style="margin-bottom: 30px;"><span style="font-weight: bold;">发送内容:</span>{{ sendData }}</div>
+            <el-form label-width="100px">
+                <el-form-item v-for="(item,index) in rowData.templateParams" :label="item.paramName" :key="item.id"> 
+                    <el-input v-model="rowData.templateParams[index].paramValue" @input="changeContent"></el-input>
+                </el-form-item>
+            </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="cancel" class="endbutton1" round><span>取 消</span></el-button>
                 <el-button @click="submitSend" class="endbutton1" type="primary" round><span>确 认</span></el-button>
@@ -22,7 +24,10 @@ export default {
     props: ["resendVidable", "rowData","queryParams"],
     data() {
         return {
-            sendData:''
+            sendData:'',
+            param:"",
+            paramValue:""
+
         };
     },
     watch: {
@@ -37,9 +42,10 @@ export default {
             this.$emit("cancelSend");
         },
         submitSend() {
+            console.log(this.rowData)
             this.updateSendContentFn({
                 id:this.rowData.id,
-                sendContent:this.sendData
+                templateParams:this.rowData.templateParams
             })
         },
         updateSendContentFn(data){
@@ -48,6 +54,13 @@ export default {
                 this.$emit("cancelSend");
                 this.$emit('getList',this.queryParams);
             })
+        },
+        changeContent(){
+            let templateContent = this.rowData.templateContent
+            this.rowData.templateParams.forEach(item => {
+                templateContent = templateContent.replace(item.param,item.paramValue)
+            });
+           this.sendData = templateContent
         }
     },
 };

src/views/deliveryRecord/emailRecord.vue

@@ -27,7 +27,14 @@
             <!-- 缴费人 -->
             <!-- <el-table-column label="案件状态" align="center" prop="caseStatusName" /> -->
             <el-table-column label="内容" align="center" prop="mailContent"></el-table-column>
+            <el-table-column label="操作" align="center">
+                <template  slot-scope="scope">
+                    <el-button size="mini" type="text" @click="emailEditing(scope.row)" icon="el-icon-s-promotion">邮箱编辑</el-button>
+                    <el-button v-if="scope.row.sendStatus == '未发送'" size="mini" type="text" @click="resendCounts(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
+                </template>
+            </el-table-column>
         </el-table>
+        <emailEdits :emailVidable="emailVidable" @cancelEmail="cancelEmail"   @getList="getList" :queryParams="queryParams" :emailRow="emailRow"></emailEdits>
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
             @pagination="getList(queryParams)" />
 
@@ -36,14 +43,14 @@
   
 <script>
 import {
-    emailList,
+    emailList,reSendMailRecord
 } from "@/api/deliveryRecord/deliveryRecord.js";
-
+import emailEdits from "./components/emailEdits.vue";
 import { getDicts } from '@/api/system/dict/data.js'
 export default {
     name: "paymentList",
     dicts: ["case_status"],
-    components: {},
+    components: {emailEdits},
     data() {
         return {
             queryParams: {
@@ -60,6 +67,9 @@ export default {
             // 校验表单
             rules: {},
             dataList: [],
+            emailVidable:false,
+            emailRow:{},
+            sendStatusMessage:false,
         };
     },
     created() {
@@ -89,14 +99,37 @@ export default {
                         item.sendStatus = "未发送"
                     } else if (item.sendStatus == 1) {
                         item.sendStatus = "已发送"
-                    } else {
-                        item.sendStatus = "未发送"
+
                     }
                 })
                 this.total = response.total;
                 this.loading = false;
             });
         },
+        // 邮箱编辑内容
+        emailEditing(data){
+            this.emailVidable = true
+            this.emailRow = data;
+            console.log(data)
+        },
+        // 关闭弹窗
+        cancelEmail(){
+            this.emailVidable = false
+        },
+        // 重新发送
+        resendCounts(row){
+           if(row.sendStatus=='未发送'){
+            row.sendStatus = 0
+           }else if(row.sendStatus=='已发送'){
+            row.sendStatus = 1
+           }
+            reSendMailRecord(row).then(res=>{
+                console.log(res)
+                this.$message.success('发送成功');
+                this.getList(this.queryParams);
+            })
+            
+        }
     },
 };
 </script>

src/views/deliveryRecord/smsRecord.vue

@@ -23,11 +23,13 @@
             <el-table-column label="发送时间" align="center" prop="sendTime" />
             <el-table-column label="发送状态" align="center" prop="sendStatus" />
             <el-table-column label="发送内容" align="center" prop="sendContent" :show-overflow-tooltip="true"/>
+            <el-table-column label="备注" align="center" prop="reason" :show-overflow-tooltip="true"/>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button size="mini" @click="copyContent(scope.row.sendContent)" type="text"
                         icon="el-icon-document-copy">复制内容</el-button>
                     <el-button size="mini" @click="resend(scope.row)" type="text" icon="el-icon-s-promotion">编辑内容</el-button>
+                    <el-button v-if="scope.row.sendStatus == '发送失败'|| scope.row.sendStatus == '发送中'"  size="mini" type="text" @click="resendMessage(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -41,7 +43,7 @@
 
 <script>
 import {
-    smsList,
+    recordList,reSendShortMessage
 } from "@/api/deliveryRecord/deliveryRecord.js";
 import resend from "./components/resend.vue";
 import { getDicts } from '@/api/system/dict/data.js'
@@ -66,7 +68,8 @@ export default {
             rules: {},
             dataList: [],
             rowData:{},
-            resendVidable:false
+            resendVidable:false,
+            sendStatusMessage:false
         };
     },
     created() {
@@ -107,16 +110,14 @@ export default {
         // 查询列表数据
         getList(data, params) {
             this.loading = true;
-            smsList(data, params).then((response) => {
+            recordList(data, params).then((response) => {
                 this.dataList = response.rows;
                 this.dataList.forEach(item => {
-                    if (item.sendStatus == 0) {
-                        item.sendStatus = "发送失败"
-                    } else if (item.sendStatus == 1) {
-                        item.sendStatus = "已送达"
+                    if (item.sendStatus == 1) {
+                        item.sendStatus = "发送成功"
                     } else if (item.sendStatus == 2) {
-                        item.sendStatus = "已读取"
-                    } else {
+                        item.sendStatus = "发送中"
+                    } else if(item.sendStatus == 3){
                         item.sendStatus = "发送失败"
                     }
                 })
@@ -124,6 +125,25 @@ export default {
                 this.loading = false;
             });
         },
+        // 重新发送
+        resendMessage(row){
+            console.log(row.sendStatus)
+            let valuesRow ={
+                id:row.id,
+                templateId:row.templateId,
+                phone:row.phone,
+                templateParams:row.templateParams
+            }
+            this.reSendShortMessageFn(valuesRow)
+            console.log(valuesRow)
+           
+        },
+        reSendShortMessageFn(valuesRow){
+            reSendShortMessage(valuesRow).then(res=>{
+                this.$message.success('发送成功');
+                this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
+            })
+        }
     },
 };
 </script>

src/views/register.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="register">
+      <div class="leftIcon">
+        <div class="Icon"></div>
+        <div>智慧调解系统</div>
+      </div>
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
       <h3 class="title">智慧调解系统注册</h3>
       <el-form-item prop="userName">
@@ -35,8 +39,8 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="identityNo" v-if="registerForm.idType === 0">
-        <el-input v-model="registerForm.identityNo" type="text" auto-complete="off" placeholder="身份证号码">
+      <el-form-item prop="identityNo">
+        <el-input v-model="registerForm.identityNo" type="text" auto-complete="off" placeholder="证件号码">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
@@ -46,9 +50,18 @@
         </el-input>
       </el-form-item>
       <el-form-item prop="email">
-        <el-input v-model="registerForm.email" type="text" auto-complete="off" placeholder="邮箱">
+        <el-input v-model="registerForm.email" type="text" auto-complete="off" placeholder="邮箱" style="width:63%;">
           <svg-icon slot="prefix" icon-class="email" class="el-input__icon input-icon" />
         </el-input>
+        <div class="register-code">
+          <el-button type="primary" :disabled="emailDisabled"  @click="getEmailNumber(registerForm.email)">{{ emailText
+          }}</el-button>
+        </div>
+      </el-form-item>
+      <el-form-item prop="emailVerifyCode">
+        <el-input v-model="registerForm.emailVerifyCode" type="text" auto-complete="off" placeholder="邮箱验证码">
+          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+        </el-input>
       </el-form-item>
       <el-form-item prop="name">
         <el-input v-model="registerForm.name" type="text" auto-complete="off" placeholder="用户名">
@@ -105,7 +118,7 @@
 </template>
 
 <script>
-import { getCodeImg, register, sendCode, wxregister,verifyUserName,getIdType } from "@/api/login";
+import { getCodeImg, register, sendCode, wxregister,verifyUserName,getIdType,sendEmailCode } from "@/api/login";
 import { listRoleNotoken } from "@/api/system/role.js"
 export default {
   name: "Register",
@@ -119,7 +132,9 @@ export default {
     };
     return {
       codeText: "发送验证码",
+      emailText:"发送验证码",
       codeDisabled: false,
+      emailDisabled:false,
       codeUrl: "",
       registerForm: {
         userName: "",
@@ -154,7 +169,7 @@ export default {
         identityNo: [
           {
             required: true,
-            message: '被申请人身份证号不能为空',
+            message: '证件号码不能为空',
             trigger: 'blur',
           },
           // {
@@ -165,7 +180,7 @@ export default {
           // },
         ],
         email: [
-          { required: true, trigger: "blur", message: "请再次输入您的密码" },
+          { required: true, trigger: "blur", message: "请输入您的邮箱" },
           {
             pattern:
               /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
@@ -192,7 +207,10 @@ export default {
           },
         ],
         verifyCode: [
-          { required: true, trigger: "blur", message: "请输入验证码" },
+          { required: true, trigger: "blur", message: "请输入短信验证码" },
+        ],
+        emailVerifyCode:[
+        { required: true, trigger: "blur", message: "请输入邮箱验证码" },
         ],
         idType: [
           { required: true, trigger: "blur", message: "请选择证件类型" },
@@ -295,6 +313,28 @@ export default {
 
       })
     },
+    // 获取邮箱验证码
+    getEmailNumber(emailValue){
+      sendEmailCode({email:emailValue}).then(res=>{
+        if(res.code != 200){
+          this.$modal.msgError(res.msg);
+          return
+        }else{
+          this.$modal.msgSuccess('发送成功');
+          let time = 60;
+          let timer = setInterval(() => {
+            time--;
+            this.emailDisabled = true;
+            this.emailText = time + 's重试'
+            if (time == 0) {
+              clearInterval(timer)
+              this.emailText = '发送验证码'
+              this.emailDisabled = false;
+            }
+          }, 1000)
+        }
+      })
+    }
   }
 };
 </script>
@@ -304,9 +344,25 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  //height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  // height: 100%;
+  // background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/images/login.svg");
   background-size: cover;
+  .leftIcon {
+      position: relative;
+      width: 200px;
+      height: 155px;
+      top:-300px;
+      left: -300px;
+
+      .Icon {
+        width: 100px;
+        height: 105px;
+        background-image: url("../assets/images/logos.png");
+        background-size: cover;
+      }
+    }
+  
 }
 
 .title {

src/views/system/user/index.vue

@@ -189,6 +189,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item  label="证件号码" prop="idCard">
+              <el-input v-model="form.idCard" placeholder="请输入证件号码"  maxlength="18"  />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">

vue.config.js

@@ -12,10 +12,10 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
 // const API = 'http://121.40.189.20:7001'  //生产
-const API = 'http://121.40.189.20:6001'  //测试
+// const API = 'http://121.40.189.20:6001'  //测试
 // const API = 'http://192.168.3.18:6001'  //B
 // const API = 'http://172.16.0.237:6001' //Q
-// const API = 'http://172.16.1.26:6001' //w
+const API = 'http://172.16.1.26:6001' //w
 
 // vue.config.js 配置说明 
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions