Bläddra i källkod

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

hanchaobo 2 år sedan
förälder
incheckning
4f8165045a
3 ändrade filer med 155 tillägg och 39 borttagningar
  1. 96
    29
      src/views/caseManagement/components/addCase.vue
  2. 57
    8
      src/views/register.vue
  3. 2
    2
      vue.config.js

+ 96
- 29
src/views/caseManagement/components/addCase.vue Visa fil

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>
535
       getUserInfoList: {},
578
       getUserInfoList: {},
536
       applicationFlag: null,
579
       applicationFlag: null,
537
       showmediate: false,
580
       showmediate: false,
538
-      formZipData: {}
581
+      formZipData: {},
582
+      nationalityList: [
583
+        {
584
+          value: '国内',
585
+          id: 0
586
+        },
587
+        {
588
+          value: '国外',
589
+          id: 1
590
+        }
591
+      ],
592
+      idTypeList: [
593
+        {
594
+          value: '身份证',
595
+          id: 0
596
+        },
597
+        {
598
+          value: '护照',
599
+          id: 1
600
+        }
601
+      ]
539
     };
602
     };
540
   },
603
   },
541
   watch: {
604
   watch: {
557
     },
620
     },
558
     addVisable(val) {
621
     addVisable(val) {
559
       if (val) {
622
       if (val) {
560
-        if(this.addModifyData == 1){
623
+        if (this.addModifyData == 1) {
561
           this.formData = {
624
           this.formData = {
562
-          affiliate: {
563
-            organizeFlag: 0,
564
-            respondentSex: 0,
565
-          },
566
-          columnValueList: [],
567
-          caseAttachList: [],
568
-        };
569
-        this.$set(this.formData.affiliate, "applicationName", this.getUserInfoList.nickName);
570
-        this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
571
-        this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
572
-        this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
625
+            affiliate: {
626
+              organizeFlag: 0,
627
+              respondentSex: 0,
628
+            },
629
+            columnValueList: [],
630
+            caseAttachList: [],
631
+          };
632
+          this.$set(this.formData.affiliate, "applicationName", this.getUserInfoList.nickName);
633
+          this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
634
+          this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
635
+          this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
573
         }
636
         }
574
         this.activeName = "first";
637
         this.activeName = "first";
575
         this.showmediate = false;
638
         this.showmediate = false;
598
         this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
661
         this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard);
599
         this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
662
         this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email);
600
         this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
663
         this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber);
664
+        this.$set(this.formData.affiliate, "idType", this.getUserInfoList.idType);
665
+        this.$set(this.formData.affiliate, "nationality", this.getUserInfoList.nationality);
601
       })
666
       })
602
     },
667
     },
603
     /** 根据案件id获取对应信息 */
668
     /** 根据案件id获取对应信息 */
752
           this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
817
           this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
753
           this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
818
           this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
754
           this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
819
           this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
820
+        } else {
821
+          this.formData.affiliate.nameAgent = null;
822
+          this.formData.affiliate.agentEmail = null;
823
+          this.formData.affiliate.contactTelphoneAgent = null;
755
         }
824
         }
756
-        // this.formData.affiliate.nameAgent = null;
757
-        // this.formData.affiliate.agentEmail = null;
758
-        // this.formData.affiliate.contactTelphoneAgent = null;
759
       } else if (val == 1) {
825
       } else if (val == 1) {
760
         this.$set(this.formData.affiliate, "nameAgent", this.getUserInfoList.nickName);
826
         this.$set(this.formData.affiliate, "nameAgent", this.getUserInfoList.nickName);
761
         this.$set(this.formData.affiliate, "agentEmail", this.getUserInfoList.email);
827
         this.$set(this.formData.affiliate, "agentEmail", this.getUserInfoList.email);
764
           this.$set(this.formData.affiliate, 'organizeFlag', 1);
830
           this.$set(this.formData.affiliate, 'organizeFlag', 1);
765
           this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
831
           this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
766
           this.$set(this.formData, 'facts', this.formZipData.facts);
832
           this.$set(this.formData, 'facts', this.formZipData.facts);
767
-          this.$set(this.formData.affiliate,'applicationName',this.formZipData.affiliate.applicationName);
768
-          this.$set(this.formData.affiliate,'code',this.formZipData.affiliate.code);
769
-          this.$set(this.formData.affiliate,'applicationEmail',this.formZipData.affiliate.applicationEmail);
770
-          this.$set(this.formData.affiliate,'applicationPhone',this.formZipData.affiliate.applicationPhone);
833
+          this.$set(this.formData.affiliate, 'applicationName', this.formZipData.affiliate.applicationName);
834
+          this.$set(this.formData.affiliate, 'code', this.formZipData.affiliate.code);
835
+          this.$set(this.formData.affiliate, 'applicationEmail', this.formZipData.affiliate.applicationEmail);
836
+          this.$set(this.formData.affiliate, 'applicationPhone', this.formZipData.affiliate.applicationPhone);
771
           // this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
837
           // this.$set(this.formData.affiliate, 'applicantHome', this.formZipData.affiliate.applicantHome);
772
           // this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
838
           // this.$set(this.formData.affiliate, 'applicantAddress', this.formZipData.affiliate.applicantAddress);
773
           // this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
839
           // this.$set(this.formData.affiliate, 'contactTelphoneAgent', this.formZipData.affiliate.contactTelphoneAgent);
780
           this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
846
           this.$set(this.formData.affiliate, 'respondentBirth', this.formZipData.affiliate.respondentBirth);
781
           this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
847
           this.$set(this.formData.affiliate, 'respondentHome', this.formZipData.affiliate.respondentHome);
782
           this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
848
           this.$set(this.formData.affiliate, 'respondentEmail', this.formZipData.affiliate.respondentEmail);
849
+        } else {
850
+          this.formData.affiliate.applicationName = null;
851
+          this.formData.affiliate.code = null;
852
+          this.formData.affiliate.applicationEmail = null;
853
+          this.formData.affiliate.applicationPhone = null;
783
         }
854
         }
784
-        // this.formData.affiliate.applicationName = null;
785
-        // this.formData.affiliate.code = null;
786
-        // this.formData.affiliate.applicationEmail = null;
787
-        // this.formData.affiliate.applicationPhone = null;
788
       }
855
       }
789
       this.$refs["ruleForm"].clearValidate()
856
       this.$refs["ruleForm"].clearValidate()
790
     },
857
     },

+ 57
- 8
src/views/register.vue Visa fil

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() {

+ 2
- 2
vue.config.js Visa fil

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:7001'  //生产
14
+// const API = 'http://121.40.189.20:7001'  //生产
15
 // const API = 'http://121.40.189.20:6001'  //测试
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