22 Commity

Autor SHA1 Wiadomość Data
  hhl123456789 6a0a382963 '证据修改显隐问题调整' 2 lat temu
  hanchaobo 81ac5528a1 Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2 lat temu
  hanchaobo b1810b835a Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb 2 lat temu
  hanchaobo 72e79651b6 送达加载,新增bug 2 lat temu
  hanchaobo 4f8165045a Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2 lat temu
  hanchaobo 9bebf1a8a7 合并 2 lat temu
  hanchaobo 03f1700c37 外籍人口功能 2 lat temu
  gaogaoyujie ab70858f39 Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev 2 lat temu
  gyj ed1165a6ac Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj 2 lat temu
  gyj 8c45d922a5 新增页面的优化 2 lat temu
  hanchaobo a1fec88e88 Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2 lat temu
  hanchaobo 6a1d18309a Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb 2 lat temu
  hanchaobo 5f41c61d1e 0306测试问题 2 lat temu
  hanchaobo c2f5d6d8bd Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2 lat temu
  hanchaobo 3762c9a6cb Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb 2 lat temu
  hanchaobo fc37239f9d 0306部署2 2 lat temu
  hanchaobo b923625515 Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev 2 lat temu
  hanchaobo 62dbde7d0a Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb 2 lat temu
  hanchaobo 720d90193f 0306部署 2 lat temu
  hhlxayunmei 13937509c8 Merge branch 'hhl' of SH-Arbitrate/Mediation-Frontend into dev 2 lat temu
  hanchaobo 57f11996c6 Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb 2 lat temu
  hanchaobo 718e182766 压缩包上传 2 lat temu

+ 61
- 37
src/views/caseManagement/caseList.vue Wyświetl plik

23
             </el-form-item>
23
             </el-form-item>
24
             <el-form-item label="创建时间" prop="caseTime">
24
             <el-form-item label="创建时间" prop="caseTime">
25
                 <el-date-picker v-model="caseTime" type="daterange" align="right" unlink-panels range-separator="至"
25
                 <el-date-picker v-model="caseTime" type="daterange" align="right" unlink-panels range-separator="至"
26
-                    start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px" @change="caseTimeChange">
26
+                    start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px"
27
+                    @change="caseTimeChange">
27
                 </el-date-picker>
28
                 </el-date-picker>
28
             </el-form-item>
29
             </el-form-item>
29
             <el-form-item>
30
             <el-form-item>
46
             <el-table-column label="序号" type="index" align="center">
47
             <el-table-column label="序号" type="index" align="center">
47
                 <template slot-scope="scope">
48
                 <template slot-scope="scope">
