Merge branch 'master' of http://git.shengws.com/csx/Pad_New

config/dev.env.js

@@ -5,10 +5,10 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"https://api.xt.kuyicloud.com"'
-
   BASE_API: '"http://localhost:9529"'
-   //http://api.xt.test.sgjyun.com http://localhost:9529
-   // BASE_API: '"http://api.xt.test.sgjyun.com"'
+  //BASE_API: '"http://localhost:9529"'
+  //http://api.xt.test.sgjyun.com http://localhost:9529
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // BASE_API: '"https://api.xt.kuyicloud.com"'
 
 })

config/prod.env.js

@@ -1,7 +1,8 @@
 "use strict";
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"https://api.xt.kuyicloud.com"'
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
+  // BASE_API: '"https://api.xt.kuyicloud.com"'
   // BASE_API:'"http://localhost:9529"',
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com

src/App.vue

@@ -31,9 +31,11 @@ export default {
       document.body.scrollTop = 0;
       document.documentElement.scrollTop = 0;
     }
-  },created(){
-    console.log("111111")
   },
+  created() {
+
+    console.log("111111");
+  }
 };
 </script>
 

src/api/home.js

@@ -0,0 +1,22 @@
+
+import request from '@/utils/request'
+
+export function GetHomeData(){
+  return request({
+    url:'/m/api/home',
+    method:'get',
+  })
+}
+
+
+export function ChangeOrg(params){
+  return request({
+    url:'/m/api/changeorg',
+    method:'post',
+    params: params
+  })
+}
+
+
+
+

src/api/patient/patient.js

