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/App.vue

@@ -88,7 +88,8 @@ export default {
 					vm.token = paramMap["token"]
 					localStorage.setItem('storageToken', vm.token)
           if(href.indexOf("mypatients-manage/patients-list") > -1) {
-            vm.$router.push({ path: 'patients-manage/mypatients-manage/patients-list' })
+            // vm.$router.push({ path: 'patients-manage/mypatients-manage/patients-list' })
+            vm.$router.push({ path: 'patients-list' })
           }else {
             vm.$router.push({ path: 'home' })
           }

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

@@ -97,6 +97,7 @@
       :patientIdList="baseInfo.patientIdList"
       @closeSelectPatient="closeSelectPatient"
       @sureSelectPatient="sureSelectPatient(arguments)"
+      :selectPatientType="selectPatientType"
     />
     <has-selected-patient
       v-if="isShowSelectedDialog"
@@ -109,7 +110,8 @@
 
 <script>
   import BreadCrumb from '@/components/breadcrumb'
-  import SelectPatient from '@/views/followup/plan-manage/dialog/select-patient';
+  // import SelectPatient from '@/views/followup/plan-manage/dialog/select-patient';
+  import SelectPatient from '@/views/patients/labels-manage/dialog/select-patitents';
   import HasSelectedPatient from '@/views/followup/plan-manage/dialog/has-selected-patient';
   import SetTimeNode from '@/views/followup/plan-manage/dialog/set-time-node';
   import { createFollowPlan, getFollowupTableTemplate } from '@/utils/followup/followapis'
@@ -151,6 +153,7 @@
         },
         isShowSelectPatient: false,
         isShowSelectedDialog: false,