48
                     <span>{{
49
                     <span>{{
49
-                        (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
50
-                    }}</span>
50
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
51
+        }}</span>
51
                 </template>
52
                 </template>
52
             </el-table-column>
53
             </el-table-column>
53
             <!-- <el-table-column label="批号" align="center" prop="batchNumber" :show-overflow-tooltip="true" /> -->
54
             <!-- <el-table-column label="批号" align="center" prop="batchNumber" :show-overflow-tooltip="true" /> -->
64
                 <template slot-scope="scope">
65
                 <template slot-scope="scope">
65
                     <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text" icon="el-icon-edit"
66
                     <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text" icon="el-icon-edit"
66
                         v-hasPermi="['caseManagement:list:edit']" v-if="scope.row.caseFlowId <= 1">修改</el-button>
67
                         v-hasPermi="['caseManagement:list:edit']" v-if="scope.row.caseFlowId <= 1">修改</el-button>
67
-                    <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
68
-                    <el-button size="mini" @click="caseFlow(scope.row)" type="text" icon="el-icon-zoom-in">查看流程</el-button>
68
+                    <el-button size="mini" @click="checkDetail(scope.row)" type="text"
69
+                        icon="el-icon-view">查看详情</el-button>
70
+                    <el-button size="mini" @click="caseFlow(scope.row)" type="text"
71
+                        icon="el-icon-zoom-in">查看流程</el-button>
69
                     <el-button size="mini" @click="caseLog(scope.row)" type="text"
72
                     <el-button size="mini" @click="caseLog(scope.row)" type="text"
70
                         icon="el-icon-edit-outline">案件日志</el-button>
73
                         icon="el-icon-edit-outline">案件日志</el-button>
71
-                    <el-button size="mini" @click="viewpaymentformRow(scope.row)" type="text"
72
-                        icon="el-icon-edit">查看缴费单</el-button>
74
+                    <el-button size="mini" @click="viewpaymentformRow(scope.row)" type="text" icon="el-icon-edit"
75
+                        v-if="scope.row.caseFlowId > 2">查看缴费单</el-button>
73
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="evidenceUpload(scope.row)"
76
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="evidenceUpload(scope.row)"
74
-                        v-hasPermi="['caseManagement:list:evidenceEdit']" v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
77
+                        v-hasPermi="['caseManagement:list:evidenceEdit']"
78
+                        v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
75
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 ||
79
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 ||
76
-                        scope.row.caseFlowId == 16 ||
77
-                        scope.row.caseFlowId == 17
78
-                        " @click="caseFilingDetails(scope.row)">归档详情</el-button>
80
+            scope.row.caseFlowId == 16 ||
81
+            scope.row.caseFlowId == 17
82
+            " @click="caseFilingDetails(scope.row)">归档详情</el-button>
79
                     <div class="btnList" v-for="item in buttonList" :key="item.id">
83
                     <div class="btnList" v-for="item in buttonList" :key="item.id">
80
                         <el-button size="mini" type="text" icon="el-icon-tickets" @click="caseClick(scope.row, item.id)"
84
                         <el-button size="mini" type="text" icon="el-icon-tickets" @click="caseClick(scope.row, item.id)"
81
                             v-if="item.id == scope.row.caseFlowId &&
85
                             v-if="item.id == scope.row.caseFlowId &&
82
-                                checkPermi([item.buttonAuthFlag]) &&
83
-                                scope.row.signButtonFlag != 1
84
-                                ">{{ item.nodeName }}</el-button>
86
+            checkPermi([item.buttonAuthFlag]) &&
87
+            scope.row.signButtonFlag != 1
88
+            ">{{ item.nodeName }}</el-button>
85
                     </div>
89
                     </div>
86
                 </template>
90
                 </template>
87
             </el-table-column>
91
             </el-table-column>
88
         </el-table>
92
         </el-table>
89
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
90
-            @pagination="getList(queryParams)" />
93
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
94
+            :limit.sync="queryParams.pageSize" @pagination="getList(queryParams)" />
91
         <!-- 新增编辑详情 -->
95
         <!-- 新增编辑详情 -->
92
         <addCase :addVisable="addVisable" :queryParams="queryParams" @cancelCaseAdd="cancelCaseAdd" @getList="getList"
96
         <addCase :addVisable="addVisable" :queryParams="queryParams" @cancelCaseAdd="cancelCaseAdd" @getList="getList"
93
-            :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData"></addCase>
97
+            :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData">
98
+        </addCase>
94
         <!-- 压缩包导入     -->
99
         <!-- 压缩包导入     -->
95
         <caseCompressionPackage :openCompressedPackages="openCompressedPackages" :queryParams="queryParams"
100
         <caseCompressionPackage :openCompressedPackages="openCompressedPackages" :queryParams="queryParams"
96
             @cancelCompreess="cancelCompreess" :getList="getList">
101
             @cancelCompreess="cancelCompreess" :getList="getList">
103
         <mediationCaseLog :showcaseLog="showcaseLog" @cancelcaseLog="cancelcaseLog" :caselogDataArr="caselogDataArr"
108
         <mediationCaseLog :showcaseLog="showcaseLog" @cancelcaseLog="cancelcaseLog" :caselogDataArr="caselogDataArr"
104
             :flagLoading="flagLoading"></mediationCaseLog>
109
             :flagLoading="flagLoading"></mediationCaseLog>
105
         <!-- 证据修改 -->
110
         <!-- 证据修改 -->
106
-        <evidenceDialog :evidenceVisable="evidenceVisable" @cancelEvidence="cancelEvidence" :evidenceData="evidenceData">
111
+        <evidenceDialog :evidenceVisable="evidenceVisable" @cancelEvidence="cancelEvidence"
112
+            :evidenceData="evidenceData">
107
         </evidenceDialog>
113
         </evidenceDialog>
108
         <!-- 缴费 -->
114
         <!-- 缴费 -->
109
-        <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId" :payForm="payForm"
110
-            :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"
115
+        <payDialog :openPay="openPay" :payTitle="payTitle" :formPayDetail="formPayDetail" :payId="payId"
116
+            :payForm="payForm" :queryParams="queryParams" @getList="getList" @paycancelRow="paycancelRow"
111
             :formPayDetailAffiliate="formPayDetailAffiliate"></payDialog>
117
             :formPayDetailAffiliate="formPayDetailAffiliate"></payDialog>
112
         <!-- 缴费确认查看详情 -->
118
         <!-- 缴费确认查看详情 -->
113
         <paymentdetailsDialog :openDialog="openDialog" @cancelpaymentdetails="cancelpaymentdetails" :title="payTitle"
119
         <paymentdetailsDialog :openDialog="openDialog" @cancelpaymentdetails="cancelpaymentdetails" :title="payTitle"
116
         </paymentdetailsDialog>
122
         </paymentdetailsDialog>
117
         <!-- 案件受理 -->
123
         <!-- 案件受理 -->
118
         <caseAcceptance :showAcceptance="showAcceptance" @cancelAcceptance="cancelAcceptance"
124
         <caseAcceptance :showAcceptance="showAcceptance" @cancelAcceptance="cancelAcceptance"
119
-            :caseAcceptanceData="caseAcceptanceData" @getList="getList"></caseAcceptance>
125
+            :caseAcceptanceData="caseAcceptanceData" @getList="getList" :queryParams="queryParams"></caseAcceptance>
120
         <!-- 被申请人缴费 -->
126
         <!-- 被申请人缴费 -->
121
         <respondentPay :openResPay="openResPay" :resPayTitle="resPayTitle" :formResPayDetail="formResPayDetail"
127
         <respondentPay :openResPay="openResPay" :resPayTitle="resPayTitle" :formResPayDetail="formResPayDetail"
122
             :resPayId="resPayId" :resPayForm="resPayForm" :queryParams="queryParams" @getList="getList"
128
             :resPayId="resPayId" :resPayForm="resPayForm" :queryParams="queryParams" @getList="getList"
134
         <timeConfirm @cancelTimeConfirm="cancelTimeConfirm" :timeConfirmVisable="timeConfirmVisable"
140
         <timeConfirm @cancelTimeConfirm="cancelTimeConfirm" :timeConfirmVisable="timeConfirmVisable"
135
             :timeConfirmData="timeConfirmData" @getList="getList" :queryParams="queryParams"></timeConfirm>
141
             :timeConfirmData="timeConfirmData" @getList="getList" :queryParams="queryParams"></timeConfirm>
136
         <!-- 待调解     -->
142
         <!-- 待调解     -->
137
-        <mediation @cancelMediation="cancelMediation" :mediationVisable="mediationVisable" :mediationData="mediationData"
138
-            @getList="getList" :queryParams="queryParams"></mediation>
143
+        <mediation @cancelMediation="cancelMediation" :mediationVisable="mediationVisable"
144
+            :mediationData="mediationData" @getList="getList" :queryParams="queryParams"></mediation>
139
         <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
145
         <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
140
             :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>
146
             :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>
141
         <!-- 归档详情 -->
147
         <!-- 归档详情 -->
293
             // this.getList(this.queryParams);
299
             // this.getList(this.queryParams);
294
         });
300
         });
