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

src/views/caseManagement/components/caseFilingDetailsPage.vue

         <div v-show="activeName == 'third'">
           <div v-for="item in detailsAwardNum.caseAttachList" v-if="item.annexType == 7" style="margin-top:10px;">
             <!-- <el-link target="_blank" type="primary" :href="fileURL + item.annexPath">{{ item.annexName }}</el-link> -->
-                    <span>签署前调解书:</span>
-                    <div style="color: blue; cursor: pointer" @click="fileDetil(item.onlyOfficeFileId, 2)">
-                      {{ item.annexName }}
-                    </div>
+            <span>签署前调解书:</span>
+            <div style="color: blue; cursor: pointer" @click="fileDetil(item.onlyOfficeFileId, 2)">
+              {{ item.annexName }}
+            </div>
           </div>
-           <div v-for="item in detailsAwardNum.caseAttachList" v-if="item.annexType == 13" style="margin-top:10px;">
-                    <span>签署后调解书:</span>
-                    <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath, 1)">
-                      {{ item.annexName }}
-                    </div>
+          <div v-for="item in detailsAwardNum.caseAttachList" v-if="item.annexType == 13" style="margin-top:10px;">
+            <span>签署后调解书:</span>
+            <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath, 1)">
+              {{ item.annexName }}
+            </div>
           </div>
           <el-empty v-if="isNoData(detailsAwardNum.caseAttachList, 7) == 0" description="暂无数据"></el-empty>
         </div>
                   </div>
                 </el-form-item>
               </el-col>
-               <el-col :span="24">
+              <el-col :span="24">
                 <el-form-item label="签署后调解书:">
                   <div v-for="(item, index) in detailsAwardNum.caseAttachList" :key="index" v-if="item.annexType == 13">
                     <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath, 1)">
                 </div>
                 <el-divider></el-divider>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="选择机构或自然人" prop="organizeFlag">
-                  <el-radio-group v-model="detailsAwardNum.organizeFlag">
-                    <el-radio :label="0">自然人</el-radio>
-                    <el-radio :label="1">机构</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
               <div class="applicant" v-for="(item, index) in detailsAwardNum.affiliate.applicant" :key="item.key">
                 <el-col :span="24">
                   <div style="display: inline-flex">
                   </div>
                   <el-divider></el-divider>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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">
+                      <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: '申请机构名称不能为空',
                     <el-input v-model="item.applicant.name" placeholder="请输入申请机构名称" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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,
                     <el-input v-model="item.applicant.name" placeholder="请输入申请人姓名" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.organizeFlag == 0">
