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-wrap.less

@@ -42,16 +42,18 @@
       }
     }
     .el-table__body-wrapper{
-      .el-table_1_column_1 .cell{
-        width: 100%;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        // -webkit-box-orient: vertical;
-        /*! autoprefixer: off */
-        -webkit-box-orient: vertical;
-        /* autoprefixer: on */
-        -webkit-line-clamp: 2;
-        overflow: hidden; 
+      .el-table__row{
+        td:nth-child(1) .cell{
+          width: 100%;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          // -webkit-box-orient: vertical;
+          /*! autoprefixer: off */
+          -webkit-box-orient: vertical;
+          /* autoprefixer: on */
+          -webkit-line-clamp: 2;
+          overflow: hidden; 
+        }
       }
     }
   }

src/views/home.vue

@@ -307,11 +307,11 @@ export default {
                 background: #fff;
                 @media screen and (min-width:1240px) and (max-width:1900px) {
                   width: 95%;
-                  height: 320px !important;
+                  // height: 320px !important;
                 }
                 @media screen and (min-width:1900px) {
                   width: 96.7%;
-                  height: 400px !important;
+                  // height: 400px !important;
                 }
                 .message-title {
                     font-size: 20px;

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

@@ -117,10 +117,10 @@
         :show-close='false'
         :close-on-click-modal="false"
         >
-        <div class="delete-tips">分组删除后，所有分组具名（共{{searchData.totalRows}}人）将不再属于此分组。</div>
+        <div class="delete-tips">分组删除后，所有分组居民（共{{searchData.totalRows}}人）将不再属于此分组。</div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="cancelDeleteLabel">取 消</el-button>
-          <el-button type="primary" @click="confirmDeleteLabel">确认移除</el-button>
+          <el-button type="primary" @click="confirmDeleteLabel">确认删除</el-button>
         </span>
       </el-dialog>
       <el-dialog

src/views/patients/new-manage/components/batch-import.vue

@@ -211,7 +211,7 @@
                 import_type: 2,
             };
             if( process.env.BUILD_ENV == "development" ){
-              req.token = '77DDB524DE0742B19CEC759CA463F3A5'
+              req.token = '428006DCF6DD45FB9BAD640FEF6ACE4B'
             }else{
               // req.token = self._token;
               req.token = localStorage.getItem('storageToken');