295
         if (this.$route.query.caseFlowId) {
301
         if (this.$route.query.caseFlowId) {
296
-                let querydata = Number(this.$route.query.caseFlowId);
297
-                if (querydata > 0) {
298
-                    this.$set(this.queryParams, 'caseFlowId', querydata)
299
-                }
302
+            let querydata = Number(this.$route.query.caseFlowId);
303
+            if (querydata > 0) {
304
+                this.$set(this.queryParams, 'caseFlowId', querydata)
300
             }
305
             }
301
-            this.getList(this.queryParams);
306
+        }
307
+        this.getList(this.queryParams);
302
     },
308
     },
303
     methods: {
309
     methods: {
304
         /**所有按钮事件 */
310
         /**所有按钮事件 */
684
             let paramValues = {
690
             let paramValues = {
685
                 ids: [row.id],
691
                 ids: [row.id],
686
             };
692
             };
687
-            this.$modal
688
-                .confirm("你确定要案件送达吗?")
689
-                .then((res) => {
690
-                    msCaseFile(paramValues).then((res) => {
691
-                        this.$modal.msgSuccess("案件送达成功");
692
-                        this.getList(this.queryParams);
693
-                    });
694
-                })
695
-                .catch(() => { });
693
+            this.$confirm("你确定要案件送达吗?", "提示", {
694
+                    confirmButtonText: '确定',
695
+                    cancelButtonText: '取消',
696
+                    type: 'warning',
697
+                    callback: () => { },
698
+                    beforeClose: (action, ctx, close) => {
699
+                        if (action !== 'confirm') {
700
+                            close();
701
+                            return;
702
+                        }
703
+                        ctx.confirmButtonLoading = true;
704
+                        msCaseFile(paramValues).then((res) => {
705
+                            this.$modal.msgSuccess("案件送达成功");
706
+                            close();
707
+                            this.getList(this.queryParams);
708
+                        }).finally(() => {
709
+                            ctx.confirmButtonLoading = false;
710
+                        })
711
+                    }
712
+                }).finally(() => { })
713
+            // .then((res) => {
714
+            //     msCaseFile(paramValues).then((res) => {
715
+            //         this.$modal.msgSuccess("案件送达成功");
716
+            //         this.getList(this.queryParams);
717
+            //     });
718
+            // })
719
+            // .catch(() => { });
696
         },
720
         },
697
         //申请人签收调解书
721
         //申请人签收调解书
