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/dialog/select-patitents.vue

@@ -24,6 +24,7 @@
             <div>
               <el-form-item style="width: 100px;" prop="sex">
                 <el-select
+                  style="width: 100px;"
                   v-model="searchData.sex"
                   placeholder="请选择性别"
                   clearable>
@@ -42,6 +43,7 @@
                   collapse-tags
                   filterable
                   placeholder="请选择年龄段"
+                  style="width: 100px;"
                   clearable>
                   <el-option
                     v-for="(item,index) in ageOptions"
@@ -51,7 +53,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item prop="diseaseId">
+              <el-form-item prop="diseaseId" style="width: 150px;">
                 <el-select
                   v-model="searchData.diseaseId"
                   multiple
@@ -67,7 +69,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item prop="labelId">
+              <el-form-item prop="labelId" style="width: 150px;">
                 <el-select
                   v-model="searchData.labelId"
                   multiple
@@ -84,7 +86,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item prop="fuPlanIdList" v-if="selectPatientType == 1">
+              <el-form-item prop="fuPlanIdList" v-if="selectPatientType == 1" style="width: 150px;">
                 <el-select
                   v-model="searchData.fuPlanIdList"
                   multiple
@@ -101,7 +103,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item prop="searchCondition">
+              <el-form-item prop="searchCondition" style="width:150px;">
                 <el-input
                   v-model="searchData.searchCondition"
                   placeholder="请输入姓名,手机号,身份证"
@@ -162,7 +164,7 @@
           </el-table-column>
           <el-table-column
             prop="showDiseaseNames"
-            label="基础疾病"
+            label="诊断"
             align="center"
             width="180"
             :show-overflow-tooltip="true">
@@ -204,6 +206,18 @@
         <el-button type="primary" size="small" @click="sureClick">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      class="reload-label-modal"
+      :visible.sync="showReloadModal"
+      width="320px"
+      :show-close="false"
+      :close-on-click-modal="false"
+      center>
+      <p class="tips">您刚才跳转到新增居民页面进行新增居民，请点击下方按钮刷新数据</p>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleReload">重新加载</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -251,6 +265,7 @@
         fuPlanOptions: [],
         newSelects: [], //新选中的人
         oldPatientList: [],
+        showReloadModal: false,
         getRowKeys(row) {
           return row.patientId;
         },
@@ -444,9 +459,16 @@
         this.getPatientsList();
       },
       goAddPatient() {
-        this.$router.push({
-          path: '/patients-manage/new-manage/new-patient'
-        })
+        // this.$router.push({
+        //   path: '/patients-manage/new-manage/new-patient'
+        // })
+        let routeData = this.$router.resolve({ path: '/patients-manage/new-manage/new-patient' });
+        window.open(routeData.href, '_blank');
+        this.showReloadModal = true;
+      },
+      handleReload() {
+        this.getPatientsList();
+        this.showReloadModal = false;
       },
       ageDate(val){
         let ageObj;

src/views/patients/mypatients-manage/components/edit-information.vue

@@ -41,6 +41,7 @@
                 v-model="diseaseIdList"
                 multiple
                 @change="changeDiseases"
+                :popper-append-to-body="false"
                 placeholder="请选择居民疾病诊断">
                 <el-option
                   v-for="(item, index) in diseasesList"
@@ -57,6 +58,7 @@
                 v-model="labelIdList"
                 multiple
                 @change="changeLabels"
+                :popper-append-to-body="false"
                 placeholder="请选择居民分组">
                 <el-option
                   v-for="(item, index) in labelsList"
@@ -92,6 +94,7 @@
                 value="yyyy-MM-dd"
                 @change="getAge"
                 :picker-options="setPickerOption"
+                :editable="false"
                 style="width:250px"
                 clearable>
               </el-date-picker>
@@ -119,6 +122,7 @@
               <el-select
                 v-model="patientInfoForm.permanentResidence"
                 placeholder="请选择居民常驻类型"
+                :popper-append-to-body="false"
                 clearable>
                 <el-option
                   v-for="(item, index) in residenceList"
@@ -134,6 +138,7 @@
               <el-select
                 v-model="patientInfoForm.nationality"
                 placeholder="请选择民族"
+                :popper-append-to-body="false"
                 clearable>
                 <el-option
                   v-for="(item, index) in nationsList"
@@ -300,7 +305,7 @@
           customLabels: [],
           idNo: '',
           birthTime: '',
-          age: '',
+          age: null,
           sex: null,
           permanentResidence: '',
           nationality: '',
@@ -415,6 +420,9 @@
           this.initForm();
         }
       },
+      // 'patientInfoForm.age'(val) {
+      //   console.log('年龄',val)
+      // },
       checkForm(val){
         if(val){// 触发校验
           this.saveInfoData();
@@ -451,7 +459,7 @@
           customLabels: [],
           idNo: '',
           birthTime: '',
-          age: '',
+          age: null,
           sex: null,
           permanentResidence: '',
           nationality: '',
@@ -477,7 +485,7 @@
           }
         });
         getLabelList({
-          type: 1,
+          type: 2,
           token: this._token,
         }).then((data) => {
           if(data.code == '000000') {
@@ -753,6 +761,9 @@
   }
 </script>
 <style lang="scss">
+  .screenSet{
+    overflow: visible!important;
+  }
   .el-input{
     width: 250px;
   }

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

@@ -5,7 +5,7 @@
       :curmbSecond="curmbSecond">
     </bread-crumb>
     <section class="not-complete-content screenSet">
-      <h1 class="page-title">我的居民：共{{pagination.totalRows}}人</h1>
+      <h1 class="page-title">我的居民：共{{pagination.totalRows ? pagination.totalRows : 0}}人</h1>
       <div class="search-div">
         <div class="search-input">
           <el-form :model="searchData" ref="searchData" :inline="true" label-width="100px">