Merge branch 'dev-card-20190808' into release

src/views/patients/mypatients-manage/basic-info.vue

@@ -75,7 +75,12 @@
               setTimeout(() => {
                 this.$router.go(-1);
               },500)
-            }else {
+            } else if(data.code == '202562'){
+              this.$message.error(data.message);
+              setTimeout(() => {
+                this.$router.go(-1);
+              },1000)
+            } else {
               this.$message.error(data.message);
             }
           })

src/views/patients/mypatients-manage/components/edit-information.vue

@@ -82,6 +82,8 @@
                 @blur="idNoBlurHandler"
                 :disabled="hasIdNo">
               </el-input>
+              <span class="idNoTxt">身份证只能输入一次<br>输入后不可更改</span>
+              <!--<div style="display: inline"><p class="title">身份证只能输入一次<br>输入后不可更改</p></div>-->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -794,5 +796,8 @@
   .ml10{
     margin-left: 10px;
   }
+  .idNoTxt{
+    display: inline-flex;color:#C0C4CC;line-height:20px;vertical-align: middle;
+  }
 }
 </style>