698
         signMediation(row) {
722
         signMediation(row) {

+ 218
- 75
src/views/caseManagement/components/addCase.vue Wyświetl plik

17
           <el-divider></el-divider>
17
           <el-divider></el-divider>
18
           <el-col :span="24">
18
           <el-col :span="24">
19
             <el-form-item label="压缩包导入">
19
             <el-form-item label="压缩包导入">
20
-              <el-upload class="upload-demo" :action="zipUrl()" :before-remove="beforeRemoveZip" multiple accept='.zip' :limit="1"
21
-                :on-exceed="handleExceedZip" :on-success='successZip' :file-list="fileListZip">
20
+              <el-upload class="upload-demo" :action="zipUrl()" :before-remove="beforeRemoveZip" multiple accept='.zip'
21
+                :limit="1" :on-exceed="handleExceedZip" :on-success='successZip' :file-list="fileListZip">
22
                 <el-button size="small" type="primary">点击上传</el-button>
22
                 <el-button size="small" type="primary">点击上传</el-button>
23
                 <div slot="tip" class="el-upload__tip">只能上传zip压缩包</div>
23
                 <div slot="tip" class="el-upload__tip">只能上传zip压缩包</div>
24
               </el-upload>
24
               </el-upload>
84
               </el-select>
84
               </el-select>
85
             </el-form-item>
85
             </el-form-item>
86
           </el-col> -->
86
           </el-col> -->
87
-          <el-col :span="12">
87
+          <el-col :span="12" v-if="buttonFlag">
88
             <el-form-item label="申请人案件证据资料上传:" prop="applicantEvidence">
88
             <el-form-item label="申请人案件证据资料上传:" prop="applicantEvidence">
89
               <el-upload class="upload-demo" ref="fileupload" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
89
               <el-upload class="upload-demo" ref="fileupload" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
90
                 :action="UploadUrl()" :on-success="handlSuccess" :on-remove="handleRemove" :on-preview="handlePreview"
90
                 :action="UploadUrl()" :on-success="handlSuccess" :on-remove="handleRemove" :on-preview="handlePreview"
97
               </el-upload>
97
               </el-upload>
98
             </el-form-item>
98
             </el-form-item>
99
           </el-col>
99
           </el-col>
100
-          <el-col :span="24" v-if="modelFlag">
100
+          <el-col :span="24" v-if="modelFlag && showEvidence">
101
             <el-form-item label="证据:">
101
             <el-form-item label="证据:">
102
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 2">
102
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 2">
103
                 <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
103
                 <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
139
               </el-radio-group>
139
               </el-radio-group>
140
             </el-form-item>
140
             </el-form-item>
141
           </el-col>
141
           </el-col>
142
-           <el-col :span="24">
142
+          <el-col :span="24">
143
             <div style="display: inline-flex">
143
             <div style="display: inline-flex">
144
               <div class="infoIcon"></div>
144
               <div class="infoIcon"></div>
145
               <div class="caseInfo">申请人</div>
145
               <div class="caseInfo">申请人</div>
158
             </el-form-item>
158
             </el-form-item>
159
           </el-col>
159
           </el-col>
160
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
160
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
161
-            <el-form-item  label="申请人" prop="affiliate.applicationName" :rules="[
161
+            <el-form-item label="申请人" prop="affiliate.applicationName" :rules="[
162
       {
162
       {
163
         required: true,
163
         required: true,
164
         message: '申请人名称不能为空',
164
         message: '申请人名称不能为空',
179
               <el-input v-model="formData.affiliate.code" placeholder="请输入统一社会信用代码" />
179
               <el-input v-model="formData.affiliate.code" placeholder="请输入统一社会信用代码" />
180
             </el-form-item>
180
             </el-form-item>
181
           </el-col>
181
           </el-col>
182
+          <el-col :span="12">
183
+            <el-form-item prop="affiliate.nationality" label="国籍" :rules="[
184
+      {
185
+        required: true,
186
+        message: '国籍不能为空',
187
+        trigger: 'blur',
188
+      },
189
+    ]">
190
+              <el-select v-model="formData.affiliate.nationality" placeholder="请选择国籍" auto-complete="off"
191
+                style="width: 100%;" :disabled="formData.affiliate.organizeFlag != 1">
192
+                <el-option v-for="item in nationalityList" :key="item.id" :label="item.value" :value="item.id">
193
+
194
+                </el-option>
195
+              </el-select>
196
+            </el-form-item>
197
+          </el-col>
182
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
198
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
183
-            <el-form-item  label="申请人身份证号码" prop="affiliate.code" :rules="[
199
+            <el-form-item prop="affiliate.idType" label="证件类型" :rules="[
200
+      {
201
+        required: true,
202
+        message: '证件类型不能为空',
203
+        trigger: 'blur',
204
+      },
205
+    ]">
206
+              <el-select v-model="formData.affiliate.idType" placeholder="证件类型" auto-complete="off" style="width: 100%;"
207
+                disabled>
208
+                <el-option v-for="item in idTypeList" :key="item.id" :label="item.value" :value="item.id">
209
+
210
+                </el-option>
211
+              </el-select>
212
+            </el-form-item>
213
+          </el-col>
214
+          <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0 && formData.affiliate.idType == 0">
215
+            <el-form-item label="申请人身份证号码" prop="affiliate.code" :rules="[
184
       {
216
       {
185
         required: true,
217
         required: true,
186
         message: '申请人身份证号不能为空',
218
         message: '申请人身份证号不能为空',
196
               <el-input v-model="formData.affiliate.code" disabled placeholder="请输入申请人的身份证号" />
228
               <el-input v-model="formData.affiliate.code" disabled placeholder="请输入申请人的身份证号" />
197
             </el-form-item>
229
             </el-form-item>
198
           </el-col>
230
           </el-col>
231
+          <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0 && formData.affiliate.idType == 1">
232
+            <el-form-item label="申请人护照号码" prop="affiliate.code" :rules="[
233
+      {
234
+        required: true,
235
+        message: '申请人护照号码不能为空',
236
+        trigger: 'blur',
237
+      },
238
+    ]">
239
+              <el-input v-model="formData.affiliate.code" disabled placeholder="请输入申请人的申请人护照号" />
240
+            </el-form-item>
241
+          </el-col>
199
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
242
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
200
             <el-form-item label="申请人邮箱" prop="affiliate.applicationEmail" :rules="[
243
             <el-form-item label="申请人邮箱" prop="affiliate.applicationEmail" :rules="[
201
       {
244
       {
278
               <el-input v-model="formData.affiliate.applicantAddress" placeholder="请输入申请人联系地址" />
321
               <el-input v-model="formData.affiliate.applicantAddress" placeholder="请输入申请人联系地址" />
279
             </el-form-item>
322
             </el-form-item>
280
           </el-col>
323
           </el-col>
281
-           <el-col :span="24">
324
+          <el-col :span="24">
282
             <div style="display: inline-flex">
325
             <div style="display: inline-flex">
283
               <div class="infoIcon"></div>
326
               <div class="infoIcon"></div>
284
               <div class="caseInfo">代理人</div>
327
               <div class="caseInfo">代理人</div>
351
               <el-input v-model="formData.affiliate.agentEmail" placeholder="请输入代理人邮箱" />
394
               <el-input v-model="formData.affiliate.agentEmail" placeholder="请输入代理人邮箱" />
352
             </el-form-item>
395
             </el-form-item>
353
           </el-col>
396
           </el-col>
354
-           <el-col :span="24">
397
+          <el-col :span="24">
355
             <div style="display: inline-flex">
398
             <div style="display: inline-flex">
356
               <div class="infoIcon"></div>
399
               <div class="infoIcon"></div>
357
               <div class="caseInfo">被申请人</div>
400
               <div class="caseInfo">被申请人</div>
385
               <el-input v-model="formData.affiliate.respondentPhone" placeholder="请输入被申请人联系电话" />
428
               <el-input v-model="formData.affiliate.respondentPhone" placeholder="请输入被申请人联系电话" />
386
             </el-form-item>
429
             </el-form-item>
387
           </el-col>
430
           </el-col>
388
-          <el-col :span="12">
389
-            <el-form-item label-width="140px" label="被申请人身份证号" prop="affiliate.respondentIdentityNum" :rules="[
390
-      {
391
-        required: true,
392
-        message: '被申请人身份证号不能为空',
393
-        trigger: 'blur',
394
-      },
395
-      {
396
-        pattern:
397
-          /^[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]$/,
398
-        message: '请输入正确的身份证号码',
399
-        trigger: 'blur',
400
-      },
401
-    ]">
402
-              <el-input v-model="formData.affiliate.respondentIdentityNum" @blur="handleBlur"
403
-                placeholder="请输入被申请人身份证号" />
404
-            </el-form-item>
405
-          </el-col>
406
-          <el-col :span="10">
407
-            <el-form-item label="被申请人性别:" prop="affiliate.respondentSex" :rules="[
408
-      {
409
-        required: true,
410
-        message: '请选择性别',
411
-      },
412
-    ]">
413
-              <el-radio-group v-model="formData.affiliate.respondentSex" disabled>
414
-                <el-radio :label="0">男</el-radio>
415
-                <el-radio :label="1">女</el-radio>
416
-              </el-radio-group>
417
-            </el-form-item>
418
-          </el-col>
419
-          <el-col :span="12">
420
-            <el-form-item label-width="140px" label="被申请人出生年月:" prop="affiliate.respondentBirth">
421
-              <el-date-picker disabled v-model="formData.affiliate.respondentBirth" type="date" placeholder="被申请人出生年月日">
422
-              </el-date-picker>
423
-            </el-form-item>
424
-          </el-col>
425
-          <el-col :span="12">
431
+                    <el-col :span="12">
426
             <el-form-item label-width="150px" label="被申请人申请人住所" prop="affiliate.respondentHome" :rules="[
432
             <el-form-item label-width="150px" label="被申请人申请人住所" prop="affiliate.respondentHome" :rules="[
427
       {
433
       {
428
         required: true,
434
         required: true,
437
             <el-form-item label="被申请人邮箱" prop="affiliate.respondentEmail" :rules="[
443
             <el-form-item label="被申请人邮箱" prop="affiliate.respondentEmail" :rules="[
438
       {
444
       {
439
         required: true,
445
         required: true,
440
-        message: '代理人邮箱不能为空',
446
+        message: '被申请人邮箱不能为空',
441
         trigger: 'blur',
447
         trigger: 'blur',
442
       },
448
       },
443
       {
449
       {
451
             </el-form-item>
457
             </el-form-item>
452
           </el-col>
458
           </el-col>
453
         </el-row>
459
         </el-row>
460
+              <el-col :span="12">
461
+                <el-form-item label-width="140px" label="被申请人身份证号" prop="affiliate.respondentIdentityNum" :rules="[
462
+          {
463
+            required: true,
464
+            message: '被申请人身份证号不能为空',
465
+            trigger: 'blur',
466
+          },
467
+          {
468
+            pattern:
469
+              /^[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]$/,
470
+            message: '请输入正确的身份证号码',
471
+            trigger: 'blur',
472
+          },
473
+        ]">
474
+              <el-input v-model="formData.affiliate.respondentIdentityNum" @blur="handleBlur"
475
+                placeholder="请输入被申请人身份证号" />
476
+            </el-form-item>
477
+            </el-col>
478
+                      <el-col :span="12">
479
+              <el-form-item label-width="140px" label="被申请人出生年月:" prop="affiliate.respondentBirth">
480
+                <el-date-picker disabled v-model="formData.affiliate.respondentBirth" type="date" placeholder="被申请人出生年月日">
481
+                </el-date-picker>
482
+              </el-form-item>
483
+            </el-col>
484
+                  <el-col :span="12">
485
+                    <el-form-item label="被申请人性别:" prop="affiliate.respondentSex" :rules="[
486
+              {
487
+                required: true,
488
+                message: '请选择性别',
489
+              },
490
+            ]">
491
+              <el-radio-group v-model="formData.affiliate.respondentSex" disabled>
492
+                <el-radio :label="0">男</el-radio>
493
+                <el-radio :label="1">女</el-radio>
494
+              </el-radio-group>
495
+            </el-form-item>
496
+          </el-col>
454
         <el-col :span="24" v-if="modelFlag">
497
         <el-col :span="24" v-if="modelFlag">
455
           <el-form-item v-for="item in formData.columnValueList" :label="item.name" :key="item.id">
498
           <el-form-item v-for="item in formData.columnValueList" :label="item.name" :key="item.id">
456
             <el-input type="textarea" v-model="item.value"></el-input>
499
             <el-input type="textarea" v-model="item.value"></el-input>
522
       modelFlag: false,
565
       modelFlag: false,
523
       fileURL: window.location.origin + "/API",
566
       fileURL: window.location.origin + "/API",
524
       fileList: [],
567
       fileList: [],
525
-      fileListZip:[],
568
+      fileListZip: [],
526
       filedata: {
569
       filedata: {
527
         annexType: 2,
570
         annexType: 2,
528
       },
571
       },
534
       buttonFlag: true,
577
       buttonFlag: true,
535
       getUserInfoList: {},
578
       getUserInfoList: {},
536
       applicationFlag: null,
579
       applicationFlag: null,
537
-      showmediate: false
580
+      showmediate: false,
581
+      showEvidence: false,//是否显示证据
582
+      formZipData: {},
583
+      nationalityList: [
584
+        {
585
+          value: '国内',
586
+          id: 0
587
+        },
588
+        {
589
+          value: '国外',
590
+          id: 1
591
+        }
592
+      ],
593
+      idTypeList: [
594
+        {
595
+          value: '身份证',
596
+          id: 0
597
+        },
598
+        {
599
+          value: '护照',
600
+          id: 1
601
+        }
602
+      ]
538
     };
603
     };
539
   },
604
   },
540
   watch: {
605
   watch: {
544
         this.getUserInfoFn();
609
         this.getUserInfoFn();
545
         this.modelFlag = false;
610
         this.modelFlag = false;
546
         this.buttonFlag = true;
611
         this.buttonFlag = true;
547
-        this.formData = {
548
-          affiliate: {
549
-            organizeFlag: 0,
550
-            respondentSex: 0,
551
-          },
552
-          columnValueList: [],
553
-          caseAttachList: [],
554
-        };
555
       } else if (val == 3) {
612
       } else if (val == 3) {
556
         this.title = "修改案件";
613
         this.title = "修改案件";
557
         this.modelFlag = true;
614
         this.modelFlag = true;
564
     },
621
     },
565
     addVisable(val) {
622
     addVisable(val) {
566
       if (val) {
623
       if (val) {
624
+        if (this.addModifyData == 1) {
625
+          this.formData = {
626
+            affiliate: {
627
+              organizeFlag: 0,
628
+              respondentSex: 0,
629
+            },
630
+            columnValueList: [],
631
+            caseAttachList: [],
632
+          };
633
+          this.$set(this.formData.affiliate, "applicationName", this.getUserInfoList.nickName);
634
+          this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
635
+          this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
636
+          this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
637
+          this.$set(this.formData.affiliate, "idType", this.getUserInfoList.idType);
638
+          this.$set(this.formData.affiliate, "nationality", this.getUserInfoList.nationality);
639
+        }
567
         this.activeName = "first";
640
         this.activeName = "first";
568
         this.showmediate = false;
641
         this.showmediate = false;
569
         this.getTemplateFn();
642
         this.getTemplateFn();
591
         this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
664
         this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
592
         this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
665
         this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
593
         this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
666
         this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
667
+        this.$set(this.formData.affiliate, "idType", this.getUserInfoList.idType);
668
+        this.$set(this.formData.affiliate, "nationality", this.getUserInfoList.nationality);
594
       })
669
       })
595
     },
