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

src/views/caseManagement/caseList.vue

@@ -141,7 +141,7 @@
             :timeConfirmData="timeConfirmData" @getList="getList" :queryParams="queryParams"></timeConfirm>
         <!-- 待调解     -->
         <mediation @cancelMediation="cancelMediation" :mediationVisable="mediationVisable"
-            :mediationData="mediationData" @getList="getList" :queryParams="queryParams"></mediation>
+            :mediationData="mediationData" @getList="getList" :queryParams="queryParams" :applicant="applicant"></mediation>
         <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
             :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>
         <!-- 归档详情 -->
@@ -275,6 +275,7 @@ export default {
             caseStausArr: [], //案件状态
             isapplicant: true, //判断角色申请人或非申请人
             caseFilingData: {},
+            applicant:""
         };
     },
     created() {
@@ -442,7 +443,6 @@ export default {
             //     })
             //     .catch(() => { });
             msCaseSignUrlApplyPC({ caseId: row.id }).then((res) => {
-                console.log(res, "PPPPPPPPPPPPPPPPPPPP");
                 window.open(res.data.sealUrl);
             });
         },
@@ -459,6 +459,7 @@ export default {
         mediationClick(val) {
             this.mediationVisable = true;
             this.mediationData = val;
+            this.applicant = val.applicationName;
         },
         /** 确认调解书 */
         confirmMediation(val) {

src/views/caseManagement/components/addCase.vue

@@ -64,7 +64,7 @@
           <el-col :span="24" v-if="modelFlag && showEvidence">
             <el-form-item label="证据:">
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 2">
-                <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath,1)">
+                <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath, 1)">
                   {{ item.annexName }}
                 </div>
               </div>
@@ -113,8 +113,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-          <el-button type="primary" icon="el-icon-circle-plus-outline" @click='addApplicant' style="margin-bottom: 40px;">新增申请人信息</el-button>
-            </el-col>
+            <el-button type="primary" icon="el-icon-circle-plus-outline" @click='addApplicant'
+              style="margin-bottom: 40px;">新增申请人信息</el-button>
+          </el-col>
           <div class="applicant" v-for="(item, index) in formData.affiliate.applicant" :key="item.key">
             <el-col :span="24">
               <div style="display: inline-flex">
@@ -162,8 +163,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="formData.organizeFlag == 1">
-              <el-form-item label-width="140px" label="统一社会信用代码" :prop="'affiliate.applicant.' + index + '.applicant.code'"
-                :rules="[
+              <el-form-item label-width="140px" label="统一社会信用代码"
+                :prop="'affiliate.applicant.' + index + '.applicant.code'" :rules="[
       {
         required: true,
         message: '统一社会信用代码不能为空',
@@ -326,7 +327,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">
               <el-form-item label="是否为操作人" :prop="'affiliate.applicant.' + index + '.applicant.operatorFlag'">
                 <el-select v-model="item.applicantAgent.operatorFlag" placeholder="请选择" auto-complete="off"
                   style="width: 100%;">
@@ -366,12 +367,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-button type="primary" icon="el-icon-delete" style='margin-bottom: 40px;' @click='deleteApplicant(item)'>删除</el-button>
+              <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-button type="primary" icon="el-icon-circle-plus-outline" @click='addRes' style="margin-bottom: 40px;">新增被申请人信息</el-button>
-            </el-col>
+            <el-button type="primary" icon="el-icon-circle-plus-outline" @click='addRes'
+              style="margin-bottom: 40px;">新增被申请人信息</el-button>
+          </el-col>
           <div class="res" v-for="(item, index) in formData.affiliate.res" :key="index">
             <el-col :span="24">
               <div style="display: inline-flex">
@@ -380,7 +383,7 @@
               </div>
               <el-divider></el-divider>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" v-if="formData.organizeFlag == 0">
               <el-form-item label="被申请人姓名" :prop="'affiliate.res.' + index + '.res.name'" :rules="[
       {
         required: true,
@@ -391,6 +394,17 @@
                 <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="[
+      {
+        required: true,
+        message: '被申请机构名称不能为空',
+        trigger: 'blur',
+      },
+    ]">
+                <el-input v-model="item.res.name" placeholder="请输入被申请机构名称" />
+              </el-form-item>
+            </el-col>
             <el-col :span="12" v-if="formData.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%;">
@@ -400,7 +414,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" v-if="formData.organizeFlag == 0">
               <el-form-item label-width="140px" label="被申请人联系电话" :prop="'affiliate.res.' + index + '.res.phone'" :rules="[
       {
         required: true,
@@ -417,17 +431,17 @@
               </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">
+            <el-col :span="12" v-if="formData.organizeFlag == 0">
               <el-form-item label="被申请人邮箱" :prop="'affiliate.res.' + index + '.res.email'" :rules="[
       {
         required: true,
@@ -444,8 +458,9 @@
                 <el-input v-model="item.res.email" placeholder="请输入被申请人邮箱" />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label-width="140px" label="被申请人身份证号" :prop="'affiliate.res.' + index + '.res.idCard'" :rules="[
+            <el-col :span="12" v-if="formData.organizeFlag == 0">
+              <el-form-item label-width="140px" label="被申请人身份证号" :prop="'affiliate.res.' + index + '.res.idCard'"
+                :rules="[
       {
         required: true,
         message: '被申请人身份证号不能为空',
@@ -461,13 +476,35 @@
                 <el-input v-model="item.res.idCard" @blur="handleBlur(index)" placeholder="请输入被申请人身份证号" />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" v-if="formData.organizeFlag == 1">
+              <el-form-item label-width="140px" label="统一社会信用代码" :prop="'affiliate.res.' + index + '.res.code'" :rules="[
+      {
+        required: true,
+        message: '统一社会信用代码不能为空',
+        trigger: 'blur',
+      },
+    ]">
+                <el-input v-model="item.res.code" placeholder="请输入统一社会信用代码" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="formData.organizeFlag == 1">
+              <el-form-item label="法定代表人" :prop="'affiliate.res.' + index + '.res.compLegalPerson'" :rules="[
+      {
+        required: true,
+        message: '法定代表人不能为空',
+        trigger: 'blur',
+      },
+    ]">
+                <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-date-picker disabled v-model="item.res.birth" type="date" placeholder="被申请人出生年月日">
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" v-if="formData.organizeFlag == 0">
               <el-form-item label="被申请人性别：" :prop="'affiliate.res.' + index + '.res.sex'" :rules="[
       {
         required: true,
@@ -519,7 +556,7 @@
                 <el-input v-model="item.resAgent.name" placeholder="请输入代理人姓名" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="formData.organizeFlag == 0">
+            <el-col :span="12">
               <el-form-item label="是否为操作人" :prop="'affiliate.res.' + index + '.resAgent.operatorFlag'">
                 <el-select v-model="item.resAgent.operatorFlag" placeholder="请选择" auto-complete="off"
                   style="width: 100%;">
@@ -569,7 +606,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-button type="primary" icon="el-icon-delete" style='margin-bottom: 40px;' @click='deleteRes(item)'>删除</el-button>
+              <el-button type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
+                @click='deleteRes(item)'>删除</el-button>
             </el-col>
           </div>
 
@@ -595,6 +633,15 @@
             {{ item.annexName }}
           </div>
         </el-card>
+        <el-card class="box-card" v-if="videoList.length">
+          <div slot="header" class="clearfix">
+            <span>视频资料</span>
+          </div>
+          <div v-for="(item, index) in videoList" :key="index" class="text item" style="color: blue; cursor: pointer">
+            <video style="background-color: #181717;width: 350px;height: 200px;margin: 10px;" :key="index"
+              :src="fileURL + item.annexPath" controls="controls"></video>
+          </div>
+        </el-card>
       </div>
       <div slot="footer" class="dialog-footer" v-if="buttonFlag">
         <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
@@ -631,7 +678,7 @@ export default {
       title: "新增案件",
       // organizeFlag:0,//选择机构和自然人
       formData: {
-        caseSource:"YC",
+        caseSource: "YC",
         arbitratClaims: "",
         facts: "",
         organizeFlag: 0,
@@ -653,7 +700,7 @@ export default {
                 nationality: 1,
                 birth: "",
                 sex: "1",
-                operatorFlag:1
+                operatorFlag: 1
               },
               applicantAgent: {
                 roleType: 2,
@@ -669,7 +716,7 @@ export default {
                 nationality: 1,
                 birth: "",
                 sex: "1",
-                operatorFlag:1
+                operatorFlag: 1
               },
             },
           ],
@@ -689,7 +736,7 @@ export default {
                 nationality: 1,
                 birth: "",
                 sex: "0",
-                operatorFlag:1
+                operatorFlag: 1
               },
               resAgent: {
                 roleType: 4,
@@ -705,7 +752,7 @@ export default {
                 nationality: 1,
                 birth: "",
                 sex: "",
-                operatorFlag:1
+                operatorFlag: 1
               }
             }
           ]
@@ -726,6 +773,7 @@ export default {
       },
       applicantEvidence: [], //申请人证据
       respondentEvidence: [], //被申请人证据
+      videoList: [],
       buttonFlag: true,
       getUserInfoList: {},
       applicationFlag: null,
@@ -786,83 +834,83 @@ export default {
       if (val) {
         if (this.addModifyData == 1) {
           this.formData = {
-            caseSource:"YC",
+            caseSource: "YC",
             organizeFlag: 0,
             affiliate:
-        {
-          applicant: [
             {
-              applicant: {
-                roleType: 1,
-                name: "",
-                idCard: "",
-                code: "",
-                phone: "",
-                compLegalPerson: "",
-                email: "",
-                home: "",
-                address: "",
-                idType: 0,
-                nationality: 1,
-                birth: "",
-                sex: "1",
-                operatorFlag:1
-              },
-              applicantAgent: {
-                roleType: 2,
-                name: "",
-                idCard: "",
-                code: "",
-                phone: "",
-                compLegalPerson: "",
-                email: "",
-                home: "",
-                address: "",
-                idType: 0,
-                nationality: 1,
-                birth: "",
-                sex: "1",
-                operatorFlag:1
-              }
+              applicant: [
+                {
+                  applicant: {
+                    roleType: 1,
+                    name: "",
+                    idCard: "",
+                    code: "",
+                    phone: "",
+                    compLegalPerson: "",
+                    email: "",
+                    home: "",
+                    address: "",
+                    idType: 0,
+                    nationality: 1,
+                    birth: "",
+                    sex: "1",
+                    operatorFlag: 1
+                  },
+                  applicantAgent: {
+                    roleType: 2,
+                    name: "",
+                    idCard: "",
+                    code: "",
+                    phone: "",
+                    compLegalPerson: "",
+                    email: "",
+                    home: "",
+                    address: "",
+                    idType: 0,
+                    nationality: 1,
+                    birth: "",
+                    sex: "1",
+                    operatorFlag: 1
+                  }
+                },
+              ],
+              res: [
+                {
+                  res: {
+                    roleType: 3,
+                    name: "",
+                    idCard: "",
+                    code: "",
+                    phone: "",
+                    compLegalPerson: "",
+                    email: "",
+                    home: "",
+                    address: "",
+                    idType: 0,
+                    nationality: 1,
+                    birth: "",
+                    sex: "0",
+                    operatorFlag: 1
+                  },
+                  resAgent: {
+                    roleType: 4,
+                    name: "",
+                    idCard: "",
+                    code: "",
+                    phone: "",
+                    compLegalPerson: "",
+                    email: "",
+                    home: "",
+                    address: "",
+                    idType: 0,
+                    nationality: 1,
+                    birth: "",
+                    sex: "",
+                    operatorFlag: 1
+                  }
+                }
+              ]
             },
-          ],
-          res: [
-            {
-              res: {
-                roleType: 3,
-                name: "",
-                idCard: "",
-                code: "",
-                phone: "",
-                compLegalPerson: "",
-                email: "",
-                home: "",
-                address: "",
-                idType: 0,
-                nationality: 1,
-                birth: "",
-                sex: "0",
-                operatorFlag:1
-              },
-              resAgent: {
-                roleType: 4,
-                name: "",
-                idCard: "",
-                code: "",
-                phone: "",
-                compLegalPerson: "",
-                email: "",
-                home: "",
-                address: "",
-                idType: 0,
-                nationality: 1,
-                birth: "",
-                sex: "",
-                operatorFlag:1
-              }
-            }
-          ]
-        },
             columnValueList: [],
             caseAttachList: [],
           };
@@ -917,6 +965,7 @@ export default {
     async caseApplicationSelectByIdFn(data) {
       this.applicantEvidence = [];
       this.respondentEvidence = [];
+      this.videoList = [];
       await caseApplicationSelectById({ id: data }).then((res) => {
         let data = res.data;
         data.affiliate.applicant.forEach(item => {
@@ -940,8 +989,8 @@ export default {
           if (item.annexType == 2) {
             this.applicantEvidence.push(item);
             this.showEvidence = true
-          } else if (item.annexType == 6) {
-            // this.respondentEvidence.push(item);
+          } else if (item.annexType == 5) {
+            this.videoList.push(item);
           } else if (item.annexType == 7) {
             this.showmediate = true
           } else if (item.annexType == 3) {
@@ -1141,90 +1190,90 @@ export default {
     /**新增申请人信息 */
     addApplicant() {
       this.formData.affiliate.applicant.push({
-              applicant: {
-                roleType: 1,
-                name: "",
-                idCard: "",
-                code: "",
-                phone: "",
-                compLegalPerson: "",
-                email: "",
-                home: "",
-                address: "",
-                idType: 0,
-                nationality: 1,
-                birth: "",
-                sex: "1",
-                operatorFlag:1
-              },
-              applicantAgent: {
-                roleType: 2,
-                name: "",
-                idCard: "",
-                code: "",
-                phone: "",
-                compLegalPerson: "",
-                email: "",
-                home: "",
-                address: "",
-                idType: 0,
-                nationality: 1,
-                birth: "",
-                sex: "1",
-                operatorFlag:1
-              },
-            },);
+        applicant: {
+          roleType: 1,
+          name: "",
+          idCard: "",
+          code: "",
+          phone: "",
+          compLegalPerson: "",
+          email: "",
+          home: "",
+          address: "",
+          idType: 0,
+          nationality: 1,
+          birth: "",
+          sex: "1",
+          operatorFlag: 1
+        },
+        applicantAgent: {
+          roleType: 2,
+          name: "",
+          idCard: "",
+          code: "",
+          phone: "",
+          compLegalPerson: "",
+          email: "",
+          home: "",
+          address: "",
+          idType: 0,
+          nationality: 1,
+          birth: "",
+          sex: "1",
+          operatorFlag: 1
+        },
+      },);
     },
     /** 新增被申请人信息*/
-    addRes(){
+    addRes() {
       this.formData.affiliate.res.push({
-              res: {
-                roleType: 3,
-                name: "",
-                idCard: "",
-                code: "",
-                phone: "",
-                compLegalPerson: "",
-                email: "",
-                home: "",
-                address: "",
-                idType: 0,
-                nationality: 1,
-                birth: "",
-                sex: "1",
-                operatorFlag:1
-              },
-              resAgent: {
-                roleType: 4,
-                name: "",
-                idCard: "",
-                code: "",
-                phone: "",
-                compLegalPerson: "",
-                email: "",
-                home: "",
-                address: "",
-                idType: 0,
-                nationality: 1,
-                birth: "",
-                sex: "1",
-                operatorFlag:1
-              },
-            },);
+        res: {
+          roleType: 3,
+          name: "",
+          idCard: "",
+          code: "",
+          phone: "",
+          compLegalPerson: "",
+          email: "",
+          home: "",
+          address: "",
+          idType: 0,
+          nationality: 1,
+          birth: "",
+          sex: "1",
+          operatorFlag: 1
+        },
+        resAgent: {
+          roleType: 4,
+          name: "",
+          idCard: "",
+          code: "",
+          phone: "",
+          compLegalPerson: "",
+          email: "",
+          home: "",
+          address: "",
+          idType: 0,
+          nationality: 1,
+          birth: "",
+          sex: "1",
+          operatorFlag: 1
+        },
+      },);
     },
     /**申请人删除信息 */
-    deleteApplicant(item){
+    deleteApplicant(item) {
       var index = this.formData.affiliate.applicant.indexOf(item)
-        if (index !== -1) {
-          this.formData.affiliate.applicant.splice(index, 1)
-        }
+      if (index !== -1) {
+        this.formData.affiliate.applicant.splice(index, 1)
+      }
     },
     /**被申请人删除信息 */
-    deleteRes(item){
+    deleteRes(item) {
       var index = this.formData.affiliate.res.indexOf(item)
-        if (index !== -1) {
-          this.formData.affiliate.res.splice(index, 1)
-        }
+      if (index !== -1) {
+        this.formData.affiliate.res.splice(index, 1)
+      }
     },
   },
 };

src/views/caseManagement/components/mediation.vue

@@ -11,8 +11,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="申请人：" prop="affiliate.applicationName">
-              <el-input v-model="formData.affiliate.applicationName" :disabled="true" />
+            <el-form-item label="申请人：">
+              <el-input v-model="applicant" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -25,11 +25,11 @@
               <el-input v-model="formData.caseSubjectAmount" placeholder="请输入案件标的" :disabled="true" />
             </el-form-item> -->
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="调解费用：" prop="feePayable">
               <el-input v-model="formData.feePayable" placeholder="请输入仲裁费用" :disabled="true" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="调解员：" prop="mediatorName">
               <el-input v-model="formData.mediatorName" placeholder="请输入" :disabled="true" />
@@ -98,12 +98,12 @@
         <!-- v-if="!mediationType" -->
         <el-col :span="24">
           <el-form-item label="上传调解书">
-            <el-upload class="upload-demo" accept=".png,.jpg,.doc,.docx,.txt,.pdf" ref="upload" :action="UploadUrl()"
+            <el-upload class="upload-demo" accept=".doc,.docx" ref="upload" :action="UploadUrl()"
               :headers="headers" :data="filedata" :on-preview="handlePreview" :on-remove="handleRemove" :limit="1"
               :on-change="beforeUpload" :on-success="handlSuccess" :file-list="fileList">
               <el-button slot="trigger" size="small" :disabled="!isSecretaryRole" type="primary">选取文件</el-button>
               <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button> -->
-              <div slot="tip" class="el-upload__tip">只能上传.jpg，png，.doc，docx，.txt，.pdf文件</div>
+              <div slot="tip" class="el-upload__tip">只能上传.doc，docx文件</div>
             </el-upload>
           </el-form-item>
         </el-col>
@@ -139,7 +139,7 @@ import { getUserProfile } from "@/api/system/user";
 import { reserveConferenceList } from "@/api/metting/metting.js";
 import { getToken } from "@/utils/auth";
 export default {
-  props: ["mediationVisable", "mediationData", "queryParams"],
+  props: ["mediationVisable", "mediationData", "queryParams","applicant"],
   data() {
     return {
       loanStartDate: "",

src/views/deliveryRecord/smsRecord.vue

@@ -21,7 +21,7 @@
             <el-table-column label="手机号" align="center" prop="phone" :show-overflow-tooltip="true" />
             <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="sendContent" />
         </el-table>
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
             @pagination="getList({caseNum:queryParams.caseNum},{pageNum:queryParams.pageNum,pageSize:queryParams.pageSize})" />