+        selectPatientType: 1,
         hasSelectedList: [],
         rules: {
           name: [{ required: true, message: '请输入随访计划名称', trigger: 'blur' }],

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

@@ -66,7 +66,8 @@
       :patientIdList="planDetailData.patientIdList"
       :oldPatientIdList="selectResidentIdList"
       @closeSelectPatient="closeSelectPatient"
-      @sureSelectPatient="sureSelectPatient(arguments)">
+      @sureSelectPatient="sureSelectPatient(arguments)"
+      :selectPatientType="selectPatientType">
     </select-patient>
     <has-selected-patient
       v-if="isShowSelectedDialog"
@@ -83,7 +84,8 @@
 </template>
 
 <script>
-  import SelectPatient from '@/views/followup/plan-manage/dialog/select-patient';
+  // import SelectPatient from '@/views/followup/plan-manage/dialog/select-patient';
+  import SelectPatient from '@/views/patients/labels-manage/dialog/select-patitents';
   import HasSelectedPatient from '@/views/followup/plan-manage/dialog/has-selected-patient';
   import SetTimeNode from '@/views/followup/plan-manage/dialog/set-time-node';
 
@@ -144,6 +146,7 @@
         newHasSelectedList: [],
         initResidentList: [], //重置需要的居民列表
         initResidentIdList: [],  //重置需要的id
+        selectPatientType: 1,
       }
     },
     created() {

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

@@ -136,7 +136,8 @@
       :patientIdList="initialPatientIdList"
       :oldPatientIdList="initialPatientIdList"
       @closeSelectPatient="closeSelectPatient"
-      @sureSelectPatient="sureSelectPatient(arguments)">
+      @sureSelectPatient="sureSelectPatient(arguments)"
+      :selectPatientType="selectPatientType">
     </select-patient>
     <add-patient-time
       :showThisPage="showAddPatientTime"
@@ -151,7 +152,8 @@
   //结束随访dialog
   import FinishFollowup from '@/views/followup/plan-manage/dialog/finish-followup';
   //添加居民
-  import SelectPatient from '@/views/followup/plan-manage/dialog/select-patient';
+  // import SelectPatient from '@/views/followup/plan-manage/dialog/select-patient';
+  import SelectPatient from '@/views/patients/labels-manage/dialog/select-patitents';
   //添加居民选择随访时间
   import addPatientTime from '@/views/followup/plan-manage/dialog/add-patient-time';
 
@@ -189,6 +191,7 @@
         statusTotal: null, //每种状态的总数
         planTitle: '',  //随访计划名称
         residentCrumb: [], //面包屑
+        selectPatientType: 1,
         getRowKeys(row) {
           return row.patientId;
         },

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

@@ -17,7 +17,7 @@
           :inline="true"
           class="select-width"
           size="small">
-          <div style="display: flex;justify-content: flex-end;margin-bottom: 10px">
+          <div style="display: flex;justify-content: flex-end;margin-bottom: 15px">
             <el-button plain size="small" @click="goAddPatient">+ 新增居民</el-button>
           </div>
           <div style="display: flex;justify-content: space-between;">
@@ -35,11 +35,12 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item style="width: 140px;" prop="ageRange">
+              <el-form-item style="width: 100px;" prop="ageRange">
                 <el-select
                   v-model="searchData.ageRange"
                   multiple
                   collapse-tags
+                  filterable
                   placeholder="请选择年龄段"
                   clearable>
                   <el-option
@@ -55,7 +56,7 @@
                   v-model="searchData.diseaseId"
                   multiple
                   collapse-tags
-                  style="width: 200px;"
+                  style="width: 150px;"
                   placeholder="请选择诊断"
                   clearable>
                   <el-option
@@ -72,7 +73,7 @@
                   multiple
                   collapse-tags
                   filterable
-                  style="width: 200px;"
+                  style="width: 150px;"
                   placeholder="请选择或搜索分组"
                   clearable>
                   <el-option
@@ -83,12 +84,29 @@
                   </el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item prop="fuPlanIdList" v-if="selectPatientType == 1">
+                <el-select
+                  v-model="searchData.fuPlanIdList"
+                  multiple
+                  collapse-tags
+                  filterable
+                  style="width: 150px;"
+                  placeholder="请选择随访计划"
+                  clearable>
+                  <el-option
+                    v-for="(item,index) in fuPlanOptions"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item prop="searchCondition">
                 <el-input
                   v-model="searchData.searchCondition"
                   placeholder="请输入姓名,手机号,身份证"
                   clearable
-                  style="width:200px;">
+                  style="width:150px;">
                   <!--<i slot="prefix" class="el-input__icon el-icon-search" @click="searchHandler" style="cursor: pointer"></i>-->
                 </el-input>
               </el-form-item>
@@ -104,7 +122,7 @@
           ref="multipleTable"
           center
           style="width: 100%;margin-top: 10px;"
-          height="280"
+          height="250"
           :row-key="getRowKeys"
           @selection-change="handleSelectionChange">
           <el-table-column
@@ -156,8 +174,18 @@
             width="180"
             :show-overflow-tooltip="true">
           </el-table-column>
+          <el-table-column
+            v-if="selectPatientType == 1"
+            prop="fuPlanName"
+            label="随访计划"
+            align="center"
+            width="180"
+            :show-overflow-tooltip="true">
+          </el-table-column>
         </el-table>
-        <el-row type="flex" justify="end" class="margin-top15">
+        <el-row type="flex" justify="space-between" align="middle" class="margin-top15">
+          <!--<span>已选：{{newSelects.length}}人</span>-->
+          <span></span>
           <el-pagination
             background
             v-if="patientsData.length"
@@ -182,6 +210,7 @@
 <script>
   import { mapState, mapActions } from 'vuex'
   import { getConstants, getPatientInfoList, getDiseasesList, getLabelList } from '@/utils/patients/patientsapi'
+  import { getPlanList } from '@/utils/followup/followapis'
   export default {
     components: {},
     name: "select-patient",
@@ -198,6 +227,7 @@
           ageRange: [],
           diseaseId: [],
           labelId: [],
+          fuPlanIdList: [],
           searchCondition: ''
         },
         paginationSet: {
@@ -218,6 +248,7 @@
         labelOptions: [
           // {labelId: '', labelName: '分组'}
         ],
+        fuPlanOptions: [],
         newSelects: [], //新选中的人
         getRowKeys(row) {
           return row.patientId;
@@ -229,13 +260,13 @@
       patientIdList: Array,// 确定已经选过的居民
       oldPatientIdList: Array,// 确定已经选过的居民
       selectPatientType: Number, //获取居民列表所需字段，随访是1,分组是2，患教是3
-      fuPlanIdList: {
-        required: false,
-        type: Array,
-        default: function () {
-          return [];
-        }
-      }, //获取居民列表所需字段，若是随访，则需要传值
+      // fuPlanIdList: {
+      //   required: false,
+      //   type: Array,
+      //   default: function () {
+      //     return [];
+      //   }
+      // }, //获取居民列表所需字段，若是随访，则需要传值
     },
     watch: {
       isShowSelectPatient(val){
@@ -254,7 +285,7 @@
               // {no: '', value: '年龄范围'}
             ];
             this.ageOptions = this.ageOptions.concat(res.data.P057);//年龄段
-          })
+          });
 
           // 获取所有疾病
           getDiseasesList().then(res=>{
@@ -262,7 +293,7 @@
               // {diseaseId: '', diseaseName: '基础疾病'}
             ];
             this.diseaseOptions = this.diseaseOptions.concat(res.data);
-          })
+          });
 
           // 获取所有分组
           getLabelList({type: 1}).then(res=>{
@@ -270,6 +301,15 @@
               // {labelId: '', labelName: '分组'}
             ]
             this.labelOptions = this.labelOptions.concat(res.data.labelNameList);
+          });
+
+        //  获取随访计划列表
+          getPlanList({
+            pageNo: -1,
+          }).then(res => {
+            if(res.code == '000000') {
+              this.fuPlanOptions = res.data.fPlanDtoList;
+            }
           })
         }
       },
@@ -293,7 +333,7 @@
           searchCondition:this.searchData.searchCondition,
           srvPackageId:this.srvPackageId,
           addType: this.selectPatientType,   //随访是1,分组是2，患教是3
-          fuPlanIdList: this.fuPlanIdList,
+          fuPlanIdList: this.searchData.fuPlanIdList || [],
         }
         getPatientInfoList(data).then(res=>{
           if(res.data.patientList){
@@ -443,7 +483,7 @@
     .el-dialog__wrapper {
       overflow: hidden;
       .el-dialog--center {
-        height: 580px;
+        /*height: 580px;*/
         .el-dialog__body{
           padding: 10px 25px 15px;
         }
@@ -480,7 +520,17 @@
       margin-top: 15px;
     }
     .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item{
-      margin-bottom: 8px;
+      margin-bottom: 5px;
+    }
+    .el-select__tags-text{
+      display: inline-block;
+      max-width: 86px;
+      overflow: hidden;
+      text-overflow:ellipsis;
+      white-space: nowrap;
+    }
+    .el-select .el-tag__close.el-icon-close{
+      top: -5px;
     }
   }