670
     },
596
     /** 根据案件id获取对应信息 */
671
     /** 根据案件id获取对应信息 */
597
     caseApplicationSelectByIdFn(data) {
672
     caseApplicationSelectByIdFn(data) {
598
       this.applicantEvidence = [];
673
       this.applicantEvidence = [];
599
       this.respondentEvidence = [];
674
       this.respondentEvidence = [];
675
+      this.showEvidence = false;
600
       caseApplicationSelectById({ id: data }).then((res) => {
676
       caseApplicationSelectById({ id: data }).then((res) => {
601
         res.data.affiliate.respondentSex = Number(res.data.affiliate.respondentSex)
677
         res.data.affiliate.respondentSex = Number(res.data.affiliate.respondentSex)
602
         this.formData = res.data;
678
         this.formData = res.data;
603
         this.formData.caseAttachList.forEach((item) => {
679
         this.formData.caseAttachList.forEach((item) => {
604
           if (item.annexType == 2) {
680
           if (item.annexType == 2) {
605
             this.applicantEvidence.push(item);
681
             this.applicantEvidence.push(item);
682
+            this.showEvidence = true
606
           } else if (item.annexType == 6) {
683
           } else if (item.annexType == 6) {
607
-            this.respondentEvidence.push(item);
684
+            // this.respondentEvidence.push(item);
608
           } else if (item.annexType == 7) {
685
           } else if (item.annexType == 7) {
609
             this.showmediate = true
686
             this.showmediate = true
610
           }
687
           }
666
       return this.$confirm(`确定移除 ${file.name}?`);
743
       return this.$confirm(`确定移除 ${file.name}?`);
667
     },
744
     },
668
     handleRemove(file, fileList) {
745
     handleRemove(file, fileList) {
669
-      this.caseAttachListArr = this.caseAttachListArr.filter(
670
-        (item) => item.annexId != file.annexId
671
-      );
746
+      let newcaseAttachList = this.formData.caseAttachList.filter(item => 
747
+        item.annexId !== file.response.annexId
748
+      )
749
+      this.formData.caseAttachList = newcaseAttachList
672
     },
750
     },
673
     handleExceedZip(files, fileList) {
751
     handleExceedZip(files, fileList) {
674
       this.$message.warning(`当前限制选择 1 个文件`);
752
       this.$message.warning(`当前限制选择 1 个文件`);
676
     beforeRemoveZip(file, fileList) {
754
     beforeRemoveZip(file, fileList) {
677
       return this.$confirm(`确定移除 ${file.name}?`);
755
       return this.$confirm(`确定移除 ${file.name}?`);
678
     },
756
     },
679
-    successZip(res){
680
-      this.formData = res.data;
681
-      this.$set(this.formData.affiliate,'organizeFlag',0);
682
-      this.$set(this.formData.affiliate,'respondentSex',Number(res.data.affiliate.respondentSex));
757
+    successZip(res) {
758
+      this.formZipData = res.data;
759
+      // this.formData = res.data;
760
+      this.$set(this.formData.affiliate, 'organizeFlag', 0);
761
+      this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
762
+      this.$set(this.formData, 'facts', this.formZipData.facts);
763
+      // this.$set(this.formData.affiliate,'applicationName',this.formZipData.affiliate.applicationName);
764
+      // this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code);
765
+      // this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail);
766
+      // this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone);
767
+      this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
768
+      this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
769
+      this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
770
+      this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
771
+      this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
772
+      this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
773
+      this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
774
+      this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
775
+      this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex));
776
+      this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
777
+      this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
778
+      this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
779
+      this.$set(this.formData.affiliate, 'compLegalPerson', this.formZipData.affiliate.compLegalPerson);
780
+      // this.$set(this.formData.affiliate,'respondentSex',Number(res.data.affiliate.respondentSex));
683
     },
781
     },
684
     handlePreview(file) {
782
     handlePreview(file) {
685
       window.open(
783
       window.open(
705
         this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
803
         this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
706
         this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
804
         this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
707
         this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
805
         this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
708
-        this.formData.affiliate.nameAgent = null;
709
-        this.formData.affiliate.agentEmail = null;
710
-        this.formData.affiliate.contactTelphoneAgent = null;
806
+        if (this.formZipData.affiliate) {
807
+          this.$set(this.formData.affiliate, 'organizeFlag', 0);
808
+          this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
809
+          this.$set(this.formData, 'facts', this.formZipData.facts);
810
+          // this.$set(this.formData.affiliate,'applicationName',this.formZipData.affiliate.applicationName);
811
+          // this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code);
812
+          // this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail);
813
+          // this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone);
814
+          this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
815
+          this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
816
+          this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
817
+          this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
818
+          this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
819
+          this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
820
+          this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
821
+          this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
822
+          this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex));
823
+          this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
824
+          this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
825
+          this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
826
+        } else {
827
+          this.formData.affiliate.nameAgent = null;
828
+          this.formData.affiliate.agentEmail = null;
829
+          this.formData.affiliate.contactTelphoneAgent = null;
830
+        }
711
       } else if (val == 1) {
831
       } else if (val == 1) {
712
         this.$set(this.formData.affiliate, "nameAgent", this.getUserInfoList.nickName);
832
         this.$set(this.formData.affiliate, "nameAgent", this.getUserInfoList.nickName);
713
         this.$set(this.formData.affiliate, "agentEmail", this.getUserInfoList.email);
833
         this.$set(this.formData.affiliate, "agentEmail", this.getUserInfoList.email);
714
         this.$set(this.formData.affiliate, "contactTelphoneAgent", this.getUserInfoList.phonenumber);
834
         this.$set(this.formData.affiliate, "contactTelphoneAgent", this.getUserInfoList.phonenumber);
715
-        this.formData.affiliate.applicationName = null;
716
-        this.formData.affiliate.code = null;
717
-        this.formData.affiliate.applicationEmail = null;
718
-        this.formData.affiliate.applicationPhone = null;
835
+        if (this.formZipData.affiliate) {
836
+          this.$set(this.formData.affiliate, 'organizeFlag', 1);
837
+          this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
838
+          this.$set(this.formData, 'facts', this.formZipData.facts);
839
+          this.$set(this.formData.affiliate, 'applicationName', this.formZipData.affiliate.applicationName);
840
+          this.$set(this.formData.affiliate, 'code', this.formZipData.affiliate.code);
841
+          this.$set(this.formData.affiliate, 'applicationEmail', this.formZipData.affiliate.applicationEmail);
842
+          this.$set(this.formData.affiliate, 'applicationPhone', this.formZipData.affiliate.applicationPhone);
843
+          // this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
844
+          // this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
845
+          // this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
846
+          // this.$set(this.formData.affiliate, 'nameAgent', this.formZipData.affiliate.nameAgent);
847
+          // this.$set(this.formData.affiliate, 'agentEmail', this.formZipData.affiliate.agentEmail);
848
+          this.$set(this.formData.affiliate, 'respondentName', this.formZipData.affiliate.respondentName);
849
+          this.$set(this.formData.affiliate, 'respondentPhone', this.formZipData.affiliate.respondentPhone);
850
+          this.$set(this.formData.affiliate, 'respondentIdentityNum', this.formZipData.affiliate.respondentIdentityNum);
851
+          this.$set(this.formData.affiliate, 'respondentSex', Number(this.formZipData.affiliate.respondentSex));
852
+          this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
853
+          this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
854
+          this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
855
+        } else {
856
+          this.formData.affiliate.applicationName = null;
857
+          this.formData.affiliate.code = null;
858
+          this.formData.affiliate.applicationEmail = null;
859
+          this.formData.affiliate.applicationPhone = null;
860
+        }
719
       }
861
       }
720
       this.$refs["ruleForm"].clearValidate()
862
       this.$refs["ruleForm"].clearValidate()
721
     },
863
     },
757
   height: 700px !important;
899
   height: 700px !important;
758
   overflow: auto !important;
900
   overflow: auto !important;
759
 }
901
 }
760
-::v-deep .el-form-item--medium .el-form-item__content {
761
-    line-height: 37px;
902
+::v-deep .el-input--medium .el-input__inner{
903
+  height: 40px;
904
+  line-height: 40px;
762
 }
905
 }
763
 </style>
906
 </style>

+ 13
- 7
src/views/caseManagement/components/caseAcceptance.vue Wyświetl plik

28
           </el-radio-group>
28
           </el-radio-group>
29
         </el-form-item> -->
29
         </el-form-item> -->
30
         <el-form-item v-if="courtReviewform.agreeFlag == 0" label="拒绝理由:" prop="rejectReason" :rules="[
30
         <el-form-item v-if="courtReviewform.agreeFlag == 0" label="拒绝理由:" prop="rejectReason" :rules="[
31
-          {
32
-            required: true,
33
-            message: '拒绝理由不能为空',
34
-            trigger: 'blur',
35
-          },
36
-        ]">
31
+      {
32
+        required: true,
33
+        message: '拒绝理由不能为空',
34
+        trigger: 'blur',
35
+      },
36
+    ]">
37
           <el-input v-model="courtReviewform.rejectReason" type="textarea" :rows="8" />
37
           <el-input v-model="courtReviewform.rejectReason" type="textarea" :rows="8" />
38
         </el-form-item>
38
         </el-form-item>
39
       </el-form>
39
       </el-form>
63
   watch: {
63
   watch: {
64
     showAcceptance(val) {
64
     showAcceptance(val) {
65
       if (val) {
65
       if (val) {
66
-        console.log(this.caseAcceptanceData)
66
+        console.log(this.caseAcceptanceData);
67
+        this.courtReviewform = {
68
+          mediationMethod: 2,
69
+          paperFlag: 0,
70
+          arbitrateConfirm: 0,
71
+          agreeFlag: 1
72
+        }
67
       }
73
       }
68
     },
74
     },
69
   },
75
   },

+ 8
- 5
src/views/caseManagement/components/mediation.vue Wyświetl plik

46
         </el-col>
46
         </el-col>
47
         <el-col :span="24" v-if="mediationType">
47
         <el-col :span="24" v-if="mediationType">
48
           <el-form-item label="调解结果:">
48
           <el-form-item label="调解结果:">
49
-            <el-radio-group v-model="mediaResult" :disabled="!isSecretaryRole && !selectRoido" @change="resultsMediation">
49
+            <el-radio-group v-model="mediaResult" :disabled="!selectRoido" @change="resultsMediation">
50
               <el-radio :label="1">达成调解</el-radio>
50
               <el-radio :label="1">达成调解</el-radio>
51
               <el-radio :label="2">未达成调解</el-radio>
51
               <el-radio :label="2">未达成调解</el-radio>
52
               <el-radio :label="3">未达成调解但不在争议</el-radio>
52
               <el-radio :label="3">未达成调解但不在争议</el-radio>
176
   },
176
   },
