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

src/views/caseManagement/components/addCase.vue

@@ -135,7 +135,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="选择机构或自然人">
-                <el-radio-group v-model="item.applicant.organizeFlag" :disabled="modelFlag" @change="clearValidate">
+                <el-radio-group v-model="item.applicant.organizeFlag" :disabled="modelFlag" @change="clearValidate($event,index)">
                   <el-radio :label="0">自然人</el-radio>
                   <el-radio :label="1">机构</el-radio>
                 </el-radio-group>
@@ -423,7 +423,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="选择机构或自然人">
-                <el-radio-group v-model="item.res.organizeFlag" :disabled="modelFlag" @change="clearValidateRes">
+                <el-radio-group v-model="item.res.organizeFlag" :disabled="modelFlag" @change="clearValidateRes($event,index)">
                   <el-radio :label="0">自然人</el-radio>
                   <el-radio :label="1">机构</el-radio>
                 </el-radio-group>
@@ -1239,8 +1239,8 @@ export default {
         }
       });
     },
-    clearValidate(val) {
-      console.log(val)
+    clearValidate(val,index) {
+     if(index==0){
       if (val == 0) {
         this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName);
         this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard);
@@ -1249,7 +1249,7 @@ export default {
         this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType);
         this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality);
         if (this.formZipData.affiliate) {
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0);
+          // this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0);
           this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
           this.$set(this.formData, 'facts', this.formZipData.facts);
           this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName);
@@ -1269,7 +1269,7 @@ export default {
         this.$set(this.formData.affiliate.applicant[0].applicantAgent, "email", this.getUserInfoList.email);
         this.$set(this.formData.affiliate.applicant[0].applicantAgent, "phone", this.getUserInfoList.phonenumber);
         if (this.formZipData.affiliate) {
-          this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 1);
+          // this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 1);
           this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
           this.$set(this.formData, 'facts', this.formZipData.facts);
           this.$set(this.formData.affiliate.applicant[0].applicant, 'name', this.formZipData
@@ -1299,12 +1299,15 @@ export default {
           this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', null);
         }
       }
+     }
+      
       this.$refs["ruleForm"].clearValidate()
     },
-    clearValidateRes(val) {
-      if (val == 0) {
+    clearValidateRes(val,index) {
+      if(index==0){
+        if (val == 0) {
         if (this.formZipData.affiliate) {
-          this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);
+          // this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);
           this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
           this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
           this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
@@ -1315,7 +1318,7 @@ export default {
         }
       } else if (val == 1) {
         if (this.formZipData.affiliate) {
-          this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 1);
+          // this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 1);
           this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
           this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
           this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
@@ -1324,8 +1327,11 @@ export default {
           this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
           this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
         }
+        this.$set(this.formData.affiliate.res[0].res, 'name', null)
+				this.$set(this.formData.affiliate.res[0].res, 'home', null)
+      }
       }
-      console.log(val)
+      
       this.$refs["ruleForm"].clearValidate()
     },
     cancel() {

src/views/caseManagement/components/mediation.vue

@@ -56,7 +56,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="是否用印申请" v-if="formData.mediaResult == 1">
+          <el-form-item label="是否用印申请" v-if="formData.mediaResult == 1&& mediationData.mediationMethod=='1'">
              <el-radio-group v-model="formData.sealFlag" :disabled="!selectRoido">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>

src/views/login.vue

@@ -279,8 +279,15 @@ export default {
     // H5轮询获取E证通Token状态
     getSelectPCEIDtokenStatus(data) {
       selectPCEIDtokenStatus(data).then((res) => {
-        if (res.data.Text.ErrCode == 0) {
-          this.$router.push(this.pathVal);
+        if (res.data.certificationStatus == 0) {
+          // this.$router.push(this.pathVal);
+          this.$router.push({
+            path:this.pathVal,
+            query:{
+              identityNo:res.data.identityNo,
+              name:res.data.name
+            }
+          })
         }
       });
     },

src/views/register.vue

@@ -144,7 +144,9 @@ export default {
         code: "",
         uuid: "",
         nationality:0,
-        idType:0
+        idType:0,
+        identityNo:"",
+        name:""
       },
       registerRules: {
         userName: [
@@ -241,6 +243,9 @@ export default {
     this.getCode();
     this.getListRole();
     this.getIdTypeFn();
+    this.registerForm.identityNo = this.$route.query.identityNo;
+    this.registerForm.name = this.$route.query.name;
+    console.log(this.$route.query.identityNo)
   },
   methods: {
     changeInput(){