src/views/caseManagement/caseList.vue

@@ -23,7 +23,8 @@
             </el-form-item>
             <el-form-item label="创建时间" prop="caseTime">
                 <el-date-picker v-model="caseTime" type="daterange" align="right" unlink-panels range-separator="至"
-                    start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px" @change="caseTimeChange">
+                    start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px"
+                    @change="caseTimeChange">
                 </el-date-picker>
             </el-form-item>
             <el-form-item>
@@ -46,8 +47,8 @@
             <el-table-column label="序号" type="index" align="center">
                 <template slot-scope="scope">
                     <span>{{
-                        (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-                    }}</span>
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+        }}</span>
                 </template>
             </el-table-column>
             <!-- <el-table-column label="批号" align="center" prop="batchNumber" :show-overflow-tooltip="true" /> -->
@@ -64,33 +65,37 @@
                 <template slot-scope="scope">
                     <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text" icon="el-icon-edit"
                         v-hasPermi="['caseManagement:list:edit']" v-if="scope.row.caseFlowId <= 1">修改</el-button>
-                    <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
-                    <el-button size="mini" @click="caseFlow(scope.row)" type="text" icon="el-icon-zoom-in">查看流程</el-button>
+                    <el-button size="mini" @click="checkDetail(scope.row)" type="text"
+                        icon="el-icon-view">查看详情</el-button>
+                    <el-button size="mini" @click="caseFlow(scope.row)" type="text"
+                        icon="el-icon-zoom-in">查看流程</el-button>
                     <el-button size="mini" @click="caseLog(scope.row)" type="text"
                         icon="el-icon-edit-outline">案件日志</el-button>
-                    <el-button size="mini" @click="viewpaymentformRow(scope.row)" type="text"
-                        icon="el-icon-edit">查看缴费单</el-button>
+                    <el-button size="mini" @click="viewpaymentformRow(scope.row)" type="text" icon="el-icon-edit"
+                        v-if="scope.row.caseFlowId > 2">查看缴费单</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="evidenceUpload(scope.row)"
-                        v-hasPermi="['caseManagement:list:evidenceEdit']" v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
+                        v-hasPermi="['caseManagement:list:evidenceEdit']"
+                        v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 ||
-                        scope.row.caseFlowId == 16 ||
-                        scope.row.caseFlowId == 17
-                        " @click="caseFilingDetails(scope.row)">归档详情</el-button>
+            scope.row.caseFlowId == 16 ||
+            scope.row.caseFlowId == 17
+            " @click="caseFilingDetails(scope.row)">归档详情</el-button>
                     <div class="btnList" v-for="item in buttonList" :key="item.id">
                         <el-button size="mini" type="text" icon="el-icon-tickets" @click="caseClick(scope.row, item.id)"
                             v-if="item.id == scope.row.caseFlowId &&
-                                checkPermi([item.buttonAuthFlag]) &&
-                                scope.row.signButtonFlag != 1
-                                ">{{ item.nodeName }}</el-button>
+            checkPermi([item.buttonAuthFlag]) &&
+            scope.row.signButtonFlag != 1
+            ">{{ item.nodeName }}</el-button>
                     </div>
                 </template>
             </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList(queryParams)" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList(queryParams)" />
         <!-- 新增编辑详情 -->
         <addCase :addVisable="addVisable" :queryParams="queryParams" @cancelCaseAdd="cancelCaseAdd" @getList="getList"
-            :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData"></addCase>
+            :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData">
+        </addCase>
         <!-- 压缩包导入     -->
         <caseCompressionPackage :openCompressedPackages="openCompressedPackages" :queryParams="queryParams"
             @cancelCompreess="cancelCompreess" :getList="getList">
@@ -103,11 +108,12 @@
         <mediationCaseLog :showcaseLog="showcaseLog" @cancelcaseLog="cancelcaseLog" :caselogDataArr="caselogDataArr"
             :flagLoading="flagLoading"></mediationCaseLog>
         <!-- 证据修改 -->
