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/patients/labels-manage/labels-detail.vue

@@ -26,9 +26,11 @@
         :data="searchData.tableData"
         tooltip-effect="dark"
         style="width: 100%"
+        :row-key="getRowKeys"
         @selection-change="handleSelectionChange">
         <el-table-column
           type="selection"
+          :reserve-selection="true"
           width="55">
         </el-table-column>
         <el-table-column
@@ -78,7 +80,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :total="searchData.totalRows"
-        :current-page="1"
+        :current-page="searchData.pageNo"
         :page-sizes="[15, 30, 50, 100]"
         :page-size="searchData.pageSize"
         layout="total, sizes, prev, pager, next, jumper">
@@ -192,6 +194,10 @@
         singleDeleteInfo: [],
         multipleSelection: [],
         selectPatientType: 2, //选择居民时需要的type类型
+        getRowKeys(row) {
+          // console.log('>>>> ', row)
+          return row.id;
+        },
       }
     },
     components: {
@@ -228,6 +234,7 @@
           pageNo: this.searchData.pageNo,
           pageSize: this.searchData.pageSize,
         };
+        
         getLabelDetail(labelId, params).then(data => {
           // console.log('获取分组详情>> ', data)
           if(data.data){
@@ -235,6 +242,23 @@
             // this.patientIdList = data.data.patientIdList;
             let list = data.data.patientListsByLabelModels;
             if(list && list.length > 0){
+              list = list.map(item => {
+                if(!item.nickname){
+                  item.nickname = '-';
+                };
+                if(!item.sexStr){
+                  item.sexStr = '-';
+                };
+                if(item.patientAge || item.patientAge == 0){
+                  // 直接显示
+                }else{
+                  item.patientAge = '-';
+                };
+                if(!item.patientTypeGroup){
+                  item.patientTypeGroup = '-';
+                }
+                return item;
+              })
               this.searchData.tableData = list;
             }else{
               this.searchData.tableData = [];
@@ -251,7 +275,6 @@
         this.getDetail();
       },
       handleCurrentChange(val){
-        console.log('handleCurrentChange>>>', val)
         // 切换当前页
         this.searchData.pageNo = val;
         this.getDetail();
@@ -395,7 +418,8 @@
               type: 'success'
             });
             this.showDeletePatientsDialog = false;
-            this.getDetail();
+            // 删除后去第一页
+            this.handleCurrentChange(1);
           }else{
             this.$message({
               message: '请求接口失败，请重新再试',

src/views/patients/mypatients-manage/patient-detail.vue

@@ -80,7 +80,7 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="健康记录" name="second">
-            <div class="health-record-wrap">
+            <div class="health-record-wrap" v-show="recordList.length">
               <div class="health-record-list"
                    v-show="recordList.length"
                    v-infinite-scroll="loadMore"
@@ -114,7 +114,7 @@
               </div>
             </div>
             <div class="no-record-content" v-if="!recordList.length">
-              <div>
+              <div class="no-record-info">
                 <img src="../../../assets/image/no-content1.png"/>
                 <p>暂无随访记录或您没有权限访问</p>
               </div>
@@ -535,6 +535,12 @@
       }
       text-align: center;
       padding: 50px 0 60px;
+      .no-record-info{
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -60%);
+      }
       img{
         width: 120px;
       }

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

@@ -78,7 +78,8 @@
           align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.sex==1">男</span>
-            <span v-if="scope.row.sex==2">女</span>
+            <span v-else-if="scope.row.sex==2">女</span>
+            <span v-else>-</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -86,6 +87,10 @@
           label="年龄"
           width="80"
           align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.age || (scope.row.age==0)">{{scope.row.age}}</span>
+            <span v-else>-</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="showLabelName"

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

@@ -253,8 +253,27 @@
             let data = res.data.importRecordsModelList;
             if(data && data.length > 0){
               data = data.map(item => {
+                if(!item.fileName){
+                  item.fileName = '-';
+                }
+                if(!item.uploadTime) {
+                  item.uploadTime = '-';
+                }
+                if(item.insertCount || item.insertCount == 0) {
+                  // 直接显示
+                }else{
+                  item.insertCount = '-';
+                }
+                if(item.updateCount || item.updateCount == 0) {
+                  // 直接显示
+                }else{
+                  item.updateCount = '-';
+                }
+                if(!item.status) {
+                  item.status = '-';
+                }
                 if(!item.reason) {
-                  item.reason = '-'
+                  item.reason = '-';
                 }
                 return item;
               });

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

@@ -26,7 +26,8 @@
           width="100"
           lign="center">
           <template slot-scope="scope">
-            <img class="user-photo" :src="scope.row.headimgurl"/>
+            <img v-if="scope.row.headimgurl" class="user-photo" :src="scope.row.headimgurl"/>
+            <span v-else>-</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -34,16 +35,28 @@
           width="200"
           label="微信昵称"
           align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.wechatUsername">{{scope.row.wechatUsername}}</span>
+            <span v-else>-</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="country"
           label="地区"
           align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.country">{{scope.row.country}}</span>
+            <span v-else>-</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="wechatCreatedTime"
           label="添加时间"
           align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.wechatCreatedTime">{{scope.row.wechatCreatedTime}}</span>
+            <span v-else>-</span>
+          </template>
         </el-table-column>
         <el-table-column
           label="操作"