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/style/patient-manager/new-patient/new-patient.less

 .newly-increased-wrap{
   #msg{
-    width:200px !important;
-    height:200px !important;
+    width: 180px !important;
+    height: 180px !important;
+    padding: 10px;
   }
   .top-title{
     border: 0 !important;
@@ -330,6 +331,7 @@
               background: #449284;
               width: 200px;
               border: 0;
+              margin-top: -3px;
             }
           }
           .time-limit{

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/followup/plan-manage/plan-modify.vue

@@ -344,7 +344,7 @@
             people = {
               nickname: item.patientName,
               age: item.age,
-              id: item.idNo,
+              idNo: item.idNo,
               mobilePhone: item.mobilePhone,
               labelId: item.labelName,
               patientId: item.patientId

src/views/home.vue

@@ -143,7 +143,7 @@ export default {
     },
     // 挂载到Dom完成时
     mounted: function() {
-        commonUtil.resizeHeight()
+        // commonUtil.resizeHeight()
     },
     methods: {
       ...mapActions('workbench', ['getTodayPlansList', 'getTodayAppointsList', 'getTodayOverview']),
@@ -355,7 +355,8 @@ export default {
                 text-align: center;
                 img {
                     width: 100px;
-                    margin-top: 17%;
+                    // margin-top: 17%;
+                    margin: 6% 0 6%;
                 }
             }
         }

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('请先选择!')

src/views/patients/labels-manage/labels-list.vue

@@ -14,7 +14,7 @@
         <el-col :span="6" class="right">
           <el-button 
             type="primary" size="small" class="create-new-label" 
-            :disabled="labelNameList.length >= 999"
+            :disabled="totalListCount >= 9"
             @click="createNewLabel"
             >
             新增分组

src/views/patients/not-complete/not-complete-list.vue

@@ -243,6 +243,7 @@
         border-bottom: 1px solid #efefef;
       }
       .blank-wrap {
+        position: relative;
         @media screen and (min-width:1240px) and (max-width:1545px){
           height: 300px;
         }
@@ -253,6 +254,10 @@
           height: 600px;
         }
         .blank-content {
+          position: absolute;
+          left: 50%;
+          top: 50%;
+          transform: translate(-50%, -50%);
           text-align: center;
           img {
             width: 100px;