-        <evidenceDialog :evidenceVisable="evidenceVisable" @cancelEvidence="cancelEvidence" :evidenceData="evidenceData">
+        <evidenceDialog :evidenceVisable="evidenceVisable" @cancelEvidence="cancelEvidence"
+            :evidenceData="evidenceData">
         </evidenceDialog>
         <!-- 缴费 -->
-        <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId" :payForm="payForm"
-            :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"
+        <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId"
+            :payForm="payForm" :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"
             :formPayDetailAffiliate="formPayDetailAffiliate"></payDialog>
         <!-- 缴费确认查看详情 -->
         <paymentdetailsDialog :openDialog="openDialog" @cancelpaymentdetails="cancelpaymentdetails" :title="payTitle"
@@ -116,7 +122,7 @@
         </paymentdetailsDialog>
         <!-- 案件受理 -->
         <caseAcceptance :showAcceptance="showAcceptance" @cancelAcceptance="cancelAcceptance"
-            :caseAcceptanceData="caseAcceptanceData" @getList="getList"></caseAcceptance>
+            :caseAcceptanceData="caseAcceptanceData" @getList="getList" :queryParams="queryParams"></caseAcceptance>
         <!-- 被申请人缴费 -->
         <respondentPay :openResPay="openResPay" :resPayTitle="resPayTitle" :formResPayDetail="formResPayDetail"
             :resPayId="resPayId" :resPayForm="resPayForm" :queryParams="queryParams" @getList="getList"
@@ -134,8 +140,8 @@
         <timeConfirm @cancelTimeConfirm="cancelTimeConfirm" :timeConfirmVisable="timeConfirmVisable"
             :timeConfirmData="timeConfirmData" @getList="getList" :queryParams="queryParams"></timeConfirm>
         <!-- 待调解     -->
-        <mediation @cancelMediation="cancelMediation" :mediationVisable="mediationVisable" :mediationData="mediationData"
-            @getList="getList" :queryParams="queryParams"></mediation>
+        <mediation @cancelMediation="cancelMediation" :mediationVisable="mediationVisable"
+            :mediationData="mediationData" @getList="getList" :queryParams="queryParams"></mediation>
         <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
             :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>
         <!-- 归档详情 -->
