Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev

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,20 @@ 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,
+    })
+}

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,14 +104,14 @@
             </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> -->
           <el-col :span="24">
             <el-button type="primary" icon="el-icon-circle-plus-outline" @click='addApplicant'
               style="margin-bottom: 40px;">新增申请人信息</el-button>
@@ -124,7 +124,15 @@
               </div>
               <el-divider></el-divider>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 1">
+            <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,
@@ -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,
@@ -217,7 +225,7 @@
                 <el-input v-model="item.applicant.idCard" 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.email'" :rules="[
       {
         required: true,
@@ -234,7 +242,7 @@
                 <el-input v-model="item.applicant.email" 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.phone'" :rules="formData.affiliate.nationality == 0 ? [
       {
         required: true,
@@ -250,7 +258,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,
@@ -290,7 +298,7 @@
               </div>
               <el-divider></el-divider>
             </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 + '.applicantAgent.phone'" :rules="[
       {
         required: true,
@@ -306,12 +314,12 @@
                 <el-input v-model="item.applicantAgent.phone" 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 + '.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-col :span="12" v-if="item.applicant.organizeFlag == 1">
               <el-form-item label="代理人姓名" :prop="'affiliate.applicant.' + index + '.applicantAgent.name'" :rules="[
       {
         required: true,
@@ -322,7 +330,7 @@
                 <el-input v-model="item.applicantAgent.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 + '.applicantAgent.name'">
                 <el-input v-model="item.applicantAgent.name" placeholder="请输入代理人姓名" />
               </el-form-item>
@@ -337,7 +345,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="代理人邮箱" :prop="'affiliate.applicant.' + index + '.applicantAgent.email'" :rules="[
       {
         required: true,
@@ -354,7 +362,7 @@
                 <el-input v-model="item.applicantAgent.email" 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 + '.applicantAgent.email'" :rules="[
       {
         pattern:
@@ -383,7 +391,15 @@
               </div>
               <el-divider></el-divider>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
+            <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,
@@ -394,7 +410,7 @@
                 <el-input v-model="item.res.name" 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.name'" :rules="[
       {
         required: true,
@@ -405,7 +421,7 @@
                 <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,7 +430,7 @@
                 </el-select>
               </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-width="140px" label="被申请人联系电话" :prop="'affiliate.res.' + index + '.res.phone'" :rules="[
       {
         required: true,
@@ -441,7 +457,7 @@
                 <el-input v-model="item.res.home" 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.email'" :rules="[
       {
         required: true,
@@ -458,7 +474,7 @@
                 <el-input v-model="item.res.email" 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-width="140px" label="被申请人身份证号" :prop="'affiliate.res.' + index + '.res.idCard'"
                 :rules="[
       {
@@ -476,7 +492,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,
@@ -498,13 +514,13 @@
                 <el-input v-model="item.res.compLegalPerson" 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-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-col :span="12" v-if="item.res.organizeFlag == 0">
               <el-form-item label="被申请人性别：" :prop="'affiliate.res.' + index + '.res.sex'" :rules="[
       {
         required: true,
@@ -524,7 +540,7 @@
               </div>
               <el-divider></el-divider>
             </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 + '.resAgent.phone'" :rules="[
       {
         required: true,
@@ -540,12 +556,12 @@
                 <el-input v-model="item.resAgent.phone" 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 + '.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-col :span="12" v-if="item.res.organizeFlag == 1">
               <el-form-item label="代理人姓名" :prop="'affiliate.res.' + index + '.resAgent.name'" :rules="[
       {
         required: true,
@@ -566,12 +582,12 @@
                 </el-select>
               </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 + '.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-col :span="12" v-if="item.res.organizeFlag == 1">
               <el-form-item label="代理人邮箱" :prop="'affiliate.res.' + index + '.resAgent.email'" :rules="[
       {
         required: true,
@@ -588,7 +604,7 @@
                 <el-input v-model="item.resAgent.email" 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 + '.resAgent.email'" :rules="[
       {
         pattern:
@@ -700,7 +716,8 @@ export default {
                 nationality: 1,
                 birth: "",
                 sex: "1",
-                operatorFlag: 1
+                operatorFlag: 1,
+                organizeFlag:0,
               },
               applicantAgent: {
                 roleType: 2,
@@ -716,7 +733,8 @@ export default {
                 nationality: 1,
                 birth: "",
                 sex: "1",
-                operatorFlag: 1
+                operatorFlag: 1,
+                organizeFlag:0,
               },
             },
           ],
@@ -736,7 +754,8 @@ export default {
                 nationality: 1,
                 birth: "",
                 sex: "0",
-                operatorFlag: 1
+                operatorFlag: 1,
+                organizeFlag:0,
               },
               resAgent: {
                 roleType: 4,
@@ -752,7 +771,8 @@ export default {
                 nationality: 1,
                 birth: "",
                 sex: "",
-                operatorFlag: 1
+                operatorFlag: 1,
+                organizeFlag:0,
               }
             }
           ]
@@ -854,7 +874,8 @@ export default {
                     nationality: 1,
                     birth: "",
                     sex: "1",
-                    operatorFlag: 1
+                    operatorFlag: 1,
+                    organizeFlag:0,
                   },
                   applicantAgent: {
                     roleType: 2,
@@ -870,7 +891,8 @@ export default {
                     nationality: 1,
                     birth: "",
                     sex: "1",
-                    operatorFlag: 1
+                    operatorFlag: 1,
+                    organizeFlag:0,
                   }
                 },
               ],
@@ -890,7 +912,8 @@ export default {
                     nationality: 1,
                     birth: "",
                     sex: "0",
-                    operatorFlag: 1
+                    operatorFlag: 1,
+                    organizeFlag:0,
                   },
                   resAgent: {
                     roleType: 4,
@@ -906,7 +929,8 @@ export default {
                     nationality: 1,
                     birth: "",
                     sex: "",
-                    operatorFlag: 1
+                    operatorFlag: 1,
+                    organizeFlag:0,
                   }
                 }
               ]
@@ -1072,7 +1096,7 @@ export default {
     },
     successZip(res) {
       this.formZipData = res.data;
-      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, 'home', this.formZipData.affiliate.applicant[0].applicant.home);
@@ -1080,6 +1104,7 @@ export default {
       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, '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);
@@ -1109,13 +1134,14 @@ 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);
         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);
@@ -1123,13 +1149,13 @@ export default {
           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.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.formData.affiliate.applicant[0].applicantAgent.name = null;
           this.formData.affiliate.applicant[0].applicantAgent.email = null;
@@ -1140,27 +1166,54 @@ 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.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, '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);
+        }
+      }
+      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() {
@@ -1204,7 +1257,8 @@ export default {
           nationality: 1,
           birth: "",
           sex: "1",
-          operatorFlag: 1
+          operatorFlag: 1,
+          organizeFlag:0,
         },
         applicantAgent: {
           roleType: 2,
@@ -1220,7 +1274,8 @@ export default {
           nationality: 1,
           birth: "",
           sex: "1",
-          operatorFlag: 1
+          operatorFlag: 1,
+          organizeFlag:0,
         },
       },);
     },
@@ -1241,7 +1296,8 @@ export default {
           nationality: 1,
           birth: "",
           sex: "1",
-          operatorFlag: 1
+          operatorFlag: 1,
+          organizeFlag:0,
         },
         resAgent: {
           roleType: 4,
@@ -1257,7 +1313,8 @@ export default {
           nationality: 1,
           birth: "",
           sex: "1",
-          operatorFlag: 1
+          operatorFlag: 1,
+          organizeFlag:0,
         },
       },);
     },

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,
+} 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.rowData.id,
+            //     sendContent:this.sendData
+            // })
+        },
+        updateSendContentFn(data){
+            updateSendContent(data).then(res=>{
+                this.$message.success('更新成功');
+                this.$emit("cancelSend");
+                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="sendStatusMessage" 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)" />
 
@@ -38,12 +45,12 @@
 import {
     emailList,
 } 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() {
@@ -86,17 +96,35 @@ export default {
                 this.dataList = response.rows;
                 this.dataList.forEach(item => {
                     if (item.sendStatus == 0) {
+                        this.sendStatusMessage = true
                         item.sendStatus = "未发送"
                     } else if (item.sendStatus == 1) {
+                        this.sendStatusMessage = false
                         item.sendStatus = "已发送"
+
                     } else {
                         item.sendStatus = "未发送"
+                        this.sendStatusMessage = true
                     }
                 })
                 this.total = response.total;
                 this.loading = false;
             });
         },
+        // 邮箱编辑内容
+        emailEditing(data){
+            this.emailVidable = true
+            this.emailRow = data;
+            console.log(data)
+        },
+        // 关闭弹窗
+        cancelEmail(){
+            this.emailVidable = false
+        },
+        // 重新发送
+        resendCounts(){
+
+        }
     },
 };
 </script>

src/views/deliveryRecord/smsRecord.vue

@@ -28,6 +28,7 @@
                     <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="sendStatusMessage"  size="mini" type="text" @click="resendMessage(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -41,7 +42,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 +67,8 @@ export default {
             rules: {},
             dataList: [],
             rowData:{},
-            resendVidable:false
+            resendVidable:false,
+            sendStatusMessage:false
         };
     },
     created() {
@@ -107,23 +109,46 @@ 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 = "发送失败"
+                        this.sendStatusMessage = true
                     } else if (item.sendStatus == 1) {
                         item.sendStatus = "已送达"
+                        this.sendStatusMessage = false
                     } else if (item.sendStatus == 2) {
                         item.sendStatus = "已读取"
+                        this.sendStatusMessage = false
                     } else {
                         item.sendStatus = "发送失败"
+                        this.sendStatusMessage = true
                     }
                 })
                 this.total = response.total;
                 this.loading = false;
             });
         },
+        // 重新发送
+        resendMessage(row){
+            console.log(row)
+            let valuesRow ={
+                templateId:row.templateId,
+                phone:row.phone,
+                templateParams:row.templateParams
+            }
+            console.log(valuesRow)
+            reSendShortMessage(valuesRow).then(res=>{
+                this.$message.success('发送成功');
+                this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
+                if(res.code==200){
+                    this.sendStatusMessage = false
+                }
+
+
+            })
+        }
     },
 };
 </script>

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