+                <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
                   <el-form-item label="是否为操作人" :prop="'affiliate.applicant.' + index + '.applicant.operatorFlag'"
                     :rules="[
       {
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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="[
       {
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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,
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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,
                     <el-input v-model="item.applicant.idCard" placeholder="请输入申请人的证件号码" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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-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="item.applicant.organizeFlag == 0">
+                  <el-form-item label="邮箱" :prop="'affiliate.applicant.' + index + '.applicant.email'" :rules="[
       {
         required: true,
         message: '申请人邮箱不能为空',
                     <el-input v-model="item.applicant.email" placeholder="请输入申请人邮箱" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.organizeFlag == 0">
+                <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
                   <el-form-item label="申请人电话" :prop="'affiliate.applicant.' + index + '.applicant.phone'" :rules="detailsAwardNum.affiliate.nationality == 0 ? [
       {
         required: true,
                     <el-input v-model="item.applicant.phone" placeholder="请输入申请人联系电话" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.organizeFlag == 1">
+                <el-col :span="12" v-if="item.applicant.organizeFlag == 1">
                   <el-form-item label="法定代表人" :prop="'affiliate.applicant.' + index + '.applicant.compLegalPerson'"
                     :rules="[
       {
                   </div>
                   <el-divider></el-divider>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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: '代理人联系电话不能为空',
                     <el-input v-model="item.applicantAgent.phone" placeholder="请输入代理人联系电话" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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="detailsAwardNum.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: '代理人姓名不能为空',
                     <el-input v-model="item.applicantAgent.name" placeholder="请输入代理人姓名" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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>
-                <el-col :span="12" v-if="detailsAwardNum.organizeFlag == 0">
+                <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
                   <el-form-item label="是否为操作人" :prop="'affiliate.applicant.' + index + '.applicant.operatorFlag'">
                     <el-select v-model="item.applicantAgent.operatorFlag" placeholder="请选择" auto-complete="off"
                       style="width: 100%;">
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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: '代理人邮箱不能为空',
                     <el-input v-model="item.applicantAgent.email" placeholder="请输入代理人邮箱" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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})$/,
                   </div>
                   <el-divider></el-divider>
                 </el-col>
-                <el-col :span="12">
-                  <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">
+                      <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: '被申请人姓名不能为空',
                     <el-input v-model="item.res.name" placeholder="请输入被申请人姓名" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.organizeFlag == 0">
+                <el-col :span="12" v-if="item.res.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="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-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label-width="140px" label="被申请人联系电话" :prop="'affiliate.res.' + index + '.res.phone'"
-                    :rules="[
+                  <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">
+                  <el-form-item label-width="140px" label="联系电话" :prop="'affiliate.res.' + index + '.res.phone'" :rules="[
       {
         required: true,
         message: '被申请人联系电话不能为空',
                   </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: '被申请人申请人住所不能为空',
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="被申请人邮箱" :prop="'affiliate.res.' + index + '.res.email'" :rules="[
+                  <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">
+                  <el-form-item label="邮箱" :prop="'affiliate.res.' + index + '.res.email'" :rules="[
       {
         required: true,
         message: '被申请人邮箱不能为空',
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label-width="140px" label="被申请人身份证号" :prop="'affiliate.res.' + index + '.res.idCard'"
+                  <el-form-item label-width="140px" label="身份证号" :prop="'affiliate.res.' + index + '.res.idCard'"
                     :rules="[
       {
         required: true,
                     <el-input v-model="item.res.idCard" @blur="handleBlur(index)" placeholder="请输入被申请人身份证号" />
                   </el-form-item>
                 </el-col>
+                <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,
+        message: '统一社会信用代码不能为空',
+        trigger: 'blur',
+      },
+    ]">
+                    <el-input v-model="item.res.code" placeholder="请输入统一社会信用代码" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" v-if="item.res.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">
-                  <el-form-item label-width="140px" label="被申请人出生年月：" :prop="'affiliate.res.' + index + '.res.birth'">
+                  <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>
                   </div>
                   <el-divider></el-divider>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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: '代理人联系电话不能为空',
                     <el-input v-model="item.resAgent.phone" placeholder="请输入代理人联系电话" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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="detailsAwardNum.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: '代理人姓名不能为空',
                     <el-input v-model="item.resAgent.name" placeholder="请输入代理人姓名" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.organizeFlag == 0">
+                <el-col :span="12" v-if="item.res.organizeFlag == 0">
                   <el-form-item label="是否为操作人" :prop="'affiliate.res.' + index + '.resAgent.operatorFlag'">
                     <el-select v-model="item.resAgent.operatorFlag" placeholder="请选择" auto-complete="off"
                       style="width: 100%;">
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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="detailsAwardNum.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: '代理人邮箱不能为空',
                     <el-input v-model="item.resAgent.email" placeholder="请输入代理人邮箱" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12" v-if="detailsAwardNum.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})$/,
                     <el-input v-model="item.resAgent.email" placeholder="请输入代理人邮箱" />
                   </el-form-item>
                 </el-col>
-                </div>
-                </el-row>
+              </div>
+            </el-row>
           </el-form>
         </div>
       </div>
         }
       ],
       idTypeList: [
-       
+
       ]
     };
   },
 
   },
   created() {
-   
+
   },
   methods: {
     isNoData(data, type) {
       });
     },
     /** 查看证据 */
-    fileDetil(val,flag) {
-      if(flag==1){
-         window.open(this.fileURL + val);
-      }else if(flag==2){
-         this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 0 } })
+    fileDetil(val, flag) {
+      if (flag == 1) {
+        window.open(this.fileURL + val);
+      } else if (flag == 2) {
+        this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 0 } })
       }
-     
+
     },
     /** 文件上传地址 */
     UploadUrl() {

src/views/caseManagement/components/mediation.vue

     openmeeting() {
       this.mediationVisable = false
       window.open(
-        // `http://localhost:8080/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie&token=${getToken()}`
-        `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie&token=${getToken()}`
+        `http://localhost:8080/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie&token=${getToken()}`
+        // `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie&token=${getToken()}`
       );
     },
     /**提交仲裁结果 */

src/views/onlyoffice/onlyoffice.vue

         .then((res) => {
           this.config = res.data;
           // this.config.callbackUrl = this.config.callbackUrl + `/${this.userId}`;
-          console.log(res.data, "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO");
           var docEditor = new DocsAPI.DocEditor("placeholder", this.config);
         });
     },