@@ -293,12 +299,12 @@ export default {
             // this.getList(this.queryParams);
         });
         if (this.$route.query.caseFlowId) {
-                let querydata = Number(this.$route.query.caseFlowId);
-                if (querydata > 0) {
-                    this.$set(this.queryParams, 'caseFlowId', querydata)
-                }
+            let querydata = Number(this.$route.query.caseFlowId);
+            if (querydata > 0) {
+                this.$set(this.queryParams, 'caseFlowId', querydata)
             }
-            this.getList(this.queryParams);
+        }
+        this.getList(this.queryParams);
     },
     methods: {
         /**所有按钮事件 */
@@ -684,15 +690,33 @@ export default {
             let paramValues = {
                 ids: [row.id],
             };
-            this.$modal
-                .confirm("你确定要案件送达吗？")
-                .then((res) => {
-                    msCaseFile(paramValues).then((res) => {
-                        this.$modal.msgSuccess("案件送达成功");
-                        this.getList(this.queryParams);
-                    });
-                })
-                .catch(() => { });
+            this.$confirm("你确定要案件送达吗？", "提示", {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    callback: () => { },
+                    beforeClose: (action, ctx, close) => {
+                        if (action !== 'confirm') {
+                            close();
+                            return;
+                        }
+                        ctx.confirmButtonLoading = true;
+                        msCaseFile(paramValues).then((res) => {
+                            this.$modal.msgSuccess("案件送达成功");
+                            close();
+                            this.getList(this.queryParams);
+                        }).finally(() => {
+                            ctx.confirmButtonLoading = false;
+                        })
+                    }
+                }).finally(() => { })
+            // .then((res) => {
+            //     msCaseFile(paramValues).then((res) => {
+            //         this.$modal.msgSuccess("案件送达成功");
+            //         this.getList(this.queryParams);
+            //     });
+            // })
+            // .catch(() => { });
         },
         //申请人签收调解书
         signMediation(row) {

src/views/caseManagement/components/addCase.vue

@@ -17,8 +17,8 @@
           <el-divider></el-divider>
           <el-col :span="24">
             <el-form-item label="压缩包导入">
-              <el-upload class="upload-demo" :action="zipUrl()" :before-remove="beforeRemoveZip" multiple accept='.zip' :limit="1"
-                :on-exceed="handleExceedZip" :on-success='successZip' :file-list="fileListZip">
+              <el-upload class="upload-demo" :action="zipUrl()" :before-remove="beforeRemoveZip" multiple accept='.zip'
+                :limit="1" :on-exceed="handleExceedZip" :on-success='successZip' :file-list="fileListZip">
                 <el-button size="small" type="primary">点击上传</el-button>
                 <div slot="tip" class="el-upload__tip">只能上传zip压缩包</div>
               </el-upload>
@@ -84,7 +84,7 @@
               </el-select>
             </el-form-item>
           </el-col> -->
-          <el-col :span="12">
+          <el-col :span="12" v-if="buttonFlag">
             <el-form-item label="申请人案件证据资料上传：" prop="applicantEvidence">
               <el-upload class="upload-demo" ref="fileupload" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
                 :action="UploadUrl()" :on-success="handlSuccess" :on-remove="handleRemove" :on-preview="handlePreview"
@@ -97,7 +97,7 @@
               </el-upload>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="modelFlag">
+          <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)">
@@ -139,7 +139,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-           <el-col :span="24">
+          <el-col :span="24">
             <div style="display: inline-flex">
               <div class="infoIcon"></div>
               <div class="caseInfo">申请人</div>
@@ -158,7 +158,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
-            <el-form-item  label="申请人" prop="affiliate.applicationName" :rules="[
+            <el-form-item label="申请人" prop="affiliate.applicationName" :rules="[
       {
         required: true,
         message: '申请人名称不能为空',
@@ -179,8 +179,40 @@
               <el-input v-model="formData.affiliate.code" placeholder="请输入统一社会信用代码" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item prop="affiliate.nationality" label="国籍" :rules="[
+      {
+        required: true,
+        message: '国籍不能为空',
+        trigger: 'blur',
+      },
+    ]">
+              <el-select v-model="formData.affiliate.nationality" placeholder="请选择国籍" auto-complete="off"
+                style="width: 100%;" :disabled="formData.affiliate.organizeFlag != 1">
+                <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="formData.affiliate.organizeFlag == 0">
-            <el-form-item  label="申请人身份证号码" prop="affiliate.code" :rules="[
+            <el-form-item prop="affiliate.idType" label="证件类型" :rules="[
+      {
+        required: true,
+        message: '证件类型不能为空',
+        trigger: 'blur',
+      },
+    ]">
+              <el-select v-model="formData.affiliate.idType" placeholder="证件类型" auto-complete="off" style="width: 100%;"
+                disabled>
+                <el-option v-for="item in idTypeList" :key="item.id" :label="item.value" :value="item.id">
+
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0 && formData.affiliate.idType == 0">
+            <el-form-item label="申请人身份证号码" prop="affiliate.code" :rules="[
       {
         required: true,
         message: '申请人身份证号不能为空',
@@ -196,6 +228,17 @@
               <el-input v-model="formData.affiliate.code" disabled placeholder="请输入申请人的身份证号" />
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0 && formData.affiliate.idType == 1">
+            <el-form-item label="申请人护照号码" prop="affiliate.code" :rules="[
+      {
+        required: true,
+        message: '申请人护照号码不能为空',
+        trigger: 'blur',
+      },
+    ]">
+              <el-input v-model="formData.affiliate.code" disabled placeholder="请输入申请人的申请人护照号" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
             <el-form-item label="申请人邮箱" prop="affiliate.applicationEmail" :rules="[
       {
@@ -278,7 +321,7 @@
               <el-input v-model="formData.affiliate.applicantAddress" placeholder="请输入申请人联系地址" />
             </el-form-item>
           </el-col>
-           <el-col :span="24">
+          <el-col :span="24">
             <div style="display: inline-flex">
               <div class="infoIcon"></div>
               <div class="caseInfo">代理人</div>
@@ -351,7 +394,7 @@
               <el-input v-model="formData.affiliate.agentEmail" placeholder="请输入代理人邮箱" />
             </el-form-item>
           </el-col>
-           <el-col :span="24">
+          <el-col :span="24">
             <div style="display: inline-flex">
               <div class="infoIcon"></div>
               <div class="caseInfo">被申请人</div>
@@ -385,44 +428,7 @@
               <el-input v-model="formData.affiliate.respondentPhone" placeholder="请输入被申请人联系电话" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label-width="140px" label="被申请人身份证号" prop="affiliate.respondentIdentityNum" :rules="[
-      {
-        required: true,
-        message: '被申请人身份证号不能为空',
-        trigger: 'blur',
-      },
-      {
-        pattern:
-          /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-        message: '请输入正确的身份证号码',
-        trigger: 'blur',
-      },
-    ]">
-              <el-input v-model="formData.affiliate.respondentIdentityNum" @blur="handleBlur"
-                placeholder="请输入被申请人身份证号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="被申请人性别：" prop="affiliate.respondentSex" :rules="[
-      {
-        required: true,
-        message: '请选择性别',
-      },
-    ]">
-              <el-radio-group v-model="formData.affiliate.respondentSex" 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">
-            <el-form-item label-width="140px" label="被申请人出生年月：" prop="affiliate.respondentBirth">
-              <el-date-picker disabled v-model="formData.affiliate.respondentBirth" type="date" placeholder="被申请人出生年月日">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
+                    <el-col :span="12">
             <el-form-item label-width="150px" label="被申请人申请人住所" prop="affiliate.respondentHome" :rules="[
       {
         required: true,
@@ -437,7 +443,7 @@
             <el-form-item label="被申请人邮箱" prop="affiliate.respondentEmail" :rules="[
       {
         required: true,
-        message: '代理人邮箱不能为空',
+        message: '被申请人邮箱不能为空',
         trigger: 'blur',
       },
       {
@@ -451,6 +457,43 @@
             </el-form-item>
           </el-col>
         </el-row>
+              <el-col :span="12">
+                <el-form-item label-width="140px" label="被申请人身份证号" prop="affiliate.respondentIdentityNum" :rules="[
+          {
+            required: true,
+            message: '被申请人身份证号不能为空',
+            trigger: 'blur',
+          },
+          {
+            pattern:
+              /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+            message: '请输入正确的身份证号码',
+            trigger: 'blur',
+          },
+        ]">
+              <el-input v-model="formData.affiliate.respondentIdentityNum" @blur="handleBlur"
+                placeholder="请输入被申请人身份证号" />
+            </el-form-item>
+            </el-col>
+                      <el-col :span="12">
+              <el-form-item label-width="140px" label="被申请人出生年月：" prop="affiliate.respondentBirth">
+                <el-date-picker disabled v-model="formData.affiliate.respondentBirth" type="date" placeholder="被申请人出生年月日">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="被申请人性别：" prop="affiliate.respondentSex" :rules="[
+              {
+                required: true,
+                message: '请选择性别',
+              },
+            ]">
+              <el-radio-group v-model="formData.affiliate.respondentSex" disabled>
+                <el-radio :label="0">男</el-radio>
+                <el-radio :label="1">女</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         <el-col :span="24" v-if="modelFlag">
           <el-form-item v-for="item in formData.columnValueList" :label="item.name" :key="item.id">
             <el-input type="textarea" v-model="item.value"></el-input>
