Merge branch 'dev-patients-20190513' of...

Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513

src/views/followup/plan-manage/dialog/has-selected-patient.vue

@@ -28,7 +28,7 @@
             min-width="70px">
           </el-table-column>
           <el-table-column
-            prop="id"
+            prop="idNo"
             label="身份证号"
             align="center"
             min-width="220">

src/views/patients/labels-manage/dialog/select-patitents.vue

@@ -466,10 +466,28 @@
         this.$refs.multipleTable.bodyWrapper.scrollTop = 0;
       },
       clickClose(){
+//        this.searchData.searchCondition = ''
+        this.searchData = {
+          sex: null,
+            ageRange: [],
+            diseaseId: [],
+            labelId: [],
+            fuPlanIdList: [],
+            searchCondition: ''
+        }
         this.$emit('closeSelectPatient',false)
       },
       sureClick(){
         if(this.newSelects.length) {
+//          this.searchData.searchCondition = ''
+          this.searchData = {
+            sex: null,
+            ageRange: [],
+            diseaseId: [],
+            labelId: [],
+            fuPlanIdList: [],
+            searchCondition: ''
+          }
           this.$emit('sureSelectPatient',false,this.newSelects,this.oldPatientList)
         } else {
           this.$message.warning('请先选择!')