Merge branch 'dev-followUp-20190312' of...

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

src/store/followup/planManage.js

@@ -154,7 +154,8 @@ export default {
     getResidentDetail(context, payload) {
       getResidentDetail(
         payload.planId,
-        payload.patientId
+        payload.patientId,
+        payload.fuPlanPatientId
       ).then(({data}) => {
         context.commit('GET_RESIDENT_DETAIL', data);
       });

src/utils/followup/followapis.js

@@ -108,10 +108,10 @@ export const getFollowStartTimeList = (planId) => {
     description: '获取随访开始时间列表（居民相关）',
   })
 };
-export const getResidentDetail = (planId,patientId) => {
+export const getResidentDetail = (planId,patientId,fuPlanPatientId ) => {
   return fetch({
     headers,
-    url: getFollowUpSC(`/followup/planPatient/${planId}/detail/${patientId}`),
+    url: getFollowUpSC(`/followup/planPatient/${planId}/detail/${patientId}?planPatientsId=${fuPlanPatientId}`),
     method: 'get',
     description: '获取居民详情',
   })

src/views/followup/plan-manage/dialog/add-patient-time.vue

@@ -5,7 +5,7 @@
       :visible.sync="showAddPatientTime"
       v-if="showThisPage"
       :before-close="clickClose"
-      width="33%"
+      width="35%"
       center>
       <div class="finish-content">
         <el-form

src/views/followup/plan-manage/dialog/finish-followup.vue

@@ -92,7 +92,8 @@
                 } else if(this.$route.name == 'residentDetail') {
                   this.getResidentDetail({
                     planId,
-                    patientId: patientIdList[0]
+                    patientId: patientIdList[0],
+                    fuPlanPatientId: planPatientsIdList[0]
                   })
                 }
 

src/views/followup/plan-manage/dialog/select-patient.vue

 <template>
-  <div class="follow-time">
+  <div class="select-patient-dialog">
     <el-dialog
       title="选择居民"
       :visible.sync="showSelectPatient"
@@ -7,6 +7,7 @@
       :before-close="clickClose"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
+      top="25px"
       width="65%"
       center>
       <div class="finish-content">
@@ -236,7 +237,6 @@
       },
     },
     methods: {
-
       checkboxInit(row,index){
         if(row.disableNum == undefined) {
           return 1
@@ -417,13 +417,38 @@
   }
 </script>
 
-<style scoped lang="scss">
-.select-width{
-  .el-form-item{
-    width: 130px;
-  }
-}
-  .margin-top20{
-    margin-top: 20px;
+<style lang="scss">
+  .select-patient-dialog {
+    .el-dialog__wrapper {
+      overflow: hidden;
+      .el-dialog--center {
+        height: 95%;
+        .el-dialog__body {
+          max-height: 80%;
+          overflow-y: scroll;
+          &::-webkit-scrollbar{
+            width:5px;
+          }
+          &::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+            border-radius: 10px;
+            -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+            background: rgba(0,0,0,0.1);
+          }
+          .finish-content {
+            height: 100%;
+          }
+        }
+      }
+
+    }
+    .select-width .el-form-item{
+      width: 130px;
+    }
+    .margin-top20{
+      margin-top: 20px;
+    }
   }
+
+
+
 </style>

src/views/followup/plan-manage/plan-modify.vue

@@ -197,9 +197,9 @@
         this.newHasSelectedList = this.newHasSelectedList.concat(newAddPatientList);
         if(this.newHasSelectedList.length > this.hasSelectedList.length) {
           this.showAddPatientTime = true;
-          if(showNames.length>4) {
+          if(showNames.length>5) {
             const le = showNames.length
-            showNames = showNames.slice(0,4)
+            showNames = showNames.slice(0,5)
             showNames = `${showNames.join('、')}等${le}人`
           } else {
             showNames = showNames.join('、')

src/views/followup/plan-manage/resident-detail.vue

@@ -143,7 +143,8 @@
     mounted() {
       this.getResidentDetail({
         patientId: this.$route.query.patientId,
-        planId: this.$route.query.planId
+        planId: this.$route.query.planId,
+        fuPlanPatientId: this.$route.query.fuPlanPatientId
       }); //获取居民详情
       this.getGroupList(); //获取分组列表
     },
@@ -185,7 +186,7 @@
           patientIdList: patientIdList,
           title: this.status==3?'恢复随访':'结束随访',
           reasonName: this.status==3?'恢复原因：':'结束原因：',
-          planPatientsIdList: this.residentDetail.planPatientsId
+          planPatientsIdList: planPatientsIdList
         }
         this.showFinishFollowup = true;
       },
@@ -199,7 +200,9 @@
     watch: {
       timeNodeList(val) {
         console.log('val1',val)
-        this.timeNodes = val[0].id
+        if(val&&val.length) {
+          this.timeNodes = val[0].id
+        }
       },
       timeNodes(val) {
         this.getNodeTimeContent(val)

src/views/followup/plan-manage/resident-list.vue

@@ -77,7 +77,7 @@
             label="姓名"
             align="center">
             <template slot-scope="scope">
-              <el-button type="text" @click="goPatientDetail(scope.row.patientId)" >{{scope.row.patientName}}</el-button>
+              <el-button type="text" @click="goPatientDetail(scope.row.patientId, scope.row.fuPlanPatientId)" >{{scope.row.patientName}}</el-button>
             </template>
           </el-table-column>
           <el-table-column
@@ -255,8 +255,8 @@
           planId: this.$route.query.planId
         })
       },
-      goPatientDetail(patientId) { //居民详情页
-        let residentCrumbs = []
+      goPatientDetail(patientId, fuPlanPatientId) { //居民详情页
+        let residentCrumbs = [];
         if(this.residentCrumb.length === 3) {
           residentCrumbs = [
             {
@@ -302,7 +302,9 @@
         }
 
         this.setResidentCrumb(residentCrumbs);
-        this.$router.push({path: '/followup/plan-manage/resident-detail', query: {patientId: patientId, planId: this.$route.query.planId}})
+        this.$router.push({path: '/followup/plan-manage/resident-detail', query: {patientId: patientId,
+            planId: this.$route.query.planId,
+            fuPlanPatientId: fuPlanPatientId}})
 
       },
       searchResidentList() { //查询居民列表
@@ -315,6 +317,10 @@
       },
       resetSearchData(formName) {
         this.$refs[formName].resetFields();
+        this.getResidentList({
+          planId: this.$route.query.planId,
+          status: this.status
+        });
       },
       changePlan(row) {
         this.planChangeData = {
@@ -350,9 +356,9 @@
             planPatientsIdList.push(item.fuPlanPatientId)
           });
           console.log(patientIds)
-          if(patientNames.length>4) {
+          if(patientNames.length>5) {
             const le = patientNames.length
-            patientNames = patientNames.slice(0,4)
+            patientNames = patientNames.slice(0,5)
             patientNames = `${patientNames.join('、')}等${le}人`
           } else {
             patientNames = patientNames.join('、')
@@ -407,9 +413,9 @@
           patientIds.push(item.patientId)
           patientNames.push(item.nickname)
         })
-        if(patientNames.length>4) {
+        if(patientNames.length>5) {
           const le = patientNames.length
-          patientNames = patientNames.slice(0,4)
+          patientNames = patientNames.slice(0,5)
           patientNames = `${patientNames.join('、')}等${le}人`
         } else {
           patientNames = patientNames.join('、')
@@ -441,7 +447,7 @@
           this.statusTotal = val.notCount
         } else if (this.status == 2) {
           this.statusTotal = val.handCount
-        } else if (_this.status == 3) {
+        } else if (this.status == 3) {
           this.statusTotal = val.yesCount
         }
 

src/views/followup/reservation-manage/reservation-list.vue

@@ -253,6 +253,9 @@
       },
       resetSearchData(formName) {
         this.$refs[formName].resetFields();
+        this.getReservationList({
+          status: this.status
+        });
       },
       async goPatientDetail(row) { //预约详情页
         await this.getEnteringInfo({patientId: row.patientId,fuPlanPatientTimesId: row.fuPlanPatientTimesId});

src/views/layout/header.vue

@@ -73,7 +73,7 @@ export default {
     box-sizing: border-box;
     height: 64px;
     width: 100%;
-    z-index: 99999;
+    z-index: 1000;
     font-size: 22px;
     line-height: 64px;
     color: #fff;