177
   watch: {
177
   watch: {
178
     mediationVisable(val) {
178
     mediationVisable(val) {
179
+      this.mediaResult = 1;
179
       this.recordArr = [];
180
       this.recordArr = [];
180
       this.recordArrMediate = [];
181
       this.recordArrMediate = [];
181
       if (this.mediationData.mediationMethod == "1") {
182
       if (this.mediationData.mediationMethod == "1") {
191
         });
192
         });
192
         this.getUser(); 
193
         this.getUser(); 
193
       }
194
       }
195
+    },
196
+    recordArrMediate(val){
197
+      if(val.length >= 1){
198
+        this.selectRoido = false;
199
+      }
194
     }
200
     }
195
   },
201
   },
196
   created() { },
202
   created() { },
201
         userId: this.userId
207
         userId: this.userId
202
       }).then(res => {
208
       }).then(res => {
203
          this.isSecretaryRole = res.data.isSecretaryRole;
209
          this.isSecretaryRole = res.data.isSecretaryRole;
204
-         if(this.recordArrMediate.length > 0){
205
-          this.selectRoido = false
206
-        }
207
       })
210
       })
208
     },
211
     },
209
     /**上传地址*/
212
     /**上传地址*/
280
           });
283
           });
281
         });
284
         });
282
       })
