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

src/views/caseManagement/components/addCase.vue

               </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>
             </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: '申请人名称不能为空',
               <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: '申请人身份证号不能为空',
               <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="[
       {
               <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>
               <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>
       getUserInfoList: {},
       applicationFlag: null,
       showmediate: false,
-      formZipData: {}
+      formZipData: {},
+      nationalityList: [
+        {
+          value: '国内',
+          id: 0
+        },
+        {
+          value: '国外',
+          id: 1
+        }
+      ],
+      idTypeList: [
+        {
+          value: '身份证',
+          id: 0
+        },
+        {
+          value: '护照',
+          id: 1
+        }
+      ]
     };
   },
   watch: {
     },
     addVisable(val) {
       if (val) {
-        if(this.addModifyData == 1){
+        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);
+            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.activeName = "first";
         this.showmediate = false;
         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获取对应信息 */
           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;
         }
-        // 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, '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, '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, '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.formData.affiliate.applicationName = null;
-        // this.formData.affiliate.code = null;
-        // this.formData.affiliate.applicationEmail = null;
-        // this.formData.affiliate.applicationPhone = null;
       }
       this.$refs["ruleForm"].clearValidate()
     },

src/views/register.vue

           <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" />
         confirmPassword: "",
         code: "",
         uuid: "",
+        nationality:0,
+        idType:0
       },
       registerRules: {
         userName: [
             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: "请再次输入您的密码" },
         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

 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
-const API = 'http://121.40.189.20:7001'  //生产
+// 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