@@ -76,6 +76,7 @@ export function GetPatientInfo(phone) {
 }
 
 export function savePatient(data) {
+  console.log('data', data)
   return request({
     url: '/m/api/patient/savepatient',
     method: 'post',
@@ -250,3 +251,152 @@ export function GetPatientDetail(id, params) {
     params: params
   })
 }
+
+export function getRescueRecord(id, limit, page, startime, endtime) {
+  const params = {
+    id: id,
+    limit: limit,
+    page: page,
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/m/api/patient/getrescuerecord',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getScheduling(id, limit, page, startime, endtime, mode_types) {
+  const params = {
+    id: id,
+    limit: limit,
+    page: page,
+    startime: startime,
+    endtime: endtime,
+    mode_types: mode_types
+  }
+  return request({
+    url: '/m/api/patient/getscheduling',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getEducation(id, limit, page, startime, endtime) {
+  const params = {
+    id: id,
+    limit: limit,
+    page: page,
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/m/api/patient/geteducation',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getSchedulingDetail(id, params) {
+  return request({
+    url: '/m/api/patient/getschedulingdetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function DeleteScheduling(id, params) {
+  return request({
+    url: '/m/api/patient/deletescheduling?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}
+
+export function getEducationDetail(id, params) {
+  return request({
+    url: '/m/api/patient/geteducationdetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function DeleteEducationOne(id, params) {
+  return request({
+    url: '/m/api/patient/deleteeductionone?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}
+
+export function getRescueRecordDetail(id, params) {
+  return request({
+    url: '/m/api/patient/getrescuerecorddetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function DeleteRescueRecord(id, params) {
+  return request({
+    url: '/m/api/patient/deleterescuerecord?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}
+
+export function toSearchPatient(keyword) {
+  const params = {
+    keyword: keyword
+  }
+  return request({
+    url: '/m/api/patient/tosearchepatient',
+    method: 'get',
+    params: params
+  })
+}
+
+export function SearchAllPatient(keyword) {
+  const params = {
+    keyword: keyword
+  }
+  return request({
+    url: '/m/api/patient/searchallpatient',
+    method: 'get',
+    params: params
+  })
+}
+
+export function SearchAllBlood(keyword) {
+  const params = {
+    keyword: keyword
+  }
+  return request({
+    url: '/m/api/patient/searchallblood',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getSlowSearchPatient(keyword) {
+  const params = {
+    keyword: keyword
+  }
+  return request({
+    url: '/m/api/patient/getslowsearchepatient',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getMemberSearchPatient(keyword) {
+  const params = {
+    keyword: keyword
+  }
+  return request({
+    url: '/m/api/patient/getmembersearchpatient',
+    method: 'get',
+    params: params
+  })
+}

src/libs/clearStyle.js

@@ -0,0 +1,14 @@
+export function clearStyle(value) {
+  value.map(item => {
+    let content = item.content.replace(/<.+?>/g, "");
+    // console.log(content);
+    /* 去除  */
+    content = content.replace(/ /gi, "");
+    // console.log(content);
+    /* 去除空格 */
+    content = content.replace(/\s/gi, "");
+    // console.log(content);
+    item.content = content;
+  });
+  return value;
+}

src/pages/allEducation/index.vue

@@ -0,0 +1,131 @@
+<template>
+  <div class="page_allEducation">
+    <van-sticky>
+      <div class="allEducationTitle">
+        <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
+        <span class="titleName">{{ education.name }}的宣教信息</span>
+      </div>
+    </van-sticky>
+    <div class="courseBox">
+      <div class="courseOne">
+        <div class="statOrder">
+          <p class="time">{{ getTime(education.assessment_date) }}</p>
+          <div class="orderContent">
+            <p>
+              {{ education.mission }}
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getEducationDetail } from "@/api/patient/patient";
+import { uParseTime } from "@/utils/tools";
+import { setRem, setHeight } from "@/libs/functionRem";
+import "../../styles/resetStyle.scss";
+export default {
+  props: {
+    active: Number
+  },
+  data() {
+    return {
+      patientid: 0,
+      active: 0,
+      education: {}
+    };
+  },
+  methods: {
+    toReturn() {
+      this.$router.push(
+        "/patientdetail?patientid=" + this.patientid + "&active=" + this.active
+      );
+    },
+    getEducationDetail(id) {
+      getEducationDetail(id).then(response => {
+        if (response.data.state === 1) {
+          var education = response.data.data.education;
+          console.log("宣教详情", education);
+          this.education = education;
+        }
+      });
+    },
+    getTime(time) {
+      // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, "{y}-{m}-{d}");
+    }
+  },
+  created() {
+    this.active = parseInt(this.$route.query.active);
+    setRem();
+    setHeight();
+    var id = this.$route.query.id;
+    console.log("id", id);
+    var patientid = this.$route.query.patientid;
+    this.patientid = patientid;
+    console.log("patientid", patientid);
+    this.getEducationDetail(id);
+  }
+};
+</script>
+<style lang="scss" scoped>
+.page_allEducation {
+  height: 100%;
+  overflow-y: auto;
+  .allEducationTitle {
+    background: #fff;
+    padding: 0 1.125rem;
+    height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 5.5rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .courseBox {
+    padding: 0 1.125rem;
+    margin-bottom: 3.125rem;
+  }
+  .courseOne {
+    box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+    padding-bottom: 1.25rem;
+    .time {
+      font-size: 1.125rem;
+      margin-top: 0.625rem;
+      font-weight: bold;
+    }
+  }
+  .statOrderTitle {
+    color: #5b98ff;
+    font-size: 0.8125rem;
+    font-weight: bold;
+    margin: 0.625rem 0;
+  }
+  .orderContent {
+    font-size: 0.875rem;
+    color: rgba(49, 50, 52, 1);
+    p {
+      line-height: 1.125rem;
+    }
+  }
+  .doctorBox {
+    font-size: 0.75rem;
+    color: rgba(152, 152, 152, 1);
+    line-height: 1.125rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 0.625rem;
+  }
+}
+::-webkit-scrollbar {
+  width: 0;
+}
+</style>

src/pages/allLongDialysis/index.vue

@@ -0,0 +1,75 @@
+<template>
+  <div class="page_allLongDialysis">
+    <van-sticky>
+      <div class="allLongDialysisTitle">
+        <i class="iconfont icon-zuojiantou jiantou"></i>
+        <span class="titleName">张三的长期透析处方</span>
+      </div>
+    </van-sticky>
+    <div class="dialysisBox">
+      <div class="dialysisBoxOne">
+        <p class="time">2019.01.01</p>
+        <div class="orderContent">
+          <p>透析模式：HD</p>
+          <p>透析时长(h/min)：2h30min</p>
+          <p>血流量(ml/min)：12</p>
+          <p>目标超滤量(ml)：1200ml</p>
+          <p>透析配方：1200ml</p>
+          <p>抗凝剂：1200ml</p>
+          <p>首剂(mg)：1200ml</p>
+          <p>维持(mg/h)：1200ml</p>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.page_allLongDialysis {
+  height: 100%;
+  overflow-y: auto;
+  .allLongDialysisTitle {
+    background: #fff;
+    padding: 0 1.125rem;
+    height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 4.5rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .dialysisBox {
+    padding: 0 1.125rem;
+    margin-bottom: 3.125rem;
+  }
+  .dialysisBoxOne {
+    box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+    padding-bottom: 1.25rem;
+    .time {
+      font-size: 1.125rem;
+      margin-top: 0.625rem;
+      font-weight: bold;
+    }
+  }
+  .orderContent {
+    font-size: 0.875rem;
+    color: rgba(49, 50, 52, 1);
+    margin-top: 0.625rem;
+    display: flex;
+    flex-wrap: wrap;
+    p {
+      line-height: 1.5rem;
+      width: 50%;
+    }
+  }
+}
+::-webkit-scrollbar {
+  width: 0;
+}
+</style>

src/pages/allRescue/index.vue

@@ -0,0 +1,134 @@
+<template>
+  <div class="page_allRescue">
+    <van-sticky>
+      <div class="allRescueTitle">
+        <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
+        <span class="titleName">{{ recorddetail.name }}的抢救记录</span>
+      </div>
+    </van-sticky>
+    <div class="courseBox">
+      <div class="courseOne">
+        <div class="statOrder">
+          <p class="time">{{ getTime(recorddetail.record_time) }}</p>
+          <div class="orderContent">
+            <p>
+              {{ recorddetail.content }}
+            </p>
+          </div>
+          <div class="doctorBox">
+            <p>记录医生：{{ recorddetail.user_name }}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getRescueRecordDetail } from "@/api/patient/patient";
+import { uParseTime } from "@/utils/tools";
+import { setRem, setHeight } from "@/libs/functionRem";
+import "../../styles/resetStyle.scss";
+export default {
+  props: {
+    active: Number
+  },
+  data() {
+    return {
+      patientid: 0,
+      active: 0,
+      recorddetail: {}
+    };
+  },
+  methods: {
+    getRescueRecordDetail(id) {
+      getRescueRecordDetail(id).then(response => {
+        if (response.data.state === 1) {
+          var recorddetail = response.data.data.recordDetail;
+          this.recorddetail = recorddetail;
+          console.log("记录详情", recorddetail);
+        }
+      });
+    },
+    toReturn() {
+      this.$router.push(
+        "/patientdetail?patientid=" + this.patientid + "&active=" + this.active
+      );
+    },
+    getTime(time) {
+      // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, "{y}-{m}-{d}");
+    }
+  },
+  created() {
+    this.active = parseInt(this.$route.query.active);
+    setRem();
+    setHeight();
+    var id = this.$route.query.id;
+    console.log("id", id);
+    var patientid = this.$route.query.patientid;
+    this.patientid = patientid;
+    console.log("patientid", patientid);
+    this.getRescueRecordDetail(id);
+  }
+};
+</script>
+<style lang="scss" scoped>
+.page_allRescue {
+  height: 100%;
+  overflow-y: auto;
+  .allRescueTitle {
+    background: #fff;
+    padding: 0 1.125rem;
+    height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 5.5rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .courseBox {
+    padding: 0 1.125rem;
+    margin-bottom: 3.125rem;
+  }
+  .courseOne {
+    box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+    padding-bottom: 1.25rem;
+    .time {
+      font-size: 1.125rem;
+      margin-top: 0.625rem;
+      font-weight: bold;
+    }
+  }
+  .statOrderTitle {
+    color: #5b98ff;
+    font-size: 0.8125rem;
+    font-weight: bold;
+    margin: 0.625rem 0;
+  }
+  .orderContent {
+    font-size: 0.875rem;
+    color: rgba(49, 50, 52, 1);
+    p {
+      line-height: 1.125rem;
+    }
+  }
+  .doctorBox {
+    font-size: 0.75rem;
+    color: rgba(152, 152, 152, 1);
+    line-height: 1.125rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 0.625rem;
+  }
+}
+::-webkit-scrollbar {
+  width: 0;
+}
+</style>

src/pages/allScheduling/index.vue

@@ -0,0 +1,171 @@
+<template>
+  <div class="page_allScheduling">
+    <van-sticky>
+      <div class="allSchedulingTitle">
+        <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
+        <span class="titleName">{{ name }}的排班信息</span>
+      </div>
+    </van-sticky>
+    <div class="dialysisBox">
+      <div class="dialysisBoxOne">
+        <p class="time">{{ getTime(schedulingDetail.schedule_date) }}</p>
+        <div class="orderContent">
+          <p>班次：{{ schedulingDetail.schedule_type }}</p>
+          <p>分区：{{ schedulingDetail.name }}</p>
+          <p>机号：{{ schedulingDetail.number }}</p>
+          <p>治疗模式：{{ schedulingDetail.mode_id }}</p>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getSchedulingDetail } from "@/api/patient/patient";
+import { uParseTime } from "@/utils/tools";
+import { setRem, setHeight } from "@/libs/functionRem";
+import "../../styles/resetStyle.scss";
+export default {
+  data() {
+    return {
+      name: "",
+      schedulingDetail: {},
+      patientid: 0,
+      active: 0
+    };
+  },
+  methods: {
+    getSchedulingDetail(id) {
+      getSchedulingDetail(id).then(response => {
+        if (response.data.state === 1) {
+          var schedulingDetail = response.data.data.schedulingDetail;
+          if (schedulingDetail.mode_id == 1) {
+            schedulingDetail.mode_id = "HD";
+          }
+          if (schedulingDetail.mode_id == 2) {
+            schedulingDetail.mode_id = "HDF";
+          }
+          if (schedulingDetail.mode_id == 3) {
+            schedulingDetail.mode_id = "HD+HP";
+          }
+          if (schedulingDetail.mode_id == 4) {
+            schedulingDetail.mode_id = "HP";
+          }
+          if (schedulingDetail.mode_id == 5) {
+            schedulingDetail.mode_id = "HF";
+          }
+          if (schedulingDetail.mode_id == 6) {
+            schedulingDetail.mode_id = "SCUF";
+          }
+          if (schedulingDetail.mode_id == 7) {
+            schedulingDetail.mode_id = "IUF";
+          }
+          if (schedulingDetail.mode_id == 8) {
+            schedulingDetail.mode_id = "HFHD";
+          }
+          if (schedulingDetail.mode_id == 9) {
+            schedulingDetail.mode_id = "HFHD+HP";
+          }
+          if (schedulingDetail.mode_id == 10) {
+            schedulingDetail.mode_id = "PHF";
+          }
+          if (schedulingDetail.mode_id == 11) {
+            schedulingDetail.mode_id = "HFR";
+          }
+          if (schedulingDetail.mode_id == 12) {
+            schedulingDetail.mode_id = "HDF+HP";
+          }
+          if (schedulingDetail.mode_id == 13) {
+            schedulingDetail.mode_id = "CRRT";
+          }
+          if (schedulingDetail.mode_id == 14) {
+            schedulingDetail.mode_id = "腹水回输";
+          }
+          if (schedulingDetail.schedule_type == 1) {
+            schedulingDetail.schedule_type = "上午";
+          }
+          if (schedulingDetail.schedule_type == 2) {
+            schedulingDetail.schedule_type = "中午";
+          }
+          if (schedulingDetail.schedule_type == 3) {
+            schedulingDetail.schedule_type = "下午";
+          }
+          this.schedulingDetail = schedulingDetail;
+          console.log("排班详情", schedulingDetail);
+          var patient = response.data.data.patient;
+          this.name = patient.name;
+          console.log("patient", patient);
+        }
+      });
+    },
+    getTime(time) {
+      // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    toReturn() {
+      this.$router.push(
+        "/patientdetail?patientid=" + this.patientid + "&active=" + this.active
+      );
+    }
+  },
+  created() {
+    this.active = parseInt(this.$route.query.active);
+    setRem();
+    setHeight();
+    var id = this.$route.query.id;
+    console.log("id", id);
+    var patientid = this.$route.query.patientid;
+    console.log("patientid", patientid);
+    this.patientid = patientid;
+    this.getSchedulingDetail(id);
+  }
+};
+</script>
+<style lang="scss" scoped>
+.page_allScheduling {
+  height: 100%;
+  overflow-y: auto;
+  .allSchedulingTitle {
+    background: #fff;
+    padding: 0 1.125rem;
+    height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 5.5rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .dialysisBox {
+    padding: 0 1.125rem;
+    margin-bottom: 3.125rem;
+  }
+  .dialysisBoxOne {
+    box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+    padding-bottom: 1.25rem;
+    .time {
+      font-size: 1.125rem;
+      margin-top: 0.625rem;
+      font-weight: bold;
+    }
+  }
+  .orderContent {
+    font-size: 0.875rem;
+    color: rgba(49, 50, 52, 1);
+    margin-top: 0.625rem;
+    display: flex;
+    flex-wrap: wrap;
+    p {
+      line-height: 1.5rem;
+      width: 50%;
+    }
+  }
+}
+::-webkit-scrollbar {
+  width: 0;
+}
+</style>

src/pages/doctorAdvice/components/CourseManagement.vue

@@ -119,10 +119,14 @@ import {
   getPatientDetail
 } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
+import { clearStyle } from "@/libs/clearStyle";
 import Vue from "vue";
 import { Dialog } from "vant";
 const moment = require("moment");
 export default {
+  props: {
+    active: Number
+  },
   data() {
     return {
       newShow: false,
@@ -205,7 +209,7 @@ export default {
         if (response.data.state == 1) {
           var coursemanagement = response.data.data.coursemanagement;
           console.log("病程管理", coursemanagement);
-          this.courseManagement = coursemanagement;
+          this.courseManagement = clearStyle(coursemanagement);
           var total = response.data.data.total;
           this.total = total;
           console.log("总共", total);
@@ -256,7 +260,15 @@ export default {
       });
     },
     toCourseDetail(id) {
-      this.$router.push("/coursedetail?id=" + id);
+      var patientid = this.$route.query.patientid;
+      this.$router.push(
+        "/coursedetail?id=" +
+          id +
+          "&patientid=" +
+          patientid +
+          "&active=" +
+          this.active
+      );
     },
     getPatientDetail(patientid) {
       getPatientDetail(patientid).then(response => {

src/pages/doctorAdvice/components/DryWeight.vue

@@ -83,6 +83,9 @@ import { uParseTime } from "@/utils/tools";
 import { Dialog } from "vant";
 const moment = require("moment");
 export default {
+  props: {
+    active: Number
+  },
   data() {
     return {
       newShow: false,
@@ -173,7 +176,6 @@ export default {
       });
     },
     onLoad() {
-      console.log("触发没有");
       setTimeout(() => {
         for (let i = 0; i < this.limit; i++) {
           this.list.push(this.list.length + 1);
@@ -196,7 +198,7 @@ export default {
         if (this.list.length >= this.total) {
           this.finished = true;
         }
-      }, 1000);
+      }, 1);
     },
     getTime(time) {
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
@@ -230,7 +232,14 @@ export default {
     },
     getDryWeightDetail(id) {
       var patientid = this.$route.query.patientid;
-      this.$router.push("/dryweight?id=" + id + "&patientid=" + patientid);
+      this.$router.push(
+        "/dryweight?id=" +
+          id +
+          "&patientid=" +
+          patientid +
+          "&active=" +
+          this.active
+      );
     },
     getPatientDetail(patientid) {
       getPatientDetail(patientid).then(response => {

src/pages/doctorAdvice/components/Education.vue

@@ -22,33 +22,27 @@
           finished-text="没有更多了"
           @load="onLoad"
         >
-          <div class="adviceOne" v-for="item in 3" :key="index">
+          <div
+            class="adviceOne"
+            v-for="(item, index) in Education"
+            :key="index"
+          >
             <div class="adviceTitle">
-              <p>2019.09.01</p>
+              <p>{{ getTime(item.assessment_date) }}</p>
               <van-icon
                 class="ellipsis"
                 name="ellipsis"
-                @click="newShow = true"
+                @click="toDeleteEducation(item.id, item.index)"
               />
             </div>
             <div class="statOrder">
-              <div class="statOrderTitle">
-                <span>宣教标题</span>
-              </div>
               <div class="orderContent">
                 <p>
-                  病历书写基本规范2010》第二十二条规定：“病程记录
-                  是指继入院记录之后，对患者病情和诊疗过程所进行的
-                  连续性记录。内容包括患病历书写基本规范2010》第二十二条规定：“病程记录
-                  是指继入院记录之后，对患者病情和诊疗过程所进行的
-                  连续性记录。内容包括患
+                  {{ item.mission }}
                 </p>
               </div>
-              <div class="doctorBox">
-                <p>记录医生：钱蛮子</p>
-              </div>
             </div>
-            <div class="all">全部</div>
+            <div class="all" @click="toEducationDetail(item.id)">全部</div>
           </div>
         </van-list>
       </div>
@@ -65,18 +59,6 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup
-        v-model="typeShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
-        <van-picker
-          show-toolbar
-          :columns="columns"
-          @cancel="onCancel"
-          @confirm="onConfirm"
-        />
-      </van-popup>
       <van-popup
         v-model="startShow"
         position="bottom"
@@ -105,28 +87,51 @@
         v-model="newShow"
         :actions="actions"
         cancel-text="取消"
-        @cancel="onCancel"
+        @select="DeleteEducation"
       />
     </div>
   </div>
 </template>
 
 <script>
-import { getPatientDetail } from "@/api/patient/patient";
+import {
+  getPatientDetail,
+  getEducation,
+  DeleteEducationOne
+} from "@/api/patient/patient";
+import { uParseTime } from "@/utils/tools";
+import Vue from "vue";
+import { Dialog } from "vant";
+const moment = require("moment");
 export default {
+  props: {
+    active: Number
+  },
   data() {
     return {
       newShow: false,
       startShow: false,
       endShow: false,
-      startTime: "请选择",
-      endTime: "请选择",
+      startTime: moment()
+        .subtract(30, "days")
+        .format("YYYY-MM-DD"),
+      endTime: moment(new Date()).format("YYYY-MM-DD"),
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
       actions: [{ name: "编辑" }, { name: "删除" }],
       showOne: true,
-      showTwo: false
+      showTwo: false,
+      limit: 10,
+      page: 1,
+      total: 0,
+      loading: false,
+      finished: false,
+      list: [],
+      Education: [],
+      patient_id: "",
+      id: 0,
+      index: 0
     };
   },
   methods: {
@@ -183,11 +188,99 @@ export default {
           this.patientName = patientDetail.name;
         }
       });
+    },
+    getEducation(id) {
+      getEducation(
+        id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      ).then(response => {
+        if (response.data.state === 1) {
+          var education = response.data.data.education;
+          console.log("透后宣教", education);
+          let arr = this.Education;
+          arr.push(...education);
+          this.Education = arr;
+          var total = response.data.data.total;
+          console.log("total", total);
+          this.total = total;
+        }
+      });
+    },
+    onLoad() {
+      setTimeout(() => {
+        for (let i = 0; i < this.limit; i++) {
+          this.list.push(this.list.length + 1);
+        }
+        // 加载状态结束
+        this.loading = false;
+        console.log("长度", this.Education.length);
+        if (this.Education.length > 10) {
+          this.page++;
+        }
+        console.log("page是什么", this.page);
+        this.getEducation(
+          this.patient_id,
+          this.limit,
+          this.page,
+          this.startTime,
+          this.endTime
+        );
+        // 数据全部加载完成
+        if (this.list.length >= this.total) {
+          this.finished = true;
+        }
+      }, 1);
+    },
+    getTime(time) {
+      // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    toEducationDetail(id) {
+      var patientid = this.$route.query.patientid;
+      this.$router.push(
+        "/editEducation?id=" +
+          id +
+          "&patientid=" +
+          patientid +
+          "&active=" +
+          this.active
+      );
+    },
+    toDeleteEducation(id, index) {
+      this.id = id;
+      this.index = index;
+      this.newShow = true;
+    },
+    DeleteEducation(value) {
+      console.log("value", value);
+      if (value.name == "删除") {
+        this.DeleteEducationOne(this.id, this.index);
+      }
+    },
+    DeleteEducationOne(id, index) {
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteEducationOne(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+            console.log("msg", msg);
+            this.Education.splice(index, 1);
+            this.newShow = false;
+          }
+        });
+      });
     }
   },
   created() {
     var patientid = this.$route.query.patientid;
     this.getPatientDetail(patientid);
+    this.getEducation(patientid);
+    this.patient_id = patientid;
   }
 };
 </script>

src/pages/doctorAdvice/components/RescueRecord.vue

@@ -22,33 +22,30 @@
           finished-text="没有更多了"
           @load="onLoad"
         >
-          <div class="adviceOne" v-for="item in 3" :key="index">
+          <div
+            class="adviceOne"
+            v-for="(item, index) in this.rescueRecords"
+            :key="index"
+          >
             <div class="adviceTitle">
-              <p>2019.09.01</p>
+              <p>{{ getTime(item.record_time) }}</p>
               <van-icon
                 class="ellipsis"
                 name="ellipsis"
-                @click="newShow = true"
+                @click="toDeleteRescueRecord(item.id, item.index)"
               />
             </div>
             <div class="statOrder">
-              <div class="statOrderTitle">
-                <span>抢救标题</span>
-              </div>
               <div class="orderContent">
                 <p>
-                  病历书写基本规范2010》第二十二条规定：“病程记录
-                  是指继入院记录之后，对患者病情和诊疗过程所进行的
-                  连续性记录。内容包括患病历书写基本规范2010》第二十二条规定：“病程记录
-                  是指继入院记录之后，对患者病情和诊疗过程所进行的
-                  连续性记录。内容包括患
+                  <span v-html="item.content"></span>
                 </p>
               </div>
               <div class="doctorBox">
-                <p>记录医生：钱蛮子</p>
+                <p>记录医生：{{ item.user_name }}</p>
               </div>
             </div>
-            <div class="all">全部</div>
+            <div class="all" @click="toRescueRecord(item.id)">全部</div>
           </div>
         </van-list>
       </div>
@@ -64,18 +61,6 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup
-        v-model="typeShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
-        <van-picker
-          show-toolbar
-          :columns="columns"
-          @cancel="onCancel"
-          @confirm="onConfirm"
-        />
-      </van-popup>
       <van-popup
         v-model="startShow"
         position="bottom"
@@ -104,28 +89,51 @@
         v-model="newShow"
         :actions="actions"
         cancel-text="取消"
-        @cancel="onCancel"
+        @select="Delete"
       />
     </div>
   </div>
 </template>
 
 <script>
-import { getPatientDetail } from "@/api/patient/patient";
+import {
+  getPatientDetail,
+  getRescueRecord,
+  DeleteRescueRecord
+} from "@/api/patient/patient";
+import { uParseTime } from "@/utils/tools";
+import Vue from "vue";
+import { Dialog } from "vant";
+const moment = require("moment");
 export default {
+  props: {
+    active: Number
+  },
   data() {
     return {
       newShow: false,
       startShow: false,
       endShow: false,
-      startTime: "请选择",
-      endTime: "请选择",
+      startTime: moment()
+        .subtract(30, "days")
+        .format("YYYY-MM-DD"),
+      endTime: moment(new Date()).format("YYYY-MM-DD"),
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
       actions: [{ name: "编辑" }, { name: "删除" }],
       showOne: true,
-      showTwo: false
+      showTwo: false,
+      limit: 10,
+      page: 1,
+      total: 0,
+      loading: false,
+      finished: false,
+      rescueRecords: [],
+      patient_id: 0,
+      list: [],
+      id: 0,
+      index: 0
     };
   },
   methods: {
@@ -182,12 +190,98 @@ export default {
           this.patientName = patientDetail.name;
         }
       });
+    },
+    getRescueRecord(id) {
+      getRescueRecord(
+        id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      ).then(response => {
+        if (response.data.state === 1) {
+          var rescuerecord = response.data.data.rescuerecord;
+          console.log("抢救记录", rescuerecord);
+          let arr = this.rescueRecords;
+          arr.push(...rescuerecord);
+          this.rescueRecords = arr;
+          var total = response.data.data.total;
+          console.log("总计", total);
+        }
+      });
+    },
+    onLoad() {
+      setTimeout(() => {
+        for (let i = 0; i < this.limit; i++) {
+          this.list.push(this.list.length + 1);
+        }
+        // 加载状态结束
+        this.loading = false;
+        console.log("长度", this.rescueRecords.length);
+        if (this.rescueRecords.length > 10) {
+          this.page++;
+        }
+        console.log("page是什么", this.page);
+        this.getRescueRecord(
+          this.patient_id,
+          this.startTime,
+          this.endTimes,
+          this.limit,
+          this.page
+        );
+        // 数据全部加载完成
+        if (this.list.length >= this.total) {
+          this.finished = true;
+        }
+      }, 1000);
+    },
+    getTime(time) {
+      // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    toRescueRecord(id) {
+      var patientid = this.$route.query.patientid;
+      this.$router.push(
+        "/rescuerecord?id=" +
+          id +
+          "&patientid=" +
+          patientid +
+          "&active=" +
+          this.active
+      );
+    },
+    toDeleteRescueRecord(id, index) {
+      this.id = id;
+      this.index = index;
+      this.newShow = true;
+    },
+    Delete(value) {
+      if (value.name == "删除") {
+        this.DeleteRescueRecord(this.id, this.index);
+      }
+    },
+    DeleteRescueRecord(id, index) {
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteRescueRecord(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+            console.log("msg", msg);
+            this.rescueRecords.splice(index, 1);
+            this.newShow = false;
+          }
+        });
+      });
     }
   },
   created() {
     var patientid = this.$route.query.patientid;
     console.log("病人id能否获取", patientid);
+    this.patient_id = patientid;
     this.getPatientDetail(patientid);
+    this.getRescueRecord(patientid);
   }
 };
 </script>

src/pages/doctorAdvice/components/Scheduling.vue

@@ -28,22 +28,24 @@
           finished-text="没有更多了"
           @load="onLoad"
         >
-          <div class="adviceOne" v-for="item in 3" :key="index">
+          <div class="adviceOne" v-for="(item,index) in scheduLing" :key="index">
             <div class="adviceTitle">
-              <p>2019.09.01</p>
+              <p>{{getTime(item.schedule_date)}}</p>
               <van-icon
                 class="ellipsis"
                 name="ellipsis"
-                @click="newShow = true"
+                @click="toDelete(item.id,index)"
               />
             </div>
             <div class="orderContent">
-              <p>班次：HD</p>
-              <p>分区：2h30min</p>
-              <p>机号：12</p>
-              <p>治疗模式：1200ml</p>
+              <p>班次：
+                <span>{{item.schedule_type}}</span>
+              </p>
+              <p>分区：{{item.name}}</p>
+              <p>机号：{{item.number}}</p>
+              <p>治疗模式：{{item.mode_id}}</p>
             </div>
-            <div class="all">全部</div>
+            <div class="all" @click="toEditSchduling(item.id)">全部</div>
           </div>
         </van-list>
       </div>
@@ -99,7 +101,7 @@
         v-model="newShow"
         :actions="actions"
         cancel-text="取消"
-        @cancel="onCancel"
+        @select="onCancelOne"
       />
       </div>
     </div>
@@ -107,35 +109,46 @@
 </template>
 
 <script>
-import { getPatientDetail } from '@/api/patient/patient'
+import { getPatientDetail, getScheduling, DeleteScheduling } from '@/api/patient/patient'
+import { uParseTime } from '@/utils/tools'
+import Vue from 'vue'
+import { Dialog } from 'vant'
+const moment = require('moment')
 export default {
+  props: {
+    active: Number
+  },
   data () {
     return {
       newShow: false,
       typeShow: false,
       startShow: false,
       endShow: false,
-      type: '请选择',
-      columns: [
-        '杭州',
-        '宁波',
-        '温州',
-        '嘉兴',
-        '湖州',
-        '杭州',
-        '宁波',
-        '温州',
-        '嘉兴',
-        '湖州'
-      ],
-      startTime: '请选择',
-      endTime: '请选择',
+      type: '全部',
+      types: 0,
+      columns: ['HD', 'HDF', 'HD+HP', 'HP', 'HF', 'SCUF', 'IUF', 'HFHD', 'HFHD+HP', 'PHF', 'HFR', 'HDF+HP', 'CRRT', '腹水回输'],
+      startTime: moment()
+        .subtract(30, 'days')
+        .format('YYYY-MM-DD'),
+      endTime: moment(new Date()).format('YYYY-MM-DD'),
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
       actions: [{ name: '编辑' }, { name: '删除' }],
       showOne: true,
-      showTwo: false
+      showTwo: false,
+      limit: 10,
+      page: 1,
+      total: 0,
+      loading: false,
+      finished: false,
+      list: [],
+      patient_id: '',
+      scheduLing: [],
+      list: [],
+      id: 0,
+      index: 0
+
     }
   },
   methods: {
@@ -143,8 +156,55 @@ export default {
       this.typeShow = false
     },
     onConfirm (value) {
+      if (value === '全部') {
+        this.types = 0
+      }
+      if (value === 'HD') {
+        this.types = 1
+      }
+      if (value === 'HDF') {
+        this.types = 2
+      }
+      if (value === 'HD+HP') {
+        this.types = 3
+      }
+      if (value === 'HP') {
+        this.types = 4
+      }
+      if (value === 'HF') {
+        this.types = 5
+      }
+      if (value === 'SCUF') {
+        this.types = 6
+      }
+      if (value === 'IUF') {
+        this.types = 7
+      }
+      if (value === 'HFHD') {
+        this.types = 8
+      }
+      if (value === 'HFHD+HP') {
+        this.types = 9
+      }
+      if (value === 'PHF') {
+        this.types = 10
+      }
+      if (value === 'HFR') {
+        this.types = 11
+      }
+
+      if (value === 'HDF+HP') {
+        this.types = 12
+      }
+      if (value === 'CRRT') {
+        this.types = 13
+      }
+      if (value === '腹水回输') {
+        this.types = 14
+      }
       this.type = value
       this.typeShow = false
+      this.getScheduling(this.patient_id, this.limit, this.page, this.startTime, this.endTime, this.types)
     },
     getstartTime (value) {
       console.log(value)
@@ -192,11 +252,140 @@ export default {
           this.patientName = patientDetail.name
         }
       })
+    },
+    getScheduling (id) {
+      getScheduling(id, this.limit, this.page, this.startTime, this.endTime, this.types).then(response => {
+        if (response.data.state === 1) {
+          var scheduling = response.data.data.scheduling
+          for (let i = 0; i < scheduling.length; i++) {
+            if (scheduling[i].schedule_type === 1) {
+              scheduling[i].schedule_type = '上午'
+            }
+            if (scheduling[i].schedule_type === 2) {
+              scheduling[i].schedule_type = '中午'
+            }
+            if (scheduling[i].schedule_type === 3) {
+              scheduling[i].schedule_type = '下午'
+            }
+
+            if (scheduling[i].mode_id === 1) {
+              scheduling[i].mode_id = 'HD'
+            }
+            if (scheduling[i].mode_id === 2) {
+              scheduling[i].mode_id = 'HDF'
+            }
+            if (scheduling[i].mode_id === 3) {
+              scheduling[i].mode_id = 'HD+HP'
+            }
+            if (scheduling[i].mode_id === 4) {
+              scheduling[i].mode_id = 'HP'
+            }
+            if (scheduling[i].mode_id === 5) {
+              scheduling[i].mode_id = 'HF'
+            }
+            if (scheduling[i].mode_id === 6) {
+              scheduling[i].mode_id = 'SCUF'
+            }
+            if (scheduling[i].mode_id === 7) {
+              scheduling[i].mode_id = 'IUF'
+            }
+            if (scheduling[i].mode_id === 8) {
+              scheduling[i].mode_id = 'HFHD'
+            }
+            if (scheduling[i].mode_id === 9) {
+              scheduling[i].mode_id = 'HFHD+HP'
+            }
+            if (scheduling[i].mode_id === 10) {
+              scheduling[i].mode_id = 'PHF'
+            }
+            if (scheduling[i].mode_id === 11) {
+              scheduling[i].mode_id = 'HFR'
+            }
+            if (scheduling[i].mode_id === 12) {
+              scheduling[i].mode_id = 'HDF+HP'
+            }
+            if (scheduling[i].mode_id === 13) {
+              scheduling[i].mode_id = 'CRRT'
+            }
+            if (scheduling[i].mode_id === 14) {
+              scheduling[i].mode_id = '腹水回输'
+            }
+          }
+          let arr = this.scheduLing
+          arr.push(...scheduling)
+          console.log('班次', scheduling)
+          this.scheduLing = arr
+          var total = response.data.data.total
+          console.log('total', total)
+          this.total = total
+        }
+      })
+    },
+    getTime (time) {
+      // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, '{y}-{m}-{d}')
+    },
+    onLoad () {
+      setTimeout(() => {
+        for (let i = 0; i < this.limit; i++) {
+          this.list.push(this.list.length + 1)
+        }
+        // 加载状态结束
+        this.loading = false
+        console.log('长度', this.scheduLing.length)
+        if (this.scheduLing.length > 10) {
+          this.page++
+        }
+        console.log('page是什么', this.page)
+        this.getScheduling(
+          this.patient_id,
+          this.startTime,
+          this.endTimes,
+          this.limit,
+          this.page,
+          this.types
+        )
+        // 数据全部加载完成
+        if (this.list.length >= this.total) {
+          this.finished = true
+        }
+      }, 1000)
+    },
+    toEditSchduling (id) {
+      var patientid = this.$route.query.patientid
+      this.$router.push('/editScheduling?id=' + id + '&patientid=' + patientid + '&active=' + this.active)
+    },
+    toDelete (id, index) {
+      this.id = id
+      this.index = index
+      this.newShow = true
+    },
+    onCancelOne (value) {
+      if (value.name == '删除') {
+        this.DeleteScheduling(this.id, this.index)
+      }
+    },
+    DeleteScheduling (id, index) {
+      Dialog.confirm({
+        title: '删除提示!',
+        message: '确认删除该条信息吗?,删除后将无法恢复!'
+      }).then(() => {
+        DeleteScheduling(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg
+            console.log('msg', msg)
+            this.scheduLing.splice(index, 1)
+            this.newShow = false
+          }
+        })
+      })
     }
   },
   created () {
     var patientid = this.$route.query.patientid
     this.getPatientDetail(patientid)
+    this.getScheduling(patientid)
+    this.patient_id = patientid
   }
 }
 </script>

src/pages/doctorAdvice/index.vue

@@ -18,16 +18,22 @@
         <doctor-management v-if="active == 0"></doctor-management>
         <long-dialysis v-if="active == 1"></long-dialysis>
         <dialysis-record v-if="active == 2"></dialysis-record>
-        <dry-weight v-if="active == 3"></dry-weight>
+        <dry-weight v-if="active == 3" :active="active"></dry-weight>
         <inspection v-if="active == 4"></inspection>
-        <course-management v-if="active == 5"></course-management>
-        <rescue-record v-if="active == 6"></rescue-record>
-        <scheduling v-if="active == 7"></scheduling>
-        <education v-if="active == 8"></education>
-        <signs-record v-if="active == 9"></signs-record>
-        <recover-notes v-if="active == 10"></recover-notes>
-        <medication-plan v-if="active == 11"></medication-plan>
-        <device-management v-if="active == 12"></device-management>
+        <course-management
+          v-if="active == 5"
+          :active="active"
+        ></course-management>
+        <rescue-record v-if="active == 6" :active="active"></rescue-record>
+        <scheduling v-if="active == 7" :active="active"></scheduling>
+        <education v-if="active == 8" :active="active"></education>
+        <signs-record v-if="active == 9" :active="active"></signs-record>
+        <recover-notes v-if="active == 10" :active="active"></recover-notes>
+        <medication-plan v-if="active == 11" :active="active"></medication-plan>
+        <device-management
+          v-if="active == 12"
+          :active="active"
+        ></device-management>
       </van-tab>
     </van-tabs>
     <van-popup v-model="show" position="top" :style="{ height: '100%' }">
@@ -38,26 +44,25 @@
         <van-icon name="cross" />
       </div>
       <van-search
+        class="doctorAdviceSearch"
         v-model="value"
         placeholder="请输入病人名字"
         @cancel="onCancel"
         @search="onSearch"
       />
 
-      <van-index-bar class="indexBar" :sticky="false" highlight-color="#fb6463">
-        <van-index-anchor
-          v-for="(item, index) in firstNameTwo"
-          :key="index"
-          :index="index"
-        >
-          <span class="indexWord">{{ index }}</span>
+      <van-index-bar class="indexBar" sticky highlight-color="#fb6463">
+        <div v-for="(item, index) in firstNameTwo" :key="index" :index="index">
+          <van-index-anchor :index="index">
+            <!-- <span class="indexWord">{{ index }}</span> -->
+          </van-index-anchor>
           <van-cell
             @click="chooseCity(citem)"
             v-for="(citem, cindex) in item"
             :key="cindex"
             :title="citem"
           />
-        </van-index-anchor>
+        </div>
       </van-index-bar>
     </van-popup>
 
@@ -408,6 +413,9 @@ export default {
     }
   },
   created() {
+    if (this.$route.query.active) {
+      this.active = parseInt(this.$route.query.active);
+    }
     var patientid = this.$route.query.patientid;
     console.log("patientid", patientid);
     this.patient_id = patientid;
@@ -481,5 +489,21 @@ export default {
     display: flex;
     align-items: center;
   }
+  .van-tabs__line {
+    background: #5b98ff;
+  }
+  .van-tabs__nav {
+    > div:nth-of-type(2) {
+      flex-basis: 28% !important;
+    }
+  }
+  .doctorAdviceSearch {
+    .van-field__body {
+      width: 100%;
+    }
+  }
+  .van-popup {
+    transform: none;
+  }
 }
 </style>

src/pages/home/index.vue

@@ -100,7 +100,7 @@
             <div>商城</div>
           </van-tabbar-item>
         </router-link>
-        <router-link to="/my">
+        <router-link to="/newMy">
           <van-tabbar-item>
             <i class="iconfont icon-wode iconOne"></i>
             <div>我的</div>
@@ -156,6 +156,7 @@ export default {
   }
   .homeBottom {
     height: 3.125rem;
+    padding-bottom: env(safe-area-inset-bottom);
   }
   ::-webkit-scrollbar {
     width: 0;

src/pages/homeIndex/index.vue

@@ -4,160 +4,185 @@
       <div class="homeTitle">
         <div class="homeTitleLeft">
           <van-dropdown-menu>
-            <van-dropdown-item v-model="value1" :options="option1" />
+            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr"/>
           </van-dropdown-menu>
         </div>
         <div class="homeTitleRight">
-          <i class="iconfont icon-sousuo search1"></i>
-          <van-icon class="iconOne" name="comment-o" />
-          <van-icon class="iconOne" name="add-o" />
+          <i class="iconfont icon-sousuo search1" @click="toSearch"></i>
+          <van-icon class="iconOne" name="comment-o"/>
+          <van-icon class="iconOne" name="add-o"/>
         </div>
       </div>
     </van-sticky>
     <div class="banner">
-      <!-- <img src="../../assets/images/homebanner.jpg" alt /> -->
       <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
-        <van-swipe-item>
-          <img src="../../assets/images/banner_03.png" alt />
+        <van-swipe-item v-for="(banner, index) in this.banners" @click="jump(banner.url)" :key="index">
+          <img :src="banner.thumb" alt />
         </van-swipe-item>
-        <!-- <van-swipe-item>
-          <img src="../../assets/images/homebanner.jpg" alt />
-        </van-swipe-item>
-        <van-swipe-item>
-          <img src="../../assets/images/homebanner.jpg" alt />
-        </van-swipe-item>
-        <van-swipe-item>
-          <img src="../../assets/images/homebanner.jpg" alt />
-        </van-swipe-item>-->
       </van-swipe>
     </div>
-    <div class="noticeBox">
-      <i class="iconfont icon-public-notice notice"></i>
-      <!--<div class="noticeNews">-->
-        <!--<div>-->
-          <!--今日上机：-->
-          <!--<span>6&ensp;人</span>-->
-        <!--</div>-->
-        <!--<div>-->
-          <!--今日透析：-->
-          <!--<span>6&ensp;人</span>-->
-        <!--</div>-->
-        <!--<div>-->
-          <!--今日生日：-->
-          <!--<span>6&ensp;人</span>-->
-        <!--</div>-->
-      <!--</div>-->
-    </div>
+    <!--<div class="noticeBox">-->
+    <!--<i class="iconfont icon-public-notice notice"></i>-->
+    <!--<div class="noticeNews">-->
+    <!--<div>-->
+    <!--今日上机：-->
+    <!--<span>6&ensp;人</span>-->
+    <!--</div>-->
+    <!--<div>-->
+    <!--今日透析：-->
+    <!--<span>6&ensp;人</span>-->
+    <!--</div>-->
+    <!--<div>-->
+    <!--今日生日：-->
+    <!--<span>6&ensp;人</span>-->
+    <!--</div>-->
+    <!--</div>-->
+    <!--</div>-->
     <div class="background1"></div>
-    <div class="management">
+    <div class="management" v-if="this.$store.getters.user.admin.id ==  this.$store.getters.user.org.creator">
       <div class="managementTitle">
         <div class="managementName">
           管理控制台
           <span>（仅管理员可见）</span>
         </div>
-        <div class="setting"><van-icon name="setting-o" />管理</div>
+        <div class="setting">
+          <van-icon name="setting-o"/>
+          管理
+        </div>
       </div>
       <div class="managementBox">
         <div class="managementOne">
-          <img src="../../assets/images/M1.png" alt />员工管理
+          <img src="../../assets/images/M1.png" alt/>员工管理
         </div>
         <div class="managementOne">
-          <img src="../../assets/images/M2.png" alt />权限管理
-        </div>
-        <div class="managementOne">
-          <img src="../../assets/images/M3.png" alt />应用管理
+          <img src="../../assets/images/M2.png" alt/>权限管理
         </div>
+        <!--<div class="managementOne">-->
+          <!--<img src="../../assets/images/M3.png" alt/>应用管理-->
+        <!--</div>-->
         <div class="managementOne">
-          <img src="../../assets/images/M4.png" alt />机构管理
+          <img src="../../assets/images/M4.png" alt/>机构管理
         </div>
       </div>
     </div>
     <div class="application">
       <div class="applicationTitle">
         <div class="applicationName">应用工作台</div>
-        <div class="applicationService">+ 更多应用</div>
+        <!--<div class="applicationService">+ 更多应用</div>-->
       </div>
       <div class="applicationBox">
-        <div class="applicationOne" @click="toPatients">
-          <img src="../../assets/images/S1.png" alt />患者中心
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S2.png" alt />排班管理
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S3.png" alt />签到称重
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S4.png" alt />透析记录
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S5.png" alt />质控管理
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S6.png" alt />院感管理
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S7.png" alt />血管通路
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S8.png" alt />慢病管理
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S9.png" alt />SCRM
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S10.png" alt />分销商城
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S11.png" alt />设备管理
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S12.png" alt />库存管理
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S13.png" alt />客服中心
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S16.png" alt />质控上报
-        </div>
-        <div class="applicationOne">
-          <img src="../../assets/images/S17.png" alt />经营中心
+        <div v-for="(item, index) in this.apps" :key="index" class="applicationOne" @click="toPatients">
+          <img :src="item.url" alt/>{{item.name}}
         </div>
+
       </div>
     </div>
   </div>
 </template>
 <script>
-// import "../libs/rem.js";
-import "../../libs/rem.js";
-import "../../styles/newStyle.scss";
-import { setRem } from "@/libs/functionRem";
-export default {
-  data() {
-    return {
-      value1: 0,
-      option1: [
-        { text: "新款商品", value: 0 },
-        { text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1 },
-        { text: "活动商品", value: 2 }
-      ]
-    };
-  },
-  methods: {
-    toPatients() {
-      this.$router.push({ path: "/patients" });
-    }
-  },
-  created() {
-    Toast("请同意隐私服务协议");
+  // import "../libs/rem.js";
+  import { Toast } from "vant";
 
-    setRem();
-  }
-};
+  import {GetHomeData,ChangeOrg} from "@/api/home";
+  import "../../libs/rem.js";
+  import "../../styles/newStyle.scss";
+  import {setRem} from "@/libs/functionRem";
+
+  export default {
+    data() {
+      return {
+        value1: 0,
+        isCreateOrg: false,
+        org_arr: [],
+        banners: [],
+        apps: [],
+        option1: [
+          {text: "新款商品", value: 0},
+          {text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1},
+          {text: "活动商品", value: 2}
+        ]
+      };
+    },
+    methods: {
+      changeOrg(value){
+        Toast.loading({forbidClick: true, duration: 0})
+        let params={
+          org_id : value
+
+        }
+        ChangeOrg(params).then(response => {
+          if (response.data.state === 1) {
+            var user = response.data.data.user;
+            var admin = response.data.data.admin;
+            var org = response.data.data.org;
+            var subscibe = response.data.data.subscibe;
+            var config_list = response.data.data.config_list;
+            var template_info = response.data.data.template_info;
+            var filed_list = response.data.data.filed_list;
+            this.$store.dispatch("InitUserInfo", {
+              admin: admin,
+              user: user,
+              org: org,
+              subscibe: subscibe,
+              template_info: template_info,
+              filed_list: filed_list
+            });
+            this.$store.dispatch("SetConfigList", config_list);
+            this.GetHomeData()
+            Toast.success('切换机构成功')
+          } else {
+            Toast.fail(response.data.msg)
+          }
+        });
+
+
+      },
+      jump(url){
+        window.location.href = url
+      },
+      toPatients() {
+        this.$router.push({path: "/patients"});
+      },
+      toSearch() {
+        this.$router.push({path: "/search"});
+      }, GetHomeData() {
+        GetHomeData().then(response => {
+          if (response.data.state === 1) {
+            this.isCreateOrg = response.data.data.isCreateOrg
+            if(this.isCreateOrg){
+              this.orgs = response.data.data.orgs
+              this.apps = response.data.data.apps
+              this.banners = response.data.data.banners
+              this.org_arr = []
+              for (let i = 0; i < this.orgs.length; i++){
+                let obj= {
+                  text: this.orgs[i].org_name,
+                  value: this.orgs[i].id
+
+                }
+                this.org_arr.push(obj)
+              }
+              this.value1 = this.$store.getters.user.org.id
+            }
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+
+      },
+    },
+    created() {
+      this.GetHomeData()
+      setRem();
+    }
+  };
 </script>
 
 <style lang="scss" scoped>
-.page_homeIndex {
+  .page_homeIndex {
+
   .homeTitle {
     height: 3.125rem;
     padding: 0 1.125rem;
@@ -165,9 +190,11 @@ export default {
     justify-content: space-between;
     background: #fff;
   }
+
   .homeTitleLeft {
     width: 60%;
   }
+
   .homeTitleRight {
     width: 30%;
     display: flex;
@@ -175,15 +202,19 @@ export default {
     align-items: center;
     color: #232323;
   }
+
   /deep/ .van-dropdown-menu__item {
     justify-content: left;
   }
+
   .van-hairline--top-bottom {
     position: static;
   }
+
   .iconOne {
     font-size: 1.5rem;
   }
+
   .iconfont {
     clear: both;
   }
@@ -192,12 +223,15 @@ export default {
     font-size: 1.5rem;
     color: #232323;
   }
+
   .banner {
-    padding: 0 1.125rem;
-    img {
-      height: 6.75rem;
-      width: 100%;
-    }
+    padding: 1px 1.125rem 0;
+
+  img {
+    height: 6.75rem;
+    width: 100%;
+  }
+
   }
   .noticeBox {
     padding: 0 1.125rem;
@@ -205,106 +239,127 @@ export default {
     display: flex;
     align-items: center;
     color: #cccccc;
-    .notice {
-      font-size: 1.25rem;
-      margin-right: 0.375rem;
-    }
-    .noticeNews {
-      width: 90%;
-      display: flex;
-      justify-content: space-between;
-      color: #666666;
-      font-size: 0.8125rem;
-    }
+
+  .notice {
+    font-size: 1.25rem;
+    margin-right: 0.375rem;
+  }
+
+  .noticeNews {
+    width: 90%;
+    display: flex;
+    justify-content: space-between;
+    color: #666666;
+    font-size: 0.8125rem;
+  }
+
   }
   .background1 {
     background: #f6f6f6;
     width: 100%;
     height: 0.8125rem;
   }
+
   .management {
     padding: 1.25rem 1.125rem 0;
   }
+
   .managementTitle {
     display: flex;
     justify-content: space-between;
     align-items: center;
   }
+
   .managementName {
     font-weight: bold;
     font-size: 1rem;
     color: #000;
-    span {
-      font-size: 0.8125rem;
-      color: #989898;
-      font-weight: 400;
-    }
+
+  span {
+    font-size: 0.8125rem;
+    color: #989898;
+    font-weight: 400;
+  }
+
   }
   .setting {
     display: flex;
     align-items: center;
     color: #989898;
     font-size: 0.8125rem;
-    .van-icon-setting-o {
-      margin-right: 0.25rem;
-    }
+
+  .van-icon-setting-o {
+    margin-right: 0.25rem;
+  }
+
   }
   .managementBox {
     display: flex;
     justify-content: space-between;
-    .managementOne {
-      display: flex;
-      align-items: center;
-      flex-direction: column;
-      font-size: 0.8125rem;
-      color: #666666;
-      img {
-        width: 1.375rem;
-        height: 1.375rem;
-        margin: 1rem 0 0.2rem;
-      }
-    }
+
+  .managementOne {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    font-size: 0.8125rem;
+    color: #666666;
+
+  img {
+    width: 1.375rem;
+    height: 1.375rem;
+    margin: 1rem 0 0.2rem;
+  }
+
+  }
   }
   .application {
-    .applicationTitle {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: 1.25rem 1.125rem 0.625rem;
-    }
-    .applicationName {
-      font-weight: bold;
-      font-size: 1rem;
-      color: #000;
-    }
-    .applicationService {
-      font-size: 0.8125rem;
-      color: #666666;
-    }
+
+  .applicationTitle {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 1.25rem 1.125rem 0.625rem;
+  }
+
+  .applicationName {
+    font-weight: bold;
+    font-size: 1rem;
+    color: #000;
+  }
+
+  .applicationService {
+    font-size: 0.8125rem;
+    color: #666666;
+  }
+
   }
   .applicationBox {
     display: flex;
     flex-wrap: wrap;
-    .applicationOne {
-      width: 25%;
-      display: flex;
-      align-items: center;
-      flex-direction: column;
-      padding: 0.625rem 0;
-      font-size: 0.8125rem;
-      color: #666666;
-      img {
-        width: 3.25rem;
-        height: 3.25rem;
-        margin-bottom: 0.375rem;
-      }
-    }
+
+  .applicationOne {
+    width: 25%;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    padding: 0.625rem 0;
+    font-size: 0.8125rem;
+    color: #666666;
+
+  img {
+    width: 3.25rem;
+    height: 3.25rem;
+    margin-bottom: 0.375rem;
+  }
+
+  }
   }
   .van-popup {
     border-radius: 0 !important;
     top: 0 !important;
     transform: translate3d(0, 0, 0) !important;
   }
-}
+
+  }
 </style>
 <style lang="scss"></style>

src/pages/main/dialog/subMenu/MsgTip.vue

@@ -63,7 +63,7 @@
         <div class="content" style="margin-top:5px;margin-left:0;">
           <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透后称重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getAfterWeight(record)}}</span>kg=
           透后总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{record.weight_after}}</span>kg-
-          衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{predialysis.additional_weight}}</span>kg
+          衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{record.additional_weight}}</span>kg
            </span>
         </div>
         <br>
@@ -85,7 +85,7 @@
         <div class="content" style="margin-top:5px;margin-left:0;">
           <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">上次透后称重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg=
           上次透后总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{last_record.weight_after}}</span>kg-
-          上次衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{last_predialysis.additional_weight}}</span>kg
+          上次衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{last_record.additional_weight}}</span>kg
            </span>
         </div>
         <br>
@@ -197,8 +197,8 @@ export default {
       if (last_record.id > 0) {
         if (last_record.weight_after > 0) {
           let additional_weight = 0
-          if (this.last_predialysis.additional_weight != undefined) {
-            additional_weight = this.last_predialysis.additional_weight
+          if (this.last_record.additional_weight != undefined) {
+            additional_weight = this.last_record.additional_weight
           }
           return parseFloat(last_record.weight_after - additional_weight).toFixed(1)
         } else {

src/pages/my/index.vue

@@ -0,0 +1,268 @@
+<template>
+  <div class="page_my">
+    <div class="myTop">
+      <img src="../../assets/images/myBanner.png" alt />
+      <div class="avatar">
+        <img src="../../assets/images/m01.png" alt />
+      </div>
+      <div class="userMain">
+        <div class="userBox">
+          <div class="userTxt">
+            <p class="userName">小可耐</p>
+            <p class="signature">一个无法用言语表达的好人</p>
+          </div>
+          <van-icon name="arrow" />
+        </div>
+      </div>
+      <div class="invitebox">
+        <img src="../../assets/images/invite.png" alt />
+      </div>
+      <div class="myInfo">
+        <div class="myInfoLeft">
+          <img src="../../assets/images/myIcon1.png" alt />
+          <p>我的信息</p>
+        </div>
+        <van-icon class="arrow" name="arrow" />
+      </div>
+    </div>
+    <div class="myBox">
+      <div class="myBoxOne">
+        <div class="myInfoLeft">
+          <img src="../../assets/images/myIcon2.png" alt />
+          <p>我的医院/组织/团队</p>
+        </div>
+        <van-icon class="arrow" name="arrow" />
+      </div>
+      <div class="myBoxTwo">
+        <div class="myInfoLeft">
+          <img src="../../assets/images/m01.png" alt />
+          <p>我的医院/组织/团队</p>
+        </div>
+        <div class="myInfoRight">
+          <van-icon class="arrow" name="arrow" />
+        </div>
+      </div>
+      <div class="myBoxTwo noBorder">
+        <div class="myInfoLeft">
+          <img src="../../assets/images/m01.png" alt />
+          <p>我的医院/组织/团队</p>
+        </div>
+        <div class="myInfoRight">
+          <div class="myInfoRightBtn">管理</div>
+          <van-icon class="arrow" name="arrow" />
+        </div>
+      </div>
+    </div>
+    <div class="myBox">
+      <div class="myBoxOne">
+        <div class="myInfoLeft">
+          <img src="../../assets/images/myIcon3.png" alt />
+          <p>创建医院/组织/团队</p>
+        </div>
+        <van-icon class="arrow" name="arrow" />
+      </div>
+      <div class="myBoxOne">
+        <div class="myInfoLeft">
+          <img src="../../assets/images/myIcon4.png" alt />
+          <p>修改密码</p>
+        </div>
+        <van-icon class="arrow" name="arrow" />
+      </div>
+    </div>
+    <div class="myBox">
+      <div class="myBoxOne">
+        <div class="myInfoLeft">
+          <img src="../../assets/images/myIcon5.png" alt />
+          <p>常见问题</p>
+        </div>
+        <van-icon class="arrow" name="arrow" />
+      </div>
+      <div class="myBoxOne">
+        <div class="myInfoLeft">
+          <img src="../../assets/images/myIcon6.png" alt />
+          <p>意见反馈</p>
+        </div>
+        <van-icon class="arrow" name="arrow" />
+      </div>
+      <div class="myBoxOne">
+        <div class="myInfoLeft">
+          <img src="../../assets/images/myIcon7.png" alt />
+          <p>关于我们</p>
+        </div>
+        <van-icon class="arrow" name="arrow" />
+      </div>
+    </div>
+    <div class="myBox">
+      <div class="myBoxOne">
+        <div class="myInfoLeft">
+          <img src="../../assets/images/myIcon8.png" alt />
+          <p>退出登录</p>
+        </div>
+        <van-icon class="arrow" name="arrow" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.page_my {
+  height: 100%;
+  overflow-x: hidden;
+  overflow-y: auto;
+  background: #fafafa;
+  .myTop {
+    position: relative;
+    height: 16.875rem;
+    img {
+      width: 100%;
+      height: 11.25rem;
+    }
+    .avatar {
+      position: absolute;
+      left: 1rem;
+      top: 2.5rem;
+      width: 4.375rem;
+      height: 4.375rem;
+      background: rgba(50, 50, 50, 1);
+      border: 2px solid rgba(255, 255, 255, 1);
+      border-radius: 50%;
+      img {
+        border-radius: 50%;
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .userMain {
+      position: absolute;
+      left: 6.25rem;
+      top: 3.375rem;
+      width: 70%;
+      color: #fff;
+    }
+    .userBox {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+    .userName {
+      font-size: 1.25rem;
+      margin-bottom: 0.625rem;
+    }
+    .signature {
+      font-size: 0.75rem;
+    }
+    .invitebox {
+      width: 21.5625rem;
+      height: 4.75rem;
+      position: absolute;
+      top: 8.75rem;
+      left: 0.9375rem;
+      box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.16);
+      img {
+        height: 100%;
+        width: 100%;
+      }
+    }
+    .myInfo {
+      width: 100%;
+      height: 3.125rem;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-top: 2.25rem;
+      padding: 0 0.875rem;
+      background: #fff;
+      .myInfoLeft {
+        display: flex;
+        align-items: center;
+        height: 100%;
+        img {
+          width: 1.125rem;
+          height: 1.125rem;
+          margin-right: 0.5rem;
+        }
+        p {
+          margin-top: 0.125rem;
+        }
+      }
+      .arrow {
+        color: #9f9f9f;
+      }
+    }
+  }
+  .myBox {
+    margin: 0.8125rem 0;
+    background: #fff;
+    > div:last-child {
+      border: none;
+    }
+    .myBoxOne {
+      width: 100%;
+      height: 3.125rem;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 0 0.875rem;
+      border-bottom: 1px solid #e5e5e5;
+      .myInfoLeft {
+        display: flex;
+        align-items: center;
+        height: 100%;
+        img {
+          width: 1.125rem;
+          height: 1.125rem;
+          margin-right: 0.5rem;
+        }
+        // p {
+        //   margin-top: 0.125rem;
+        // }
+      }
+      .arrow {
+        color: #9f9f9f;
+      }
+    }
+    .myBoxTwo {
+      height: 3.125rem;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding-right: 0.875rem;
+      background: #fff;
+      margin-left: 2.5rem;
+      border-bottom: 1px solid #e5e5e5;
+      .myInfoLeft {
+        display: flex;
+        align-items: center;
+        height: 100%;
+        img {
+          width: 1.875rem;
+          height: 1.875rem;
+          margin-right: 0.5rem;
+        }
+        // p {
+        //   margin-top: 0.125rem;
+        // }
+      }
+      .myInfoRight {
+        display: flex;
+        align-items: center;
+        .myInfoRightBtn {
+          width: 3.625rem;
+          height: 1.875rem;
+          background: rgba(255, 255, 255, 1);
+          border: 1px solid rgba(51, 138, 251, 1);
+          border-radius: 0.3125rem;
+          text-align: center;
+          line-height: 1.875rem;
+          color: #338afb;
+          font-size: 0.9375rem;
+          margin-right: 0.625rem;
+        }
+      }
+      .arrow {
+        color: #9f9f9f;
+      }
+    }
+  }
+}
+</style>

src/pages/patientManagement/components/Blood.vue

@@ -63,8 +63,14 @@
 </template>
 
 <script>
-import { getAllBloodDialysisPatient } from "@/api/patient/patient";
+import {
+  getAllBloodDialysisPatient,
+  SearchAllBlood
+} from "@/api/patient/patient";
 export default {
+  props: {
+    searchValue: String
+  },
   data() {
     return {
       value: "",
@@ -146,9 +152,9 @@ export default {
         console.log("长度", this.patients.length);
         if (this.patients.length >= 10) {
           this.page++;
+          this.getAllBloodDialysisPatient(this.page, this.limit);
         }
         console.log("页数", this.page);
-        this.getAllBloodDialysisPatient(this.page, this.limit);
         // 数据全部加载完成
         if (this.list.length >= this.total) {
           this.finished = true;
@@ -157,30 +163,25 @@ export default {
     },
     toPatientDetail(id) {
       this.$router.push("/patientdetail?patientid=" + id);
+    },
+    SearchAllBlood(val) {
+      SearchAllBlood(val).then(response => {
+        if (response.data.state === 1) {
+          var bloodpatient = response.data.data.bloodPatient;
+          console.log("血透病人", bloodpatient);
+        }
+      });
     }
   },
   created() {
-    const baseSize = 32;
-    // 设置 rem 函数
-    function setRem() {
-      const scale = document.documentElement.clientWidth / 750;
-      document.documentElement.style.fontSize =
-        baseSize * Math.min(scale, 2) + "px";
-      //   // 320 默认大小16px; 320px = 20rem ;每个元素px基础上/16
-      //   let htmlWidth =
-      //     document.documentElement.clientWidth || document.body.clientWidth;
-      //   //得到html的Dom元素
-      //   let htmlDom = document.getElementsByTagName("html")[0];
-      //   //设置根元素字体大小
-      //   htmlDom.style.fontSize = htmlWidth / 23.4375 + "px";
-    }
-    // 初始化
-    setRem();
-    // 改变窗口大小时重新设置 rem
-    window.onresize = function() {
-      setRem();
-    };
+    console.log(this.searchValue);
     this.getAllBloodDialysisPatient();
+  },
+  watch: {
+    searchValue(newVal) {
+      console.log("监听", newVal);
+      this.SearchAllBlood(newVal);
+    }
   }
 };
 </script>
@@ -189,6 +190,7 @@ export default {
 .page_patientManagement {
   overflow-y: auto;
   height: 100%;
+  background: #fff;
   .patientManagementTitle {
     background: #fff;
     padding: 0 1.125rem;

src/pages/patientManagement/components/Member.vue

@@ -20,8 +20,11 @@
 </template>
 
 <script>
-import { getAllMemberPatient } from '@/api/patient/patient'
+import { getAllMemberPatient, getMemberSearchPatient } from '@/api/patient/patient'
 export default {
+  props: {
+    searchValue: String
+  },
   data () {
     return {
       loading: false,
@@ -67,30 +70,25 @@ export default {
     },
     toPatientDetail (id) {
       this.$router.push('/patientdetail?patientid=' + id)
+    },
+    getMemberSearchPatient (value) {
+      getMemberSearchPatient(value).then(response => {
+        if (response.data.state === 1) {
+          var memberpatient = response.data.data.memberPatient
+          console.log('会员病人', memberpatient)
+        }
+      })
     }
   },
   created () {
-    const baseSize = 32
-    // 设置 rem 函数
-    function setRem () {
-      const scale = document.documentElement.clientWidth / 750
-      document.documentElement.style.fontSize =
-        baseSize * Math.min(scale, 2) + 'px'
-      //   // 320 默认大小16px; 320px = 20rem ;每个元素px基础上/16
-      //   let htmlWidth =
-      //     document.documentElement.clientWidth || document.body.clientWidth;
-      //   //得到html的Dom元素
-      //   let htmlDom = document.getElementsByTagName("html")[0];
-      //   //设置根元素字体大小
-      //   htmlDom.style.fontSize = htmlWidth / 23.4375 + "px";
-    }
-    // 初始化
-    setRem()
-    // 改变窗口大小时重新设置 rem
-    window.onresize = function () {
-      setRem()
-    }
+    console.log(this.searchValue)
     this.getAllMemberPatient()
+  },
+  watch: {
+    searchValue (newVal) {
+      console.log(newVal)
+      this.getMemberSearchPatient(newVal)
+    }
   }
 }
 </script>
@@ -99,6 +97,7 @@ export default {
 .page_patientManagement {
   overflow-y: auto;
   height: 100%;
+  background: #fff;
   .patientManagementTitle {
     background: #fff;
     padding: 0 1.125rem;

src/pages/patientManagement/components/Slow.vue

@@ -20,9 +20,13 @@
 
 <script>
 import {
-  getAllSlowPatient
+  getAllSlowPatient,
+  getSlowSearchPatient
 } from '@/api/patient/patient'
 export default {
+  props: {
+    searchValue: String
+  },
   data () {
     return {
       loading: false,
@@ -68,30 +72,24 @@ export default {
     },
     toPatientDetail (id) {
       this.$router.push('/patientdetail?patientid=' + id)
+    },
+    getSlowSearchPatient (val) {
+      getSlowSearchPatient(val).then(response => {
+        if (response.data.state === 1) {
+          var slowpatient = response.data.data.slowPatient
+          console.log('慢病病人', slowpatient)
+        }
+      })
     }
   },
   created () {
-    const baseSize = 32
-    // 设置 rem 函数
-    function setRem () {
-      const scale = document.documentElement.clientWidth / 750
-      document.documentElement.style.fontSize =
-        baseSize * Math.min(scale, 2) + 'px'
-      //   // 320 默认大小16px; 320px = 20rem ;每个元素px基础上/16
-      //   let htmlWidth =
-      //     document.documentElement.clientWidth || document.body.clientWidth;
-      //   //得到html的Dom元素
-      //   let htmlDom = document.getElementsByTagName("html")[0];
-      //   //设置根元素字体大小
-      //   htmlDom.style.fontSize = htmlWidth / 23.4375 + "px";
-    }
-    // 初始化
-    setRem()
-    // 改变窗口大小时重新设置 rem
-    window.onresize = function () {
-      setRem()
-    }
     this.getAllSlowPatient()
+  },
+  watch: {
+    searchValue (newVal) {
+      console.log(newVal)
+      this.getSlowSearchPatient(newVal)
+    }
   }
 }
 </script>
@@ -100,6 +98,7 @@ export default {
 .page_patientManagement {
   overflow-y: auto;
   height: 100%;
+  background: #fff;
   .patientManagementTitle {
     background: #fff;
     padding: 0 1.125rem;

src/pages/patientManagement/index.vue

@@ -1,191 +0,0 @@
-<template>
-  <div class="page_patientManagement">
-    <van-sticky>
-      <div class="patientManagementTitle">
-        <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
-        <span class="titleName">患者中心</span>
-        <div class="iconBox" @click="addPatient">
-          <i class="iconfont icon-sousuo iconOne"></i>
-          <van-icon class="iconOne add" name="add-o" />
-        </div>
-      </div>
-      <div class="chooseBox">
-        <van-dropdown-menu>
-          <van-dropdown-item v-model="value1" :options="option1" />
-          <van-dropdown-item v-model="value2" :options="option2" />
-          <van-dropdown-item v-model="value3" :options="option3" />
-        </van-dropdown-menu>
-      </div>
-    </van-sticky>
-    <div class="patientBox">
-      <van-list
-        v-model="loading"
-        :finished="finished"
-        finished-text="没有更多了"
-        @load="onLoad"
-      >
-        <div
-          class="patientOne"
-          v-for="item in patients"
-          :key="item.id"
-          @click="toPatientDetail(item.id)"
-        >
-          <img :src="item.avatar" alt />
-          <p>{{ item.name }}</p>
-        </div>
-      </van-list>
-    </div>
-  </div>
-</template>
-
-<script>
-import "../../styles/resetStyle.scss";
-import { getBloodDialysisPatient } from "@/api/patient/patient";
-import { setRem, setHeight } from "@/libs/functionRem";
-export default {
-  data() {
-    return {
-      searchVal: "",
-      active: 0,
-      list: [],
-      loading: false,
-      finished: false,
-      page: 1,
-      limit: 10,
-      total: 0,
-      //
-      value1: 0,
-      value2: 0,
-      value3: 0,
-      option1: [
-        { text: "全部患者", value: 0 },
-        { text: "透析患者", value: 1 },
-        { text: "慢病患者", value: 2 },
-        { text: "会员患者", value: 3 }
-      ],
-      option2: [
-        { text: "全部状态", value: 0 },
-        { text: "留治", value: 1 },
-        { text: "转出", value: 2 }
-      ],
-      option3: [
-        { text: "全部来源", value: 0 },
-        { text: "门诊", value: 1 },
-        { text: "住院", value: 2 }
-      ],
-      patients: []
-    };
-  },
-  methods: {
-    getBloodDialysisPatient() {
-      getBloodDialysisPatient(this.page, this.limit).then(response => {
-        if (response.data.state == 1) {
-          var patient = response.data.data.patient;
-          console.log("病人信息", patient);
-          this.patients = patient;
-          var total = response.data.data.total;
-          this.total = total;
-          // console.log("总计", total);
-        }
-      });
-    },
-    onLoad() {
-      setTimeout(() => {
-        for (let i = 0; i < this.limit; i++) {
-          this.list.push(this.list.length + 1);
-        }
-        // 加载状态结束
-        this.loading = false;
-        this.page++;
-        this.getBloodDialysisPatient(this.page, this.limit);
-        // 数据全部加载完成
-        if (this.list.length >= this.total) {
-          this.finished = true;
-        }
-      }, 1000);
-    },
-    addPatient() {
-      this.$router.push("/addPatints");
-    },
-    toPatientDetail(id) {
-      this.$router.push("/patientdetail?patientid=" + id);
-    },
-    toReturn() {
-      this.$router.push("/homeIndex");
-    }
-  },
-  created() {
-    setRem();
-    setHeight();
-    this.getBloodDialysisPatient();
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.page_patientManagement {
-  overflow-y: auto;
-  height: 100%;
-  .patientManagementTitle {
-    background: #fff;
-    padding: 0 1.125rem;
-    height: 3.125rem;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  .jiantou {
-    font-size: 1.5rem;
-    font-weight: 600;
-    margin-right: 2rem;
-  }
-  .titleName {
-    font-size: 1.125rem;
-    font-weight: 600;
-  }
-  .iconBox {
-    display: flex;
-    align-items: center;
-    float: right;
-  }
-  .iconOne {
-    font-size: 1.5rem;
-  }
-  .add {
-    margin-left: 1.25rem;
-  }
-  .van-dropdown-menu__title {
-    width: 5.625rem;
-    height: 1.875rem;
-    line-height: 1.875rem;
-    background: rgba(246, 246, 246, 1);
-    border-radius: 5px;
-    color: #8d8d8d;
-    font-size: 0.875rem;
-  }
-  .van-dropdown-menu__title::after {
-    right: 0.5rem;
-  }
-  .patientBox {
-    padding: 0 0.875rem;
-    .patientOne {
-      display: flex;
-      align-items: center;
-      height: 3.75rem;
-      img {
-        width: 2.5rem;
-        height: 2.5rem;
-        margin-right: 0.875rem;
-      }
-    }
-  }
-  .van-popup {
-    border-radius: 0 !important;
-    top: 0 !important;
-    transform: translate3d(0, 0, 0) !important;
-  }
-}
-::-webkit-scrollbar {
-  width: 0;
-}
-</style>

src/pages/patientManagement/patientManagement.vue

@@ -2,7 +2,7 @@
   <div class="page_patientManagement">
     <van-sticky>
       <div class="patientManagementTitle">
-        <i class="iconfont icon-zuojiantou jiantou"></i>
+        <i class="iconfont icon-zuojiantou jiantou" @click="toback"></i>
         <span class="titleName">患者管理</span>
         <div class="iconBox" @click="addPatient">
           <van-icon class="iconOne add" name="add-o" />
@@ -10,7 +10,11 @@
       </div>
     </van-sticky>
     <div class="searchBox">
-      <van-search v-model="value" placeholder="搜索患者透析号/姓名/首拼" />
+      <van-search
+        v-model="value"
+        placeholder="搜索患者透析号/姓名/首拼"
+        @search="SearchAllPatient"
+      />
     </div>
     <div class="chooseBox">
       <van-tabs v-model="active" sticky>
@@ -35,13 +39,13 @@
           </div>
         </van-tab>
         <van-tab title="血透患者">
-          <Blood></Blood>
+          <Blood :searchValue="value"></Blood>
         </van-tab>
         <van-tab title="慢病患者">
-          <Slow></Slow>
+          <Slow :searchValue="value"></Slow>
         </van-tab>
         <van-tab title="会员患者">
-          <Member></Member>
+          <Member :searchValue="value"></Member>
         </van-tab>
       </van-tabs>
     </div>
@@ -65,7 +69,10 @@
 
 <script>
 import "../../styles/resetStyle.scss";
-import { getBloodDialysisPatient } from "@/api/patient/patient";
+import {
+  getBloodDialysisPatient,
+  SearchAllPatient
+} from "@/api/patient/patient";
 import Slow from "@/pages/patientManagement/components/Slow";
 import Member from "@/pages/patientManagement/components/Member";
 import Blood from "@/pages/patientManagement/components/Blood";
@@ -123,8 +130,8 @@ export default {
         this.loading = false;
         if (this.patients.length >= 10) {
           this.page++;
+          this.getBloodDialysisPatient(this.page, this.limit);
         }
-        this.getBloodDialysisPatient(this.page, this.limit);
         // 数据全部加载完成
         if (this.list.length >= this.total) {
           this.finished = true;
@@ -141,7 +148,7 @@ export default {
           this.patients = arr;
           var total = response.data.data.total;
           this.total = total;
-          console.log("总计", total);
+          // console.log("总计", total);
         }
       });
     },
@@ -151,6 +158,17 @@ export default {
     },
     toPatientDetail(id) {
       this.$router.push("/patientdetail?patientid=" + id);
+    },
+    toback() {
+      this.$router.push("/homeIndex");
+    },
+    SearchAllPatient(val) {
+      SearchAllPatient(val).then(response => {
+        if (response.data.state === 1) {
+          var patient = response.data.data.patient;
+          console.log("patient", patient);
+        }
+      });
     }
   },
   created() {

src/pages/patients/addPatient.vue

@@ -3,13 +3,18 @@
     <van-sticky>
       <div class="addPatientsTitle">
         <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
-        <span class="titleName">新增患者</span>
+        <span class="titleName">患者中心</span>
         <p @click="savePatient">保存</p>
       </div>
     </van-sticky>
     <div class="basicTitle">基本信息</div>
     <div class="basicBox">
-      <van-field v-model="patientForm.name" required label="姓名" placeholder="请填写" />
+      <van-field
+        v-model="patientForm.name"
+        required
+        label="姓名"
+        placeholder="请输入"
+      />
       <van-field
         label="性别"
         v-model="patientForm.sex"
@@ -27,22 +32,28 @@
         required
         label="身份证号"
         @blur="checkIdCardNo"
-        placeholder="请填写"
+        placeholder="请输入"
+      />
+      <van-field
+        v-model="patientForm.birthday"
+        required
+        label="出生日期"
+        readonly
+        placeholder="请输入"
       />
-      <van-field v-model="patientForm.birthday" required label="出生日期" readonly placeholder="请填写" />
       <van-field
         v-model="patientForm.phone"
         type="tel"
         required
         label="手机号"
-        placeholder="请填写"
+        placeholder="请输入"
         @blur="checkMobile"
       />
       <van-cell>
         <!-- 使用 title 插槽来自定义标题 -->
         <template slot="title">
           <span class="custom-title">患者类型</span>
-          <div style="width:60%;margin-left:2rem">
+          <div style="width:60%;margin-left:2.2rem">
             <van-checkbox-group v-model="result" @change="changeMode">
               <van-checkbox name="1" shape="square">血透患者</van-checkbox>
               <van-checkbox name="2" shape="square">慢病患者</van-checkbox>
@@ -56,8 +67,20 @@
     <div v-show="bloodShow">
       <div class="basicTitle">血透信息</div>
       <div class="xtBox">
-        <van-field v-model="patientForm.dialysis" center clearable required label="透析号">
-          <van-button slot="button" size="small" type="info" @click="generatedialysisno">自动生成</van-button>
+        <van-field
+          v-model="patientForm.dialysis"
+          center
+          clearable
+          required
+          label="透析号"
+        >
+          <van-button
+            slot="button"
+            size="small"
+            type="info"
+            @click="generatedialysisno"
+            >自动生成</van-button
+          >
         </van-field>
 
         <van-field
@@ -65,10 +88,15 @@
           v-model="patientForm.patientsoure"
           right-icon="arrow"
           required
+          readonly
           placeholder="请选择"
           @click="show10 = true"
         />
-        <van-popup v-model="show10" position="bottom" :style="{ height: '30%' }">
+        <van-popup
+          v-model="show10"
+          position="bottom"
+          :style="{ height: '30%' }"
+        >
           <van-picker :columns="columns3" @change="onChangeOne" />
         </van-popup>
 
@@ -77,6 +105,7 @@
           v-model="patientForm.lapseto"
           right-icon="arrow"
           required
+          readonly
           placeholder="请选择"
           @click="show9 = true"
         />
@@ -88,7 +117,7 @@
           <!-- 使用 title 插槽来自定义标题 -->
           <template slot="title">
             <span class="custom-title">传染病</span>
-            <div style="width:60%;margin-left:2rem">
+            <div style="width:60%;margin-left:3rem">
               <van-checkbox-group v-model="resultTwo">
                 <van-checkbox name="1" shape="square">乙肝</van-checkbox>
                 <van-checkbox name="2" shape="square">丙肝</van-checkbox>
@@ -101,7 +130,6 @@
         </van-cell>
 
         <van-field
-          class="smallsize"
           v-model="patientForm.admissionNumber"
           type="text"
           label="住院(门诊)号"
@@ -109,11 +137,11 @@
         />
 
         <van-field
-          class="smallsize"
           label="首次透析日期"
           v-model="patientForm.fistDate"
           right-icon="arrow"
           placeholder="请选择"
+          readonly
           @click="show7 = true"
         />
 
@@ -134,8 +162,8 @@
           autosize
           label="诊断"
           type="textarea"
-          placeholder="请填写主要诊断信息"
           maxlength="50"
+          placeholder="请输入主要诊断信息"
         />
       </div>
     </div>
@@ -143,24 +171,17 @@
     <div v-show="slowShow">
       <div class="basicTitle">慢病信息</div>
       <div class="xtBox">
-        <!--      <van-field-->
-        <!--        label="设备ID"-->
-        <!--        v-model="source"-->
-        <!--        right-icon="arrow"-->
-        <!--        readonly-->
-        <!--        placeholder="请选择"-->
-        <!--        @click="show1 = true"-->
-        <!--      />-->
-        <!--      <van-popup v-model="show1" position="bottom" :style="{ height: '30%' }">-->
-        <!--        <van-picker :columns="columns1" @change="onChange1" />-->
-        <!--      </van-popup>-->
-        <van-field v-model="patientForm.requipmentId" label="设备ID" placeholder="请填写" />
+        <van-field
+          v-model="patientForm.requipmentId"
+          label="设备ID"
+          placeholder="请输入"
+        />
 
         <van-cell>
           <!-- 使用 title 插槽来自定义标题 -->
           <template slot="title">
             <span class="custom-title2">传染病</span>
-            <div style="width:60%;margin-left:2rem">
+            <div style="width:60%;margin-left:3rem">
               <van-checkbox-group v-model="resultThree">
                 <van-checkbox name="1" shape="square">乙肝</van-checkbox>
                 <van-checkbox name="2" shape="square">丙肝</van-checkbox>
@@ -176,7 +197,7 @@
           <!-- 使用 title 插槽来自定义标题 -->
           <template slot="title">
             <span class="custom-title2">慢性病</span>
-            <div style="width:60%;margin-left:2rem">
+            <div style="width:60%;margin-left:3rem">
               <van-checkbox-group v-model="resultFour">
                 <van-checkbox name="1" shape="square">血透</van-checkbox>
                 <van-checkbox name="2" shape="square">腹透</van-checkbox>
@@ -189,22 +210,6 @@
             </div>
           </template>
         </van-cell>
-
-        <!--        <van-field-->
-        <!--          label="慢性病"-->
-        <!--          v-model="patientForm.slowDisease"-->
-        <!--          right-icon="arrow"-->
-        <!--          readonly-->
-        <!--          placeholder="请选择"-->
-        <!--          @click="show12 = true"-->
-        <!--        />-->
-        <!--        <van-popup-->
-        <!--          v-model="show12"-->
-        <!--          position="bottom"-->
-        <!--          :style="{ height: '30%' }"-->
-        <!--        >-->
-        <!--          <van-picker :columns="checkDisease" @change="onChangeFive" />-->
-        <!--        </van-popup>-->
       </div>
     </div>
 
@@ -237,7 +242,11 @@
           placeholder="请选择"
           @click="show14 = true"
         />
-        <van-popup v-model="show14" position="bottom" :style="{ height: '30%' }">
+        <van-popup
+          v-model="show14"
+          position="bottom"
+          :style="{ height: '30%' }"
+        >
           <van-picker :columns="patientType" @change="onChangeSix" />
         </van-popup>
         <van-field
@@ -248,7 +257,11 @@
           placeholder="请选择"
           @click="show13 = true"
         />
-        <van-popup v-model="show13" position="bottom" :style="{ height: '30%' }">
+        <van-popup
+          v-model="show13"
+          position="bottom"
+          :style="{ height: '30%' }"
+        >
           <van-picker :columns="treatmentMethod" @change="onChangeSeven" />
         </van-popup>
       </div>
@@ -258,6 +271,7 @@
 </template>
 
 <script>
+import "../../styles/resetStyle.scss";
 import {
   GenerateDialysisNo,
   GetIllnessList,
@@ -269,6 +283,7 @@ import {
 } from "@/api/patient/patient";
 import { isCardNo, checkMobile, getFileExtension } from "@/utils/tools";
 import { getToken } from "@/api/qiniu";
+import { setRem, setHeight } from "@/libs/functionRem";
 const moment = require("moment");
 export default {
   data() {
@@ -351,7 +366,8 @@ export default {
         slowPatient: 0,
         memberPatient: 0,
         avatar: "",
-        memberFistDate: ""
+        memberFistDate: "",
+        is_infectious: 0 // 是否患有传染病
       },
       illnesslist: []
     };
@@ -568,18 +584,6 @@ export default {
         this.$toast(" 性别不能为空");
         return false;
       }
-      if (this.patientForm.sex !== "") {
-        if (this.patientForm.sex === "男") {
-          this.patientForm.sex = 1;
-          this.patientForm.avatar =
-            "https://images.shengws.com/201809182128111.png";
-        }
-        if (this.patientForm.sex === "女") {
-          this.patientForm.sex = 2;
-          this.patientForm.avatar =
-            "https://images.shengws.com/201809182128222.png";
-        }
-      }
       if (this.patientForm.idCard === "") {
         this.$toast("身份证不能为空");
         return false;
@@ -592,8 +596,9 @@ export default {
         this.$toast("手机号码不能为空");
         return false;
       }
+
       if (this.result.length === 0) {
-        this.$toast("患者标签不能为空");
+        this.$toast("患者类型不能为空");
         return false;
       }
       if (this.patientForm.dialysis === "" && this.result.indexOf("1") != -1) {
@@ -608,29 +613,6 @@ export default {
         return false;
       }
 
-      for (let i = 0; i < this.result.length; i++) {
-        if (this.result[i] == 1) {
-          this.patientForm.bloodPatient = 1;
-        }
-        if (this.result[i] == 2) {
-          this.patientForm.slowPatient = 1;
-        }
-        if (this.result[i] == 3) {
-          this.patientForm.memberPatient = 1;
-        }
-      }
-
-      if (this.patientForm.patientsoure === "") {
-        this.patientForm.patientsoure = 0;
-      }
-      if (this.patientForm.patientsoure !== "") {
-        if (this.patientForm.patientsoure === "门诊") {
-          this.patientForm.patientsoure = 1;
-        }
-        if (this.patientForm.patientsoure === "住院") {
-          this.patientForm.patientsoure = 2;
-        }
-      }
       if (this.patientForm.lapseto === "" && this.result.indexOf("1") != -1) {
         this.$toast("留置状态不能为空");
         return false;
@@ -640,19 +622,19 @@ export default {
         this.patientForm.lapseto = 0;
       }
 
-      if (this.patientForm.lapseto !== "") {
-        if (this.patientForm.lapseto === "留治") {
-          this.patientForm.lapseto = 1;
-        }
-        if (this.patientForm.lapseto === "转出") {
-          this.patientForm.lapseto = 2;
-        }
-      }
       if (this.resultTwo.length === 0 && this.result.indexOf("1") != -1) {
         this.$toast("传染病不能为空");
         return false;
       }
 
+      if (this.resultTwo.length === 0) {
+        this.patientForm.is_infectious = 1;
+      }
+
+      if (this.resultTwo.length > 0) {
+        this.patientForm.is_infectious = 2;
+      }
+
       console.log("治疗方式", this.patientForm.treatmentMethod);
 
       if (this.patientForm.treatmentMethod === undefined) {
@@ -678,7 +660,55 @@ export default {
       if (this.patientForm.patient_type === "") {
         this.patientForm.patient_type = 0;
       }
-      console.log("this.illnesslist");
+
+      for (let i = 0; i < this.result.length; i++) {
+        if (this.result[i] == 1) {
+          this.patientForm.bloodPatient = 1;
+        }
+        if (this.result[i] == 2) {
+          this.patientForm.slowPatient = 1;
+        }
+        if (this.result[i] == 3) {
+          this.patientForm.memberPatient = 1;
+        }
+      }
+
+      if (!checkMobile(this.patientForm.phone)) {
+        this.$toast("请填写正确的手机号");
+        return false;
+      }
+
+      if (this.patientForm.sex !== "") {
+        if (this.patientForm.sex === "男") {
+          this.patientForm.sex = 1;
+          this.patientForm.avatar =
+            "https://images.shengws.com/201809182128111.png";
+        }
+        if (this.patientForm.sex === "女") {
+          this.patientForm.sex = 2;
+          this.patientForm.avatar =
+            "https://images.shengws.com/201809182128222.png";
+        }
+      }
+      if (this.patientForm.patientsoure === "") {
+        this.patientForm.patientsoure = 0;
+      }
+      if (this.patientForm.patientsoure !== "") {
+        if (this.patientForm.patientsoure === "门诊") {
+          this.patientForm.patientsoure = 1;
+        }
+        if (this.patientForm.patientsoure === "住院") {
+          this.patientForm.patientsoure = 2;
+        }
+      }
+      if (this.patientForm.lapseto !== "") {
+        if (this.patientForm.lapseto === "留治") {
+          this.patientForm.lapseto = 1;
+        }
+        if (this.patientForm.lapseto === "转出") {
+          this.patientForm.lapseto = 2;
+        }
+      }
       for (let i = 0; i < this.illnesslist.length; i++) {
         if (
           this.illnesslist[i].illness_name === this.patientForm.patient_type
@@ -710,7 +740,8 @@ export default {
         resultFour: this.resultFour,
         patientType: this.patientForm.patient_type,
         memberFistDate: this.patientForm.memberFistDate,
-        treatmentMethod: this.patientForm.treatmentMethod
+        treatmentMethod: this.patientForm.treatmentMethod,
+        is_infectious: this.patientForm.is_infectious
       };
       savePatient(params).then(response => {
         if (response.data.state === 1) {
@@ -719,6 +750,25 @@ export default {
           this.$router.push({ path: "/patients" });
         } else {
           this.$toast("手机号码已存在");
+          console.log("性别", this.patientForm.sex);
+          if (this.patientForm.sex === 1) {
+            this.patientForm.sex = "男";
+          }
+          if (this.patientForm.sex === 2) {
+            this.patientForm.sex = "女";
+          }
+          if (this.patientForm.patientsoure === 1) {
+            this.patientForm.patientsoure = "门诊";
+          }
+          if (this.patientForm.patientsoure === 2) {
+            this.patientForm.patientsoure = "住院";
+          }
+          if (this.patientForm.lapseto === 1) {
+            this.patientForm.lapseto = "留治";
+          }
+          if (this.patientForm.lapseto === 2) {
+            this.patientForm.lapseto = "转出";
+          }
         }
       });
     },
@@ -726,6 +776,7 @@ export default {
     checkMobile() {
       if (!checkMobile(this.patientForm.phone)) {
         this.$toast("请填写正确的手机号");
+        return false;
       }
     },
     checkIdCardNo() {
@@ -754,12 +805,14 @@ export default {
     }
   },
   created() {
+    setRem();
+    setHeight();
     this.GetIllnessList();
   }
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .page_addPatients {
   overflow-y: auto;
   height: 100%;
@@ -823,6 +876,13 @@ export default {
     border-radius: 0.9375rem;
     text-align: center;
   }
+  .van-button--small {
+    min-width: 60px !important;
+    height: 30px;
+    padding: 0 8px;
+    font-size: 12px !important;
+    line-height: 28px;
+  }
   .van-button--info {
     border-radius: 0.9375rem;
   }
@@ -834,20 +894,10 @@ export default {
   }
   .van-cell {
     align-items: center;
-    font-size: 1rem;
-  }
-  .smallsize {
-    font-size: 0.8125rem;
-    .van-cell__title {
-    }
+    // font-size: 1rem;
   }
 }
 ::-webkit-scrollbar {
   width: 0;
 }
-.van-popup {
-  border-radius: 0 !important;
-  top: 0 !important;
-  transform: translate3d(0, 0, 0) !important;
-}
 </style>

src/pages/patients/editPatient.vue

@@ -88,7 +88,7 @@
         </van-field>
         <van-field
           label="患者来源"
-          v-model="source"
+          v-model="patientForm.patientsoure"
           right-icon="arrow"
           required
           readonly
@@ -100,7 +100,7 @@
         </van-popup>
         <van-field
           label="留治状态"
-          v-model="source2"
+          v-model="patientForm.lapseto"
           right-icon="arrow"
           required
           readonly
@@ -115,7 +115,7 @@
           <!-- 使用 title 插槽来自定义标题 -->
           <template slot="title">
             <span class="custom-title">传染病</span>
-            <div style="width:60%;margin-left:2rem">
+            <div style="width:60%;margin-left:3rem">
               <van-checkbox-group v-model="resultTwo">
                 <van-checkbox name="1" shape="square">乙肝</van-checkbox>
                 <van-checkbox name="2" shape="square">丙肝</van-checkbox>
@@ -130,7 +130,7 @@
         <van-field v-model="hospitalNum" type="text" label="住院(门诊)号" />
         <van-field
           label="首次透析日期"
-          v-model="time"
+          v-model="patientForm.fistDate"
           right-icon="arrow"
           readonly
           placeholder="请选择"
@@ -148,13 +148,12 @@
         </van-popup>
         <van-field
           v-model="message"
-          rows="2"
+          rows="1"
           autosize
           label="诊断"
           type="textarea"
           maxlength="50"
           placeholder="请输入主要诊断信息"
-          show-word-limit
         />
       </div>
     </div>
@@ -171,7 +170,7 @@
           <!-- 使用 title 插槽来自定义标题 -->
           <template slot="title">
             <span class="custom-title2">传染病</span>
-            <div style="width:60%;margin-left:2rem">
+            <div style="width:60%;margin-left:3rem">
               <van-checkbox-group v-model="resultThree">
                 <van-checkbox name="1" shape="square">乙肝</van-checkbox>
                 <van-checkbox name="2" shape="square">丙肝</van-checkbox>
@@ -187,7 +186,7 @@
           <!-- 使用 title 插槽来自定义标题 -->
           <template slot="title">
             <span class="custom-title2">慢性病</span>
-            <div style="width:60%;margin-left:2rem">
+            <div style="width:60%;margin-left:3rem">
               <van-checkbox-group v-model="resultFour">
                 <van-checkbox name="1" shape="square">血透</van-checkbox>
                 <van-checkbox name="2" shape="square">腹透</van-checkbox>
@@ -211,16 +210,20 @@
           right-icon="arrow"
           readonly
           placeholder="请选择"
-          @click="show2 = true"
+          @click="show12 = true"
         />
-        <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
+        <van-popup
+          v-model="show12"
+          position="bottom"
+          :style="{ height: '40%' }"
+        >
           <van-datetime-picker
             v-model="currentDate"
             type="date"
             :min-date="minDate"
             :max-date="maxDate"
             @cancel="onCancel"
-            @confirm="onConfirm"
+            @confirm="onConfirmOne"
           />
         </van-popup>
         <van-field
@@ -255,7 +258,6 @@
         </van-popup>
       </div>
     </div>
-    <div class="turnOut">转出</div>
     <div class="moreInfo">如需要完善更多病人信息，请在电脑端完善</div>
   </div>
 </template>
@@ -275,9 +277,11 @@ import {
   isCardNo,
   checkMobile,
   getFileExtension,
-  uParseTime
+  uParseTime,
+  uParseTimeOne
 } from "@/utils/tools";
 import { getToken } from "@/api/qiniu";
+import { setRem, setHeight } from "@/libs/functionRem";
 const moment = require("moment");
 export default {
   data() {
@@ -364,21 +368,21 @@ export default {
         "血液透析",
         "腹膜透析",
         "肾移植"
-      ]
+      ],
+      illnesslist: []
     };
   },
   methods: {
     onChange(picker, value, index) {
-      console.log(value);
-      this.sex = value;
+      this.patientForm.sex = value;
       this.show = false;
     },
     onChange1(picker, value, index) {
-      this.source = value;
+      this.patientForm.patientsoure = value;
       this.show3 = false;
     },
     onChange2(picker, value, index) {
-      this.source2 = value;
+      this.patientForm.lapseto = value;
       this.show4 = false;
     },
     onChange3(picker, value, index) {
@@ -403,15 +407,29 @@ export default {
         day = `0${day}`;
       }
 
-      this.time = `${year}-${month}-${day}`;
+      this.patientForm.fistDate = `${year}-${month}-${day}`;
       console.log(this.currentDate);
       this.show2 = false;
     },
+    onConfirmOne(value) {
+      let year = value.getFullYear();
+      let month = value.getMonth() + 1;
+      let day = value.getDate();
+      if (month >= 1 && month <= 9) {
+        month = `0${month}`;
+      }
+      if (day >= 1 && day <= 9) {
+        day = `0${day}`;
+      }
+
+      this.patientForm.memberFistDate = `${year}-${month}-${day}`;
+      console.log(this.currentDate);
+      this.show12 = false;
+    },
     toReturn() {
       this.$router.push("/patientdetail?patientid=" + this.patient_id);
     },
     changeMode(val) {
-      alert(val);
       if (val == 1) {
         getBloodPatientInfo(this.patientForm.phone).then(response => {
           if (response.data.state === 1) {
@@ -536,12 +554,39 @@ export default {
       GetPatientDetail(patientid).then(response => {
         if (response.data.state === 1) {
           var patientdetail = response.data.data.patientDetail;
+          var diseases = response.data.data.diseases;
+          var slowDisease = response.data.data.slowDiseases;
+          console.log("慢病传染病", slowDisease);
+          for (let i = 0; i < diseases.length; i++) {
+            this.resultTwo.push(String(diseases[i]));
+          }
+          for (let i = 0; i < slowDisease.length; i++) {
+            this.resultThree.push(String(slowDisease[i].disease_id));
+          }
+          console.log("传染病", diseases);
+          var cronicdisease = response.data.data.cronicDiseases;
+          for (let i = 0; i < cronicdisease.length; i++) {
+            this.resultFour.push(String(cronicdisease[i].disease_id));
+          }
+          console.log("慢性慢性病", cronicdisease);
           if (patientdetail.gender === 1) {
             patientdetail.gender = "男";
           }
           if (patientdetail.gender === 2) {
             patientdetail.gender = "女";
           }
+          if (patientdetail.source === 1) {
+            patientdetail.source = "门诊";
+          }
+          if (patientdetail.source === 2) {
+            patientdetail.source = "住院";
+          }
+          if (patientdetail.lapseto === 1) {
+            patientdetail.lapseto = "留治";
+          }
+          if (patientdetail.lapseto === 2) {
+            patientdetail.lapseto = "转出";
+          }
           console.log("病人详情", patientdetail);
           this.patientForm.name = patientdetail.name;
           this.patientForm.sex = patientdetail.gender;
@@ -562,6 +607,84 @@ export default {
             this.result.push(String(3));
           }
           this.patientForm.dialysis = patientdetail.dialysis_no;
+          this.patientForm.patientsoure = patientdetail.source;
+          this.patientForm.lapseto = patientdetail.lapseto;
+          this.patientForm.admissionNumber = patientdetail.admission_number;
+          this.patientForm.requipmentId = patientdetail.equitment_id;
+
+          this.patientForm.memberFistDate = uParseTimeOne(
+            patientdetail.member_fistdate,
+            "{y}-{m}-{d}"
+          );
+          this.patientForm.fistDate = uParseTimeOne(
+            patientdetail.first_dialysis_date
+          );
+          this.patientForm.diagnose = patientdetail.diagnose;
+          if (patientdetail.member_treatement === 1) {
+            this.patientForm.treatmentMethod = "西医治疗";
+          }
+          if (patientdetail.member_treatement === 2) {
+            this.patientForm.treatmentMethod = "中医治疗";
+          }
+          if (patientdetail.member_treatement === 3) {
+            this.patientForm.treatmentMethod = "血液透析";
+          }
+          if (patientdetail.member_treatement === 4) {
+            this.patientForm.treatmentMethod = "腹膜透析";
+          }
+          if (patientdetail.member_treatement === 5) {
+            this.patientForm.treatmentMethod = "肾移植";
+          }
+
+          for (let i = 0; i < this.illnesslist.length; i++) {
+            if (patientdetail.member_patienttype === this.illnesslist[i].id) {
+              this.patientForm.patient_type = this.illnesslist[i].illness_name;
+            }
+          }
+
+          if (patientdetail.member_patients === 1) {
+            this.bloodShow = false;
+            this.slowShow = false;
+            this.memberShow = true;
+          }
+          if (patientdetail.slow_patients === 1) {
+            this.bloodShow = false;
+            this.memberShow = false;
+            this.slowShow = true;
+          }
+          if (
+            patientdetail.blood_patients === 1 &&
+            patientdetail.slow_patients === 1
+          ) {
+            this.bloodShow = true;
+            this.slowShow = true;
+            this.memberShow = false;
+          }
+          if (
+            patientdetail.blood_patients === 1 &&
+            patientdetail.member_patients === 1
+          ) {
+            this.bloodShow = true;
+            this.memberShow = true;
+            this.slowShow = false;
+          }
+          if (
+            patientdetail.member_patients === 1 &&
+            patientdetail.slow_patients === 1
+          ) {
+            this.memberShow = true;
+            this.slowShow = true;
+            this.bloodShow = false;
+          }
+          if (
+            patientdetail.blood_patients === 1 &&
+            patientdetail.slow_patients === 1 &&
+            patientdetail.member_patients === 1
+          ) {
+            this.bloodShow = 1;
+            this.slowShow = 1;
+            this.memberShow = 1;
+          }
         }
       });
     },
@@ -569,14 +692,13 @@ export default {
       GetIllnessList().then(response => {
         if (response.data.state === 1) {
           var illnesslist = response.data.data.illnesslist;
+          console.log("illnesslist", illnesslist);
           this.illnesslist = illnesslist;
           var arr = [];
           for (let i = 0; i < illnesslist.length; i++) {
             arr.push(illnesslist[i].illness_name);
           }
-
           this.patientType = arr;
-          console.log("病种", illnesslist);
         }
       });
     },
@@ -599,10 +721,11 @@ export default {
         birth.substr(4, 2) +
         "-" +
         birth.substr(6, 2);
-      console.log("出生日期", this.patientForm.birthday);
     }
   },
   created() {
+    setRem();
+    setHeight();
     var patientid = this.$route.query.patientid;
     this.patient_id = patientid;
     console.log("phones是什么", patientid);
@@ -612,7 +735,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .page_editPatients {
   overflow-y: auto;
   height: 100%;
@@ -679,6 +802,13 @@ export default {
   .van-button--info {
     border-radius: 0.9375rem;
   }
+  .van-button--small {
+    min-width: 60px !important;
+    height: 30px;
+    padding: 0 8px;
+    font-size: 12px !important;
+    line-height: 28px;
+  }
   .moreInfo {
     text-align: center;
     font-size: 0.75rem;

src/pages/search/index.vue

@@ -0,0 +1,187 @@
+<template>
+  <div class="page_search">
+    <van-sticky>
+      <div class="header">
+        <i class="iconfont icon-zuojiantou" @click="toHomeIndex"></i>
+        <van-search v-model="value" placeholder=" 姓名 / 透析号" @search="toSearchPatient" />
+      </div>
+    </van-sticky>
+    <div class="searchList">
+      <div
+        class="patientOne"
+        v-for="(item,index) in patientList"
+        :key="index"
+        @click="toPatient(item.id)"
+      >
+        <img :src="item.avatar" alt />
+        <p>{{ item.name }}</p>
+      </div>
+    </div>
+    <div class="history">
+      <div class="historyTitle">
+        <span>历史搜索</span>
+        <i class="iconfont icon-lajixiang" @click="deteleHistory"></i>
+      </div>
+      <div class="record">
+        <ul class="recordList">
+          <li
+            class="recordOne"
+            v-for="(item,index) in historyWord"
+            :key="index"
+            @click="toSearchPatient(item)"
+          >{{item}}</li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { toSearchPatient } from "@/api/patient/patient";
+export default {
+  data() {
+    return {
+      searchVal: "",
+      active: 0,
+      keyword: "",
+      value: "",
+      patientList: [],
+      historyWord: []
+    };
+  },
+  methods: {
+    toHomeIndex() {
+      this.$router.push({ path: "/homeIndex" });
+    },
+    toSearchPatient(val) {
+      let searchWord = localStorage.getItem("searchWord");
+      if (searchWord == null) {
+        localStorage.setItem("searchWord", val);
+      } else {
+        let arr = localStorage.getItem("searchWord");
+        arr = arr.split(",");
+        if (arr.indexOf(val) != -1) {
+          arr = arr;
+        } else {
+          arr.unshift(val);
+        }
+        self.historyWord = arr;
+        localStorage.setItem("searchWord", self.historyWord);
+      }
+
+      toSearchPatient(val).then(response => {
+        if (response.data.state === 1) {
+          var patient = response.data.data.patient;
+          console.log("patient", patient);
+          this.patientList = patient;
+          this.historyWord = localStorage.getItem("searchWord");
+          this.historyWord = this.historyWord.split(",");
+        }
+      });
+    },
+    toPatient(id) {
+      this.$router.push({ path: "/patientdetail?patientid=" + id });
+    },
+    deteleHistory() {
+      this.historyWord = [];
+      localStorage.removeItem("searchWord");
+    }
+  },
+  created() {
+    this.historyWord = localStorage.getItem("searchWord");
+    this.historyWord = this.historyWord.split(","); //将字符串转成数组
+    console.log();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page_search {
+  overflow: hidden;
+  overflow-y: auto;
+  height: 100%;
+  .header {
+    height: 2.5rem;
+    width: 100%;
+    line-height: 2.5rem;
+    border-bottom: 1px solid #f4f4f4;
+    display: flex;
+    align-items: center;
+    background: #fff;
+    .icon-zuojiantou {
+      float: left;
+      width: 2.5rem;
+      height: 2.5rem;
+      text-align: center;
+    }
+    .van-search {
+      padding: 0;
+      width: 80%;
+    }
+    .van-search__content {
+      border-radius: 0.9375rem;
+    }
+    .van-search .van-cell {
+      display: flex;
+      align-items: center;
+    }
+  }
+  .history {
+    padding: 1.25rem 0.75rem 0 0.875rem;
+    .historyTitle {
+      height: 1.25rem;
+      line-height: 1.25rem;
+      i {
+        float: right;
+        font-size: 1.625rem;
+        color: #9b9b9b;
+      }
+      span {
+        float: left;
+        font-size: 0.9375rem;
+        color: rgba(60, 60, 60, 1);
+      }
+    }
+  }
+  .record {
+    margin-top: 1.25rem;
+    .recordList {
+      display: flex;
+      flex-wrap: wrap;
+    }
+    .recordOne {
+      min-width: 0.0625rem;
+      background: rgba(244, 244, 244, 1);
+      border-radius: 14px;
+      color: rgba(155, 155, 155, 1);
+      font-size: 0.875rem;
+      padding: 0.4375rem 0.875rem;
+      margin-right: 0.625rem;
+      box-sizing: border-box;
+      margin-bottom: 0.625rem;
+    }
+  }
+  .searchList {
+    padding: 0 0.875rem;
+    .patientOne {
+      display: flex;
+      align-items: center;
+      height: 3.75rem;
+      img {
+        width: 2.5rem;
+        height: 2.5rem;
+        margin-right: 0.875rem;
+      }
+      p {
+        flex: 1;
+        height: 100%;
+        line-height: 3.75rem;
+        box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+      }
+    }
+  }
+}
+::-webkit-scrollbar {
+  width: 0;
+}
+</style>

src/router/index.js

@@ -46,16 +46,32 @@ export default new Router({
     },
     // 首页
     {
-      path: '/homeIndex',
-      name: 'Home',
-      component: () => import('@/pages/homeIndex/index')
-
+      path: '/myIndex',
+      name: 'myIndex',
+      component: () => import('@/pages/home/index'),
+      children: [{
+          path: '/homeIndex',
+          component: () => import('@/pages/homeIndex/index.vue'),
+          meta: {
+            noCache: true // 不会被 <keep-alive> 缓存
+          }
+        },
+        // 我的
+        {
+          path: '/newMy',
+          name: 'newMy',
+          component: () => import('@/pages/my/index')
+        }
+      ]
     },
     // 患者中心
     {
       path: '/patients',
       name: 'patients',
-      component: () => import('@/pages/patientManagement/patientManagement')
+      component: () => import('@/pages/patientManagement/patientManagement'),
+      meta: {
+        noCache: true // 不会被 <keep-alive> 缓存
+      }
     },
     // 新增病人
     {
@@ -81,12 +97,39 @@ export default new Router({
       name: 'editPatient',
       component: () => import('@/pages/patients/editPatient')
     },
+    // 全部排班
+    {
+      path: '/editScheduling',
+      name: 'editscheduling',
+      component: () => import('@/pages/allScheduling/index')
+
+    },
+    // 全部透后宣教
+    {
+      path: '/editEducation',
+      name: 'editeducation',
+      component: () => import('@/pages/allEducation/index')
+
+    },
+    // 全部抢救记录
+    {
+      path: '/rescuerecord',
+      name: 'rescuerecord',
+      component: () => import('@/pages/allRescue/index')
+
+    },
     //
     {
       path: '/patientdetail',
       name: 'patientdetail',
       component: () => import('@/pages/doctorAdvice/index')
     },
+    // 搜索
+    {
+      path: '/search',
+      name: 'search',
+      component: () => import('@/pages/search/index')
+    },
     {
       path: '/product',
       name: 'Product',

src/store/user/user.js

@@ -23,6 +23,7 @@ const user = {
     admin:null,
     org: {
       id: 0,
+      creator:0,
       org_short_name: '',
       org_name: '',
       org_intro: '',
@@ -30,7 +31,7 @@ const user = {
       address: '',
       province: 0,
       city: 0,
-      district: 0
+      district: 0,
     },
     serve: {
       state: 0,
@@ -93,6 +94,9 @@ const user = {
         state.org.province = 0
         state.org.city = 0
         state.org.district = 0
+        state.org.creator = 0
+
+
 
       }else{
         state.org.id = org.id
@@ -104,6 +108,8 @@ const user = {
         state.org.province = org.province
         state.org.city = org.city
         state.org.district = org.district
+        state.org.creator = org.creator
+
       }
 
     },

src/styles/newStyle.scss

@@ -1,6 +1,6 @@
 html,
 body {
   height: 100%;
-  background: #fff;
-  color: #000;
+  background: #fff !important;
+  color: #000 !important;
 }

src/utils/tools.js

@@ -144,6 +144,38 @@ export function uParseTime(time, cFormat) {
   return time_str
 }
 
+export function uParseTimeOne(time, cFormat) {
+  if (arguments.length === 0) {
+    return null
+  }
+  const format = cFormat || '{y}-{m}-{d}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if (('' + time).length !== 13) time = parseInt(time) * 1000
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key]
+    if (key === 'a') return ['一', '二', '三', '四', '五', '六', '日'][value - 1]
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}
+
 export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
   var t = 0.5
   if (type == 1) {