@@ -522,7 +565,7 @@ export default {
       modelFlag: false,
       fileURL: window.location.origin + "/API",
       fileList: [],
-      fileListZip:[],
+      fileListZip: [],
       filedata: {
         annexType: 2,
       },
@@ -534,7 +577,29 @@ export default {
       buttonFlag: true,
       getUserInfoList: {},
       applicationFlag: null,
-      showmediate: false
+      showmediate: false,
+      showEvidence: false,//是否显示证据
+      formZipData: {},
+      nationalityList: [
+        {
+          value: '国内',
+          id: 0
+        },
+        {
+          value: '国外',
+          id: 1
+        }
+      ],
+      idTypeList: [
+        {
+          value: '身份证',
+          id: 0
+        },
+        {
+          value: '护照',
+          id: 1
+        }
+      ]
     };
   },
   watch: {
@@ -544,14 +609,6 @@ export default {
         this.getUserInfoFn();
         this.modelFlag = false;
         this.buttonFlag = true;
-        this.formData = {
-          affiliate: {
-            organizeFlag: 0,
-            respondentSex: 0,
-          },
-          columnValueList: [],
-          caseAttachList: [],
-        };
       } else if (val == 3) {
         this.title = "修改案件";
         this.modelFlag = true;
@@ -564,6 +621,22 @@ export default {
     },
     addVisable(val) {
       if (val) {
+        if (this.addModifyData == 1) {
+          this.formData = {
+            affiliate: {
+              organizeFlag: 0,
+              respondentSex: 0,
+            },
+            columnValueList: [],
+            caseAttachList: [],
+          };
+          this.$set(this.formData.affiliate, "applicationName", this.getUserInfoList.nickName);
+          this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
+          this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
+          this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
+          this.$set(this.formData.affiliate, "idType", this.getUserInfoList.idType);
+          this.$set(this.formData.affiliate, "nationality", this.getUserInfoList.nationality);
+        }
         this.activeName = "first";
         this.showmediate = false;
         this.getTemplateFn();
@@ -591,20 +664,24 @@ export default {
         this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
         this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
         this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
+        this.$set(this.formData.affiliate, "idType", this.getUserInfoList.idType);
+        this.$set(this.formData.affiliate, "nationality", this.getUserInfoList.nationality);
       })
     },
     /** 根据案件id获取对应信息 */
     caseApplicationSelectByIdFn(data) {
       this.applicantEvidence = [];
       this.respondentEvidence = [];
+      this.showEvidence = false;
       caseApplicationSelectById({ id: data }).then((res) => {
         res.data.affiliate.respondentSex = Number(res.data.affiliate.respondentSex)
         this.formData = res.data;
         this.formData.caseAttachList.forEach((item) => {
           if (item.annexType == 2) {
             this.applicantEvidence.push(item);
+            this.showEvidence = true
           } else if (item.annexType == 6) {
-            this.respondentEvidence.push(item);
+            // this.respondentEvidence.push(item);
           } else if (item.annexType == 7) {
             this.showmediate = true
           }
@@ -666,9 +743,10 @@ export default {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
     handleRemove(file, fileList) {
-      this.caseAttachListArr = this.caseAttachListArr.filter(
-        (item) => item.annexId != file.annexId
-      );
+      let newcaseAttachList = this.formData.caseAttachList.filter(item => 
+        item.annexId !== file.response.annexId
+      )
+      this.formData.caseAttachList = newcaseAttachList
     },
     handleExceedZip(files, fileList) {
       this.$message.warning(`当前限制选择 1 个文件`);
@@ -676,10 +754,30 @@ export default {
     beforeRemoveZip(file, fileList) {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
-    successZip(res){
-      this.formData = res.data;
-      this.$set(this.formData.affiliate,'organizeFlag',0);
-      this.$set(this.formData.affiliate,'respondentSex',Number(res.data.affiliate.respondentSex));
+    successZip(res) {
+      this.formZipData = res.data;
+      // this.formData = res.data;
+      this.$set(this.formData.affiliate, 'organizeFlag', 0);
+      this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
+      this.$set(this.formData, 'facts', this.formZipData.facts);
+      // this.$set(this.formData.affiliate,'applicationName',this.formZipData.affiliate.applicationName);
+      // this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code);
+      // this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail);
+      // this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone);
+      this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
+      this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
+      this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
+      this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
+      this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
+      this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
+      this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
+      this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
+      this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex));
+      this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
+      this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
+      this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
+      this.$set(this.formData.affiliate, 'compLegalPerson', this.formZipData.affiliate.compLegalPerson);
+      // this.$set(this.formData.affiliate,'respondentSex',Number(res.data.affiliate.respondentSex));
     },
     handlePreview(file) {
       window.open(
@@ -705,17 +803,61 @@ export default {
         this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
         this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
         this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
-        this.formData.affiliate.nameAgent = null;
-        this.formData.affiliate.agentEmail = null;
-        this.formData.affiliate.contactTelphoneAgent = null;
+        if (this.formZipData.affiliate) {
+          this.$set(this.formData.affiliate, 'organizeFlag', 0);
+          this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
+          this.$set(this.formData, 'facts', this.formZipData.facts);
+          // this.$set(this.formData.affiliate,'applicationName',this.formZipData.affiliate.applicationName);
+          // this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code);
+          // this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail);
+          // this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone);
+          this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
+          this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
+          this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
+          this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
+          this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
+          this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
+          this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
+          this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
+          this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex));
+          this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
+          this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
+          this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
+        } else {
+          this.formData.affiliate.nameAgent = null;
+          this.formData.affiliate.agentEmail = null;
+          this.formData.affiliate.contactTelphoneAgent = null;
+        }
       } else if (val == 1) {
         this.$set(this.formData.affiliate, "nameAgent", this.getUserInfoList.nickName);
         this.$set(this.formData.affiliate, "agentEmail", this.getUserInfoList.email);
         this.$set(this.formData.affiliate, "contactTelphoneAgent", this.getUserInfoList.phonenumber);
-        this.formData.affiliate.applicationName = null;
-        this.formData.affiliate.code = null;
-        this.formData.affiliate.applicationEmail = null;
-        this.formData.affiliate.applicationPhone = null;
+        if (this.formZipData.affiliate) {
+          this.$set(this.formData.affiliate, 'organizeFlag', 1);
+          this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
+          this.$set(this.formData, 'facts', this.formZipData.facts);
+          this.$set(this.formData.affiliate, 'applicationName', this.formZipData.affiliate.applicationName);
+          this.$set(this.formData.affiliate, 'code', this.formZipData.affiliate.code);
+          this.$set(this.formData.affiliate, 'applicationEmail', this.formZipData.affiliate.applicationEmail);
+          this.$set(this.formData.affiliate, 'applicationPhone', this.formZipData.affiliate.applicationPhone);
+          // this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
+          // this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
+          // this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
+          // this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
+          // this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
+          this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
+          this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
+          this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
+          this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex));
+          this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
+          this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
+          this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
+        } else {
+          this.formData.affiliate.applicationName = null;
+          this.formData.affiliate.code = null;
+          this.formData.affiliate.applicationEmail = null;
+          this.formData.affiliate.applicationPhone = null;
+        }
       }
       this.$refs["ruleForm"].clearValidate()
     },
@@ -757,7 +899,8 @@ export default {
   height: 700px !important;
   overflow: auto !important;
 }
-::v-deep .el-form-item--medium .el-form-item__content {
-    line-height: 37px;
+::v-deep .el-input--medium .el-input__inner{
+  height: 40px;
+  line-height: 40px;
 }
 </style>

src/views/caseManagement/components/caseAcceptance.vue

@@ -28,12 +28,12 @@
           </el-radio-group>
         </el-form-item> -->
         <el-form-item v-if="courtReviewform.agreeFlag == 0" label="拒绝理由:" prop="rejectReason" :rules="[
-          {
-            required: true,
-            message: '拒绝理由不能为空',
-            trigger: 'blur',
-          },
-        ]">
+      {
+        required: true,
+        message: '拒绝理由不能为空',
+        trigger: 'blur',
+      },
+    ]">
           <el-input v-model="courtReviewform.rejectReason" type="textarea" :rows="8" />
         </el-form-item>
       </el-form>
@@ -63,7 +63,13 @@ export default {
   watch: {
     showAcceptance(val) {
       if (val) {
-        console.log(this.caseAcceptanceData)
+        console.log(this.caseAcceptanceData);
+        this.courtReviewform = {
+          mediationMethod: 2,
+          paperFlag: 0,
+          arbitrateConfirm: 0,
+          agreeFlag: 1
+        }
       }
     },
   },

src/views/caseManagement/components/mediation.vue

@@ -46,7 +46,7 @@
         </el-col>
         <el-col :span="24" v-if="mediationType">
           <el-form-item label="调解结果:">
-            <el-radio-group v-model="mediaResult" :disabled="!isSecretaryRole && !selectRoido" @change="resultsMediation">
+            <el-radio-group v-model="mediaResult" :disabled="!selectRoido" @change="resultsMediation">
               <el-radio :label="1">达成调解</el-radio>
               <el-radio :label="2">未达成调解</el-radio>
               <el-radio :label="3">未达成调解但不在争议</el-radio>
@@ -176,6 +176,7 @@ export default {
   },
   watch: {
     mediationVisable(val) {
+      this.mediaResult = 1;
       this.recordArr = [];
       this.recordArrMediate = [];
       if (this.mediationData.mediationMethod == "1") {
@@ -191,6 +192,11 @@ export default {
         });
         this.getUser(); 
       }
+    },
+    recordArrMediate(val){
+      if(val.length >= 1){
+        this.selectRoido = false;
+      }
     }
   },
   created() { },
@@ -201,9 +207,6 @@ export default {
         userId: this.userId
       }).then(res => {
          this.isSecretaryRole = res.data.isSecretaryRole;
-         if(this.recordArrMediate.length > 0){
-          this.selectRoido = false
-        }
       })
     },
     /**上传地址*/
@@ -280,7 +283,7 @@ export default {
           });
         });
       })