285
       })
283
-      this.isSecretaryRole = false
286
+      // this.selectRoido = true;
284
     },
287
     },
285
     /** 庭审笔录附件 */
288
     /** 庭审笔录附件 */
286
     toFile2(annexPath) {
289
     toFile2(annexPath) {

+ 57
- 8
src/views/register.vue Wyświetl plik

19
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
19
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
20
         </el-input>
20
         </el-input>
21
       </el-form-item>
21
       </el-form-item>
22
-      <el-form-item prop="identityNo">
22
+      <el-form-item prop="nationality">
23
+        <el-select v-model="registerForm.nationality" placeholder="请选择国籍" auto-complete="off" style="width: 100%;">
24
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
25
+          <el-option v-for="item in nationalityList" :key="item.id" :label="item.value" :value="item.id">
26
+
27
+          </el-option>
28
+        </el-select>
29
+      </el-form-item>
30
+      <el-form-item prop="idType">
31
+        <el-select v-model="registerForm.idType" placeholder="证件类型" auto-complete="off" style="width: 100%;">
32
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
33
+          <el-option v-for="item in idTypeList" :key="item.id" :label="item.value" :value="item.id">
34
+
35
+          </el-option>
36
+        </el-select>
37
+      </el-form-item>
38
+      <el-form-item prop="identityNo" v-if="registerForm.idType === 0">
23
         <el-input v-model="registerForm.identityNo" type="text" auto-complete="off" placeholder="身份证号码">
39
         <el-input v-model="registerForm.identityNo" type="text" auto-complete="off" placeholder="身份证号码">
24
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
40
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
25
         </el-input>
41
         </el-input>
26
       </el-form-item>
42
       </el-form-item>
43
+      <el-form-item prop="identityNo" v-if="registerForm.idType === 1">
44
+        <el-input v-model="registerForm.identityNo" type="text" auto-complete="off" placeholder="护照号码">
45
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
46
+        </el-input>
47
+      </el-form-item>
27
       <el-form-item prop="email">
48
       <el-form-item prop="email">
28
         <el-input v-model="registerForm.email" type="text" auto-complete="off" placeholder="邮箱">
49
         <el-input v-model="registerForm.email" type="text" auto-complete="off" placeholder="邮箱">
29
           <svg-icon slot="prefix" icon-class="email" class="el-input__icon input-icon" />
50
           <svg-icon slot="prefix" icon-class="email" class="el-input__icon input-icon" />
107
         confirmPassword: "",
128
         confirmPassword: "",
108
         code: "",
129
         code: "",
109
         uuid: "",
130
         uuid: "",
131
+        nationality:0,
132
+        idType:0
110
       },
133
       },
