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/router/patients.js

@@ -105,10 +105,10 @@ const patientsRouters = {
       path: 'not-complete',
       component: notCompleteManage,
       name: 'notCompleteManage',
-      redirect: 'not-complete/not-complete',
+      redirect: 'not-complete/uncompleted-list',
       children: [
         {
-          path: 'not-complete',
+          path: 'uncompleted-list',
           component: notCompleteList,
           name: 'notCompleteList',
           meta: {

src/utils/patients/patientsapi.js

@@ -19,6 +19,15 @@ export const getConstants = (params) => {
 
 
 /*居民管理*/
+export const getPatientList = (data) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`healths/patients/infolist`),
+    method: 'post',
+    data: data,
+    description: '获取居民列表',
+  })
+};
 export const getDiseasesList = (params) => {
   return fetch({
     headers,
@@ -71,21 +80,30 @@ export const getNotCompleteList = (params) => {
     description: '获取资料不全居民列表',
   })
 };
-export const sendCompleteMessage = (params) => {
+export const sendCompleteMessage = (data) => {
   return fetch({
     headers,
     url: getBaseUrl(`healths/patients/remind`),
     method: 'post',
-    data: params,
+    data: data,
     description: '提醒居民完善信息',
   })
 };
-export const getNotCompleteCount = (params) => {
+export const sendCompleteMessageList = (data) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`healths/patients/list/remind`),
+    method: 'post',
+    data: data,
+    description: '批量提醒居民完善信息',
+  })
+};
+export const getNotCompleteCount = (data) => {
   return fetch({
     headers,
     url: getBaseUrl(`healths/patients/uncomplate/counts`),
     method: 'get',
-    data: params,
+    data: data,
     description: '获取未完善居民人数',
   })
 };

src/views/layout/slidebar.vue

@@ -11,7 +11,7 @@
                           <p class="redNum"
                              v-if="subItem.title == '资料不全居民'
                                &&notCompleteCount
-                               &&$route.path!='/patients-manage/not-complete/not-complete'"
+                               &&$route.path!='/patients-manage/not-complete/uncompleted-list'"
                           >
                             <span v-if="notCompleteCount>999">+999</span>
                             <span v-else>{{notCompleteCount}}</span>
@@ -103,7 +103,7 @@ export default {
                       {
                         title: '资料不全居民',
                         icon: 'el-icon-setting',
-                        index: 'patients-manage/not-complete/not-complete'
+                        index: 'patients-manage/not-complete/uncompleted-list'
                       }
                     ]
                 }

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

@@ -78,7 +78,10 @@
 
 <script>
   import BreadCrumb from '../../../components/breadcrumb.vue'
-  import { getNotCompleteList, sendCompleteMessage, getNotCompleteCount } from '../../../utils/patients/patientsapi'
+  import { getNotCompleteList,
+    sendCompleteMessage,
+    getNotCompleteCount,
+    sendCompleteMessageList} from '../../../utils/patients/patientsapi'
   export default {
     name: "not-complete",
     components: {
@@ -99,9 +102,6 @@
         selectList: []
       }
     },
-    created() {
-      //const vm = this;
-    },
     mounted() {
       this.getNotComplete()
       this.getNotCompleteNum()
@@ -125,15 +125,14 @@
           pageSize,
         }).then((data) => {
           if(data.code == "000000") {
-            this.notCompleteList = data.data
-            console.log('1212',this.notCompleteList)
+            this.notCompleteList = data.data;
           }
-        }).catch(function (error) {
+        }).catch((error) => {
           this.$message({
             message: error,
             type: 'error'
           });
-        });
+        })
       },
       sendMessageSingle(item) { //发送单个提醒
         sendCompleteMessage({
@@ -151,33 +150,59 @@
               type: 'error'
             });
           }
-        }).catch(function (error) {
+        }).catch((error) => {
           this.$message({
             message: error,
             type: 'error'
           });
-        });
+        })
 
       },
-      sendCompleteMessageMultiple(item) {
-          if(!this.selectList.length) {
+      sendCompleteMessageMultiple() {
+        if(!this.selectList.length) {
+          this.$message({
+            message: '请选择居民',
+            type: 'warning'
+          });
+          return;
+        }
+        let patientIdList = []
+        this.selectList.forEach(item => {
+          patientIdList.push(item.patientId)
+        })
+        sendCompleteMessageList({
+          qrcodeType: 1,
+          patientIds: patientIdList,
+        }).then((data) => {
+          if(data.code == "000000") {
             this.$message({
-              message: '请选择居民',
-              type: 'warning'
+              message: '已向居民发送提醒',
+              type: 'success'
+            });
+          }else {
+            this.$message({
+              message: data.message,
+              type: 'error'
             });
           }
+        }).catch((error) => {
+          this.$message({
+            message: error,
+            type: 'error'
+          });
+        })
       },
       getNotCompleteNum() {
         getNotCompleteCount().then((data) => {
           if(data.code == "000000") {
             this.pagination.totalRows = data.data;
           }
-        }).catch(function (error) {
+        }).catch((error) => {
           this.$message({
             message: error,
             type: 'error'
           });
-        });
+        })
       }
     }
   }
@@ -245,6 +270,7 @@
     .el-pagination.is-background .el-pager li:not(.disabled).active {
       background: #449284 !important;
     }
+
   }