-      this.isSecretaryRole = false
+      // this.selectRoido = true;
     },
     /** 庭审笔录附件 */
     toFile2(annexPath) {

src/views/register.vue

@@ -19,11 +19,32 @@
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
-      <el-form-item prop="identityNo">
+      <el-form-item prop="nationality">
+        <el-select v-model="registerForm.nationality" placeholder="请选择国籍" auto-complete="off" style="width: 100%;">
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+          <el-option v-for="item in nationalityList" :key="item.id" :label="item.value" :value="item.id">
+
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="idType">
+        <el-select v-model="registerForm.idType" placeholder="证件类型" auto-complete="off" style="width: 100%;">
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+          <el-option v-for="item in idTypeList" :key="item.id" :label="item.value" :value="item.id">
+
+          </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="身份证号码">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
+      <el-form-item prop="identityNo" v-if="registerForm.idType === 1">
+        <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>
       <el-form-item prop="email">
         <el-input v-model="registerForm.email" type="text" auto-complete="off" placeholder="邮箱">
           <svg-icon slot="prefix" icon-class="email" class="el-input__icon input-icon" />
@@ -107,6 +128,8 @@ export default {
         confirmPassword: "",
         code: "",
         uuid: "",
+        nationality:0,
+        idType:0
       },
       registerRules: {
         userName: [
@@ -134,12 +157,12 @@ export default {
             message: '被申请人身份证号不能为空',
             trigger: 'blur',
           },
-          {
-            pattern:
-              /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-            message: '请输入正确的身份证号码',
-            trigger: 'blur',
-          },
+          // {
+          //   pattern:
+          //     /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+          //   message: '请输入正确的身份证号码',
+          //   trigger: 'blur',
+          // },
         ],
         email: [
           { required: true, trigger: "blur", message: "请再次输入您的密码" },
@@ -171,10 +194,36 @@ export default {
         verifyCode: [
           { required: true, trigger: "blur", message: "请输入验证码" },
         ],
+        idType: [
+          { required: true, trigger: "blur", message: "请选择证件类型" },
+        ],
+        nationality: [
+          { required: true, trigger: "blur", message: "请选择国籍" },
+        ],
       },
       loading: false,
       captchaEnabled: true,
-      roleList: []
+      roleList: [],
+      nationalityList:[
+        {
+          value:'国内',
+          id:0
+        },
+        {
+          value:'国外',
+          id:1
+        }
+      ],
+      idTypeList:[
+      {
+          value:'身份证',
+          id:0
+        },
+        {
+          value:'护照',
+          id:1
+        }
+      ]
     };
   },
   created() {

vue.config.js

@@ -11,11 +11,11 @@ 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:9001'  //生产
-// const API = 'http://121.40.189.20:6001'  //测试
+// const API = 'http://121.40.189.20:7001'  //生产
+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