111
       registerRules: {
134
       registerRules: {
112
         userName: [
135
         userName: [
134
             message: '被申请人身份证号不能为空',
157
             message: '被申请人身份证号不能为空',
135
             trigger: 'blur',
158
             trigger: 'blur',
136
           },
159
           },
137
-          {
138
-            pattern:
139
-              /^[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]$/,
140
-            message: '请输入正确的身份证号码',
141
-            trigger: 'blur',
142
-          },
160
+          // {
161
+          //   pattern:
162
+          //     /^[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]$/,
163
+          //   message: '请输入正确的身份证号码',
164
+          //   trigger: 'blur',
165
+          // },
143
         ],
166
         ],
144
         email: [
167
         email: [
145
           { required: true, trigger: "blur", message: "请再次输入您的密码" },
168
           { required: true, trigger: "blur", message: "请再次输入您的密码" },
171
         verifyCode: [
194
         verifyCode: [
172
           { required: true, trigger: "blur", message: "请输入验证码" },
195
           { required: true, trigger: "blur", message: "请输入验证码" },
173
         ],
196
         ],
197
+        idType: [
198
+          { required: true, trigger: "blur", message: "请选择证件类型" },
199
+        ],
200
+        nationality: [
201
+          { required: true, trigger: "blur", message: "请选择国籍" },
202
+        ],
174
       },
203
       },
175
       loading: false,
204
       loading: false,
176
       captchaEnabled: true,
205
       captchaEnabled: true,
177
-      roleList: []
206
+      roleList: [],
207
+      nationalityList:[
208
+        {
209
+          value:'国内',
210
+          id:0
211
+        },
212
+        {
213
+          value:'国外',
214
+          id:1
215
+        }
216
+      ],
217
+      idTypeList:[
218
+      {
219
+          value:'身份证',
220
+          id:0
221
+        },
222
+        {
223
+          value:'护照',
224
+          id:1
225
+        }
226
+      ]
178
     };
227
     };
179
   },
228
   },
180
   created() {
229
   created() {

+ 3
- 3
vue.config.js Wyświetl plik

11
 
11
 
12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
13
 
13
 
14
-// const API = 'http://121.40.189.20:9001'  //生产
15
-// const API = 'http://121.40.189.20:6001'  //测试
14
+// const API = 'http://121.40.189.20:7001'  //生产
15
+const API = 'http://121.40.189.20:6001'  //测试
16
 // const API = 'http://192.168.3.18:6001'  //B
16
 // const API = 'http://192.168.3.18:6001'  //B
17
 // const API = 'http://172.16.0.237:6001' //Q
17
 // const API = 'http://172.16.0.237:6001' //Q
18
-const API = 'http://172.16.1.26:6001' //w
18
+// const API = 'http://172.16.1.26:6001' //w
19
 
19
 
20
 // vue.config.js 配置说明 
20
 // vue.config.js 配置说明 
21
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
21
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions