修改

src/pages/main/dialysis/CourseManagement.vue

@@ -0,0 +1,462 @@
+<template>
+  <div class="newCourseManagement">
+    <div>
+      <div class="toolBox">
+        <div class="toolOne" @click="startShow = true">
+          <div style="display: flex;align-items: center;">
+            {{ startTime }}
+            <van-icon name="arrow-down" />
+          </div>
+        </div>
+        <div class="toolOne" @click="endShow = true">
+          <div style="display: flex;align-items: center;">
+            {{ endTime }}
+            <van-icon name="arrow-down" />
+          </div>
+        </div>
+      </div>
+      <div class="adviceBox" v-if="courseManagement.length > 0">
+        <van-list
+          v-model="loading"
+          finished-text="没有更多了"
+          @load="onLoad"
+          :finished="finished"
+        >
+          <div class="adviceMain">
+            <div
+              class="adviceOne"
+              v-for="(item, index) in this.courseManagement"
+              :key="item.id"
+            >
+              <div class="adviceTitle">
+                <p>{{ getTime(item.record_time) }}</p>
+                <van-icon
+                  class="ellipsis"
+                  name="ellipsis"
+                  @click="toDeleteCourseManagement(item.id, index)"
+                />
+              </div>
+              <div class="statOrder" @click="toCourseDetail(item.id)">
+                <div class="statOrderTitle">
+                  <span>{{ item.title }}</span>
+                </div>
+                <div class="orderContent">
+                  <p>
+                    <span v-html="item.content"></span>
+                  </p>
+                </div>
+                <div class="doctorBox">
+                  <p>记录医生：{{ item.user_name }}</p>
+                </div>
+              </div>
+              <div class="all">全部</div>
+            </div>
+          </div>
+        </van-list>
+      </div>
+      <div class="noimgBox" v-else>
+        <img src="../../../assets/images/none.png" alt />
+      </div>
+    </div>
+    <!-- <div class="add">
+      <div style="display: flex;align-items: center;">
+        <van-icon class="addIcon" name="add" />新增
+      </div>
+    </div>-->
+
+    <!-- 弹出层 -->
+    <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"
+        :style="{ height: '40%' }"
+      >
+        <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          :min-date="minDate"
+          :max-date="maxDate"
+          @confirm="getstartTime"
+          @cancel="startShow = false"
+        />
+      </van-popup>
+      <van-popup v-model="endShow" position="bottom" :style="{ height: '40%' }">
+        <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          :min-date="minDate"
+          :max-date="maxDate"
+          @confirm="getstartTime2"
+          @cancel="endShow = false"
+        />
+      </van-popup>
+
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+        @select="onDeleteConfirm"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  getCourseManagement,
+  DeleteCouseManage,
+  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,
+      startShow: false,
+      endShow: false,
+      startTime: "请选择",
+      endTime: "请选择",
+      endTimes: "",
+      minDate: new Date(1970, 0, 1),
+      maxDate: new Date(2025, 10, 1),
+      currentDate: new Date(),
+      actions: [{ name: "查看全部" }, { name: "全部删除" }],
+      limit: 10,
+      page: 1,
+      total: 0,
+      loading: false,
+      finished: false,
+      typeShow: false,
+      columns: [],
+      courseManagement: [],
+      patientid: 0,
+      list: [],
+      patient_id: 0,
+      patient_index: 0,
+      showOne: true,
+      showTwo: false
+    };
+  },
+  methods: {
+    onCancel() {
+      this.typeShow = false;
+    },
+    onConfirm(value) {
+      this.type = value;
+      this.typeShow = false;
+    },
+    getstartTime(value) {
+      this.page = 1;
+      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.startTime = `${year}-${month}-${day}`;
+      this.courseManagement = [];
+      this.getCourseManagement(
+        this.patientid,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
+      this.startShow = false;
+    },
+    getstartTime2(value) {
+      this.page = 1;
+      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.endTime = `${year}-${month}-${day}`;
+
+      this.courseManagement = [];
+      this.getCourseManagement(
+        this.patientid,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
+      this.endShow = false;
+    },
+    getTime(time) {
+      // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    getCourseManagement(patientid) {
+      getCourseManagement(
+        patientid,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      ).then(response => {
+        if (response.data.state == 1) {
+          var coursemanagement = response.data.data.coursemanagement;
+          this.courseManagement = clearStyle(coursemanagement);
+          var total = response.data.data.total;
+          this.total = total;
+          this.loading = false;
+        }
+      });
+    },
+    onLoad() {
+      setTimeout(() => {
+        this.page++;
+        // console.log(this.page)
+        if (this.page <= Math.ceil(this.total / 10)) {
+          this.getCourseManagement(this.patientid);
+        } else {
+          this.loading = false;
+          this.finished = true;
+        }
+      }, 1000);
+    },
+    toDeleteCourseManagement(id, index) {
+      this.patient_id = id;
+      this.patient_index = index;
+      this.newShow = true;
+    },
+    onDeleteConfirm(value) {
+      if (value.name == "查看全部") {
+        var patientid = this.$route.query.patientid;
+        this.$router.push(
+          "/coursedetail?id=" +
+            this.patient_id +
+            "&patientid=" +
+            patientid +
+            "&active=" +
+            this.active
+        );
+      }
+      if (value.name == "全部删除") {
+        this.DeleteCouseManage(this.patient_id);
+      }
+    },
+    DeleteCouseManage(id, index) {
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteCouseManage(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+            console.log("msg", msg);
+            this.courseManagement.splice(index, 1);
+            this.newShow = false;
+          }
+        });
+      });
+    },
+    toCourseDetail(id) {
+      var patientid = this.$route.query.patientid;
+      this.$router.push(
+        "/coursedetail?id=" +
+          id +
+          "&patientid=" +
+          patientid +
+          "&active=" +
+          this.active
+      );
+    },
+    getPatientDetail(patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.courseManagement = [];
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
+          }
+          this.patientName = patientDetail.name;
+        }
+      });
+    }
+  },
+  created() {
+    var patientid = this.$route.query.patientid;
+    this.patientid = patientid;
+    // console.log("干体重id", patientid);
+    this.getCourseManagement(patientid);
+    this.getPatientDetail(patientid);
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.newCourseManagement {
+  height: 100%;
+  overflow-y: auto;
+  background: #fff;
+  .toolBox {
+    display: flex;
+    height: 1.6rem;
+    align-items: center;
+    .toolOne {
+      width: 3.4rem;
+      height: 1rem;
+      background: rgba(246, 246, 246, 1);
+      border-radius: 5px;
+      text-align: center;
+      font-size: 0.42rem;
+      color: #8d8d8d;
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      margin-left: 0.42rem;
+    }
+  }
+  .adviceBox {
+    padding: 0 0.66rem;
+    margin-bottom: 1.6rem;
+  }
+  .adviceMain {
+    > div:last-child {
+      border: none;
+    }
+  }
+  .adviceOne {
+    // box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+    border-bottom: 1px solid #e5e5e5;
+    padding-bottom: 0.34rem;
+  }
+  .adviceTitle {
+    padding-top: 0.34rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    p {
+      color: #000000;
+      font-weight: bold;
+      font-size: 0.5rem;
+    }
+    .ellipsis {
+      font-size: 0.66rem;
+      color: #cccccc;
+    }
+  }
+  .statOrderTitle {
+    color: #5b98ff;
+    font-size: 0.43rem;
+    font-weight: bold;
+    margin: 0.34rem 0;
+  }
+  .orderContent {
+    font-size: 0.46rem;
+    color: rgba(49, 50, 52, 1);
+    margin-top: 0.34rem;
+    display: flex;
+    flex-wrap: wrap;
+    p {
+      line-height: 0.8rem;
+      // width: 50%;
+    }
+  }
+  .doctorBox {
+    font-size: 0.4rem;
+    color: rgba(152, 152, 152, 1);
+    line-height: 0.6rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 0.34rem;
+  }
+  .all {
+    font-size: 0.43rem;
+    color: #5b98ff;
+    margin-top: 0.34rem;
+  }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 5rem;
+      height: 5rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
+  // .add {
+  //   position: fixed;
+  //   bottom: 0;
+  //   left: 0;
+  //   width: 100%;
+  //   height: 2.75rem;
+  //   background: rgba(255, 255, 255, 1);
+  //   box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
+  //   display: flex;
+  //   align-items: center;
+  //   justify-content: space-around;
+  //   font-size: 0.9375rem;
+  //   color: #979798;
+  //   .addIcon {
+  //     color: #5b98ff;
+  //     font-size: 1.25rem;
+  //     margin-right: 0.25rem;
+  //   }
+  // }
+  .van-popup {
+    border-radius: 0;
+    transform: translate3d(0, 0, 0);
+    top: initial;
+  }
+  
+}
+::-webkit-scrollbar {
+  width: 0;
+}
+</style>
+<style lang="scss">
+.newCourseManagement{
+  .van-picker__toolbar{
+    height: 1.46rem;
+    line-height: 1.46rem;
+  }
+  .van-picker__cancel, .van-picker__confirm{
+    padding: 0 0.53rem;
+    font-size: 0.46rem;
+  }
+  .van-picker-column{
+    font-size: 0.53rem;
+  }
+  .van-picker-column__item{
+    padding: 0 0.14rem;
+  }
+}
+</style>

src/pages/main/dialysis/DialysisTab.vue

@@ -21,11 +21,26 @@
     <div class="tab-content">
       <long-table v-show="index == 0" title="长期透析处方"></long-table>
       <record-table v-show="index == 1" title="透析记录"></record-table>
-      <!--<advice-table v-show="index==2" title="医嘱信息"></advice-table>-->
       <schedul-table v-show="index == 2" class="排班信息"></schedul-table>
       <mission-table v-show="index == 3" class="宣教信息"></mission-table>
     </div>
   </div>
+  <!-- <div>
+    <van-tabs v-model="active" sticky @click="onClick">
+      <van-tab title="长期透析处方">
+        <long-table></long-table>
+      </van-tab>
+      <van-tab title="透析记录">
+        <record-table></record-table>
+      </van-tab>
+      <van-tab title="排班信息">
+        <schedul-table></schedul-table>
+      </van-tab>
+      <van-tab title="宣教信息">
+         <mission-table></mission-table>
+      </van-tab>
+    </van-tabs>
+  </div> -->
 </template>
 
 <script>

src/pages/main/dialysis/DryWeight.vue

@@ -0,0 +1,474 @@
+<template>
+  <div class="newDryWeight">
+    <div>
+      <div class="toolBox">
+        <div class="toolOne" @click="startShow = true">
+          <div style="display: flex; align-items: center;">
+            {{ startTime }}
+            <van-icon name="arrow-down" />
+          </div>
+        </div>
+        <div class="toolOne" @click="endShow = true">
+          <div style="display: flex; align-items: center;">
+            {{ endTime }}
+            <van-icon name="arrow-down" />
+          </div>
+        </div>
+      </div>
+
+      <div class="adviceBox" v-if="dryweight.length > 0">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
+          <div class="adviceMain">
+            <div
+              class="adviceOne"
+              v-for="(item, index) in dryweight"
+              :key="index"
+            >
+              <div class="adviceTitle">
+                <p>{{ getTime(item.ctime) }}</p>
+                <van-icon
+                  class="ellipsis"
+                  name="ellipsis"
+                  @click="DeleteDryWeightOne(item.id, index)"
+                />
+              </div>
+              <div class="statOrder" @click="getDryWeightDetail(item.id)">
+                <div class="weightContent">
+                  <p>干体重：{{ item.dry_weight }}kg</p>
+                  <p>{{ item.adjusted_value }}kg</p>
+                </div>
+                <div class="doctorBox">
+                  <p>记录医生：{{ item.user_name }}</p>
+                </div>
+                <div class="all">全部</div>
+              </div>
+            </div>
+          </div>
+        </van-list>
+      </div>
+
+      <div class="noimgBox" v-else>
+        <img src="../../../assets/images/none.png" alt />
+      </div>
+    </div>
+    <!-- <div class="add">
+      <div style="display: flex;align-items: center;">
+        <van-icon class="addIcon" name="add" />新增
+      </div>
+    </div>-->
+
+    <!-- 弹出层 -->
+    <div>
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+        @select="onDeleteConfirm"
+      />
+    </div>
+    <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-datetime-picker
+        v-model="currentDate"
+        type="date"
+        :min-date="minDate"
+        :max-date="maxDate"
+        @confirm="getstartTime"
+        @cancel="startShow = false"
+      />
+    </van-popup>
+    <van-popup v-model="endShow" position="bottom" :style="{ height: '40%' }">
+      <van-datetime-picker
+        v-model="currentDate"
+        type="date"
+        :min-date="minDate"
+        :max-date="maxDate"
+        @confirm="getstartTime2"
+        @cancel="endShow = false"
+      />
+    </van-popup>
+  </div>
+</template>
+
+<script>
+import {
+  getDryWeight,
+  DeleteDryWeight,
+  getPatientDetail
+} from "@/api/patient/patient";
+import { uParseTime } from "@/utils/tools";
+import { Dialog } from "vant";
+const moment = require("moment");
+export default {
+  props: {
+    active: Number,
+    dryId: String
+  },
+  data() {
+    return {
+      newShow: false,
+      startShow: false,
+      endShow: false,
+      startTime: "请选择",
+      endTime: "请选择",
+      minDate: new Date(1970, 0, 1),
+      maxDate: new Date(2025, 10, 1),
+      endTimes: "",
+      currentDate: new Date(),
+      actions: [{ name: "查看全部" }, { name: "全部删除" }],
+      page: 1,
+      limit: 10,
+      dryweight: [],
+      patient_id: "",
+      total: 0,
+      list: [],
+      loading: false,
+      finished: false,
+      typeShow: false,
+      dry_id: 0,
+      dry_index: 0,
+      showOne: true,
+      showTwo: false
+    };
+  },
+  methods: {
+    onCancel() {
+      this.typeShow = false;
+    },
+    onConfirm(value) {
+      this.type = value;
+      this.typeShow = false;
+    },
+    getstartTime(value) {
+      this.page = 1;
+      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.startTime = `${year}-${month}-${day}`;
+      this.dryweight = [];
+      this.getDryWeight(
+        this.patient_id,
+        this.startTime,
+        this.endTime,
+        this.limit,
+        this.page
+      );
+
+      this.startShow = false;
+    },
+    getstartTime2(value) {
+      this.page = 1;
+      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.endTime = `${year}-${month}-${day}`;
+      this.dryweight = [];
+      this.getDryWeight(
+        this.patient_id,
+        this.startTime,
+        this.endTime,
+        this.limit,
+        this.page
+      );
+      this.endShow = false;
+    },
+    getDryWeight(patientid) {
+      getDryWeight(
+        patientid,
+        this.startTime,
+        this.endTime,
+        this.limit,
+        this.page
+      ).then(response => {
+        if (response.data.state === 1) {
+          var dryweight = response.data.data.dryweight;
+          let arr = this.dryweight;
+          arr.push(...dryweight);
+          this.dryweight = arr;
+          var total = response.data.data.total;
+          this.total = total;
+          this.loading = false;
+        }
+      });
+    },
+    getDryWeight1(patientid) {
+      getDryWeight(
+        patientid,
+        this.startTime,
+        this.endTimes,
+        this.limit,
+        this.page
+      ).then(response => {
+        if (response.data.state === 1) {
+          var dryweight = response.data.data.dryweight;
+          this.dryweight = dryweight;
+
+          var total = response.data.data.total;
+
+          this.total = total;
+          this.loading = false;
+        }
+      });
+    },
+    onLoad() {
+      setTimeout(() => {
+        this.page++;
+        if (this.page <= Math.ceil(this.total / 10)) {
+          this.getDryWeight(
+            this.patient_id,
+            this.startTime,
+            this.endTimes,
+            this.limit,
+            this.page
+          );
+        } else {
+          this.loading = false;
+          this.finished = true;
+        }
+      }, 1000);
+    },
+    getTime(time) {
+      // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    DeleteDryWeightOne(id, index) {
+      this.newShow = true;
+      this.dry_id = id;
+      this.dry_index = index;
+    },
+    onDeleteConfirm(value) {
+      if (value.name == "查看全部") {
+        var patientid = this.$route.query.patientid;
+        this.$router.push(
+          "/dryweight?id=" +
+            this.dry_id +
+            "&patientid=" +
+            patientid +
+            "&active=" +
+            this.active
+        );
+      }
+      if (value.name == "全部删除") {
+        this.DeleteDryWeight(this.dry_id, this.dry_index);
+      }
+    },
+    DeleteDryWeight(id, index) {
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteDryWeight(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+            // console.log("msg", msg);
+            this.dryweight.splice(index, 1);
+            this.newShow = false;
+          }
+        });
+      });
+    },
+    getDryWeightDetail(id) {
+      var patientid = this.$route.query.patientid;
+      this.$router.push(
+        "/dryweight?id=" +
+          id +
+          "&patientid=" +
+          patientid +
+          "&active=" +
+          this.active
+      );
+    },
+    getPatientDetail(patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.dryweight = [];
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
+          }
+          // console.log("病人详情", patientDetail);
+          this.patientName = patientDetail.name;
+        }
+      });
+    }
+  },
+  created() {
+    // console.log("created");
+    // this.loading = true;
+    var patientid = this.$route.query.patientid;
+    // console.log("干体重id", patientid);
+    this.getDryWeight(patientid);
+    this.patient_id = patientid;
+    this.getPatientDetail(patientid);
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.newDryWeight {
+  height: 100%;
+  overflow-y: auto;
+  background: #fff;
+  .toolBox {
+    display: flex;
+    height: 1.6rem;
+    align-items: center;
+    .toolOne {
+      width: 3.4rem;
+      height: 1rem;
+      background: rgba(246, 246, 246, 1);
+      border-radius: 5px;
+      text-align: center;
+      font-size: 0.42rem;
+      color: #8d8d8d;
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      margin-left: 0.42rem;
+    }
+  }
+  .adviceBox {
+    padding: 0 0.66rem;
+    margin-bottom: 1.6rem;
+  }
+  .adviceMain {
+    > div:last-child {
+      border: none;
+    }
+  }
+  .adviceOne {
+    // box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+    border-bottom: 1px solid #e5e5e5;
+    padding-bottom: 0.34rem;
+  }
+  .adviceTitle {
+    padding-top: 0.34rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    p {
+      color: #000000;
+      font-weight: bold;
+      font-size: 0.5rem;
+    }
+    .ellipsis {
+      font-size: 0.66rem;
+      color: #cccccc;
+    }
+  }
+  .orderContent {
+    font-size: 0.46rem;
+    color: rgba(49, 50, 52, 1);
+    margin-top: 0.34rem;
+    display: flex;
+    flex-wrap: wrap;
+    p {
+      line-height: 0.8rem;
+      width: 50%;
+    }
+  }
+  .weightContent {
+    font-size: 0.46rem;
+    color: rgba(49, 50, 52, 1);
+    display: flex;
+    p {
+      line-height: 0.6rem;
+      margin-right: 0.34rem;
+      margin-top: 0.13rem;
+    }
+  }
+  .doctorBox {
+    font-size: 0.4rem;
+    color: rgba(152, 152, 152, 1);
+    line-height: 0.6rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 0.34rem;
+  }
+  .all {
+    font-size: 0.43rem;
+    color: #5b98ff;
+    margin-top: 0.34rem;
+  }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 5rem;
+      height: 5rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
+  // .add {
+  //   position: fixed;
+  //   bottom: 0;
+  //   left: 0;
+  //   width: 100%;
+  //   height: 2.75rem;
+  //   background: rgba(255, 255, 255, 1);
+  //   box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
+  //   display: flex;
+  //   align-items: center;
+  //   justify-content: space-around;
+  //   font-size: 0.9375rem;
+  //   color: #979798;
+  //   .addIcon {
+  //     color: #5b98ff;
+  //     font-size: 1.25rem;
+  //     margin-right: 0.25rem;
+  //   }
+  // }
+  .van-popup {
+    border-radius: 0;
+    transform: translate3d(0, 0, 0);
+    top: initial;
+  }
+  
+}
+::-webkit-scrollbar {
+  width: 0;
+}
+</style>
+<style lang="scss">
+.newDryWeight{
+  .van-picker__toolbar{
+    height: 1.46rem;
+    line-height: 1.46rem;
+  }
+  .van-picker__cancel, .van-picker__confirm{
+    padding: 0 0.53rem;
+    font-size: 0.46rem;
+  }
+  .van-picker-column{
+    font-size: 0.53rem;
+  }
+  .van-picker-column__item{
+    padding: 0 0.14rem;
+  }
+}
+</style>

src/pages/main/dialysis/MissionTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <!-- <div>
     <div class="choice">
       <ul>
         <li>
@@ -39,7 +39,6 @@
           <li style="width:65%;">{{ item.mission }}</li>
         </ul>
       </div>
-      <!--<div class="NoData" v-show="tableDate.length == 0"><img src="@/assets/login/data.jpg" alt=""></div>-->
       <div class="NoData" v-show="tableDate.length == 0">
         <img
           style="margin-top: 50px; margin-bottom: 50px"
@@ -64,242 +63,676 @@
       :endDate="new Date()"
       v-model="endTime"
     ></mt-datetime-picker>
+  </div> -->
+  <div class="newEducation">
+    <div>
+      <div class="toolBox">
+        <div class="toolOne" @click="startShow = true">
+          <div style="display: flex;align-items: center;">
+            {{ startTime }}
+            <van-icon name="arrow-down" />
+          </div>
+        </div>
+        <div class="toolOne" @click="endShow = true">
+          <div style="display: flex;align-items: center;">
+            {{ endTime }}
+            <van-icon name="arrow-down" />
+          </div>
+        </div>
+      </div>
+      <div class="adviceBox" v-if="Education.length > 0">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
+          <div class="adviceMain">
+            <div
+              class="adviceOne"
+              v-for="(item, index) in Education"
+              :key="index"
+            >
+              <div class="adviceTitle">
+                <p>{{ getTime(item.assessment_date) }}</p>
+                <van-icon
+                  class="ellipsis"
+                  name="ellipsis"
+                  @click="toDeleteEducation(item.id, item.index)"
+                />
+              </div>
+              <div class="statOrder" @click="toEducationDetail(item.id)">
+                <div class="orderContent">
+                  <p>{{ item.mission }}</p>
+                </div>
+              </div>
+              <div class="all">全部</div>
+            </div>
+          </div>
+        </van-list>
+      </div>
+
+      <div class="noimgBox" v-else>
+        <img src="../../../assets/images/none.png" alt />
+      </div>
+    </div>
+    <!-- <div class="add">
+      <div style="display: flex;align-items: center;">
+        <van-icon class="addIcon" name="add" />新增
+      </div>
+    </div>-->
+
+    <!-- 弹出层 -->
+    <div>
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          :min-date="minDate"
+          :max-date="maxDate"
+          @confirm="getstartTime"
+          @cancel="startShow = false"
+        />
+      </van-popup>
+      <van-popup v-model="endShow" position="bottom" :style="{ height: '40%' }">
+        <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          :min-date="minDate"
+          :max-date="maxDate"
+          @confirm="getstartTime2"
+          @cancel="endShow = false"
+        />
+      </van-popup>
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @select="DeleteEducation"
+      />
+    </div>
   </div>
 </template>
 
 <script>
-import { parseTime } from "@/utils";
-import { getAllEducationList } from "@/api/patient";
+// import { parseTime } from "@/utils";
+// import { getAllEducationList } from "@/api/patient";
 
-import { Popover } from "vux";
-export default {
-  name: "LongTable",
-  created() {
-    this.tableDate = [];
+// import { Popover } from "vux";
+// export default {
+//   name: "LongTable",
+//   created() {
+//     this.tableDate = [];
 
-    this.queryParams.start_time = this.parseTime(
-      new Date().getTime() / 1000,
-      "{y}-{m}-{d}"
-    );
-    this.queryParams.end_time = this.parseTime(
-      new Date().getTime() / 1000,
-      "{y}-{m}-{d}"
-    );
-    this.queryParams.patient_id = this.$route.query.patient_id;
-    this.queryParams.page = this.queryParams.page + 1;
-    this.queryParams.limit = 15;
-    this.tableDate = [];
+//     this.queryParams.start_time = this.parseTime(
+//       new Date().getTime() / 1000,
+//       "{y}-{m}-{d}"
+//     );
+//     this.queryParams.end_time = this.parseTime(
+//       new Date().getTime() / 1000,
+//       "{y}-{m}-{d}"
+//     );
+//     this.queryParams.patient_id = this.$route.query.patient_id;
+//     this.queryParams.page = this.queryParams.page + 1;
+//     this.queryParams.limit = 15;
+//     this.tableDate = [];
 
-    getAllEducationList(this.queryParams).then(response => {
-      if (response.data.state == 0) {
-        return false;
-      } else {
-        if (response.data.data.total == 0) {
-        } else {
-          for (let i = 0; i < response.data.data.edus.length; i++) {
-            this.tableDate.push(response.data.data.edus[i]);
-          }
-        }
-      }
-    });
+//     getAllEducationList(this.queryParams).then(response => {
+//       if (response.data.state == 0) {
+//         return false;
+//       } else {
+//         if (response.data.data.total == 0) {
+//         } else {
+//           for (let i = 0; i < response.data.data.edus.length; i++) {
+//             this.tableDate.push(response.data.data.edus[i]);
+//           }
+//         }
+//       }
+//     });
+//   },
+//   data() {
+//     return {
+//       tableDate: [],
+//       loading: false,
+//       finished: false,
+
+//       startTime: new Date(),
+//       endTime: new Date(),
+
+//       queryParams: {
+//         mode_id: "",
+//         start_time: "",
+//         end_time: "",
+//         page: 0,
+//         patient_id: 0,
+//         limit: 15
+//       }
+//     };
+//   },
+//   methods: {
+//     parseTime(time, layout) {
+//       return parseTime(time, layout);
+//     },
+//     onLoad() {
+//       this.queryParams.start_time = this.parseTime(
+//         this.startTime.getTime() / 1000,
+//         "{y}-{m}-{d}"
+//       );
+//       this.queryParams.end_time = this.parseTime(
+//         this.endTime.getTime() / 1000,
+//         "{y}-{m}-{d}"
+//       );
+//       this.queryParams.patient_id = this.$route.query.patient_id;
+//       this.queryParams.page = this.queryParams.page + 1;
+//       this.queryParams.limit = 15;
+
+//       getAllEducationList(params).then(response => {
+//         if (response.data.state == 0) {
+//           this.finished = true;
+//           this.loading = false;
+//           return false;
+//         } else {
+//           if (response.data.data.edus.length == 0) {
+//             this.finished = true;
+//             this.loading = false;
+//           } else {
+//             for (let i = 0; i < response.data.data.edus.length; i++) {
+//               this.tableDate.push(response.data.data.edus[i]);
+//             }
+//             this.loading = false;
+//           }
+//         }
+//       });
+//     },
+//     handleStartDateConfirm: function(val) {
+//       this.queryParams.start_time = this.parseTime(
+//         this.startTime / 1000,
+//         "{y}-{m}-{d}"
+//       );
+//       this.queryParams.end_time = this.parseTime(
+//         this.endTime / 1000,
+//         "{y}-{m}-{d}"
+//       );
+//       this.queryParams.page = 1;
+//       this.queryParams.limit = 15;
+
+//       this.getRecordList(this.queryParams);
+//     },
+//     handleEndDateConfirm: function(val) {
+//       this.queryParams.start_time = this.parseTime(
+//         this.startTime / 1000,
+//         "{y}-{m}-{d}"
+//       );
+//       this.queryParams.end_time = this.parseTime(
+//         this.endTime / 1000,
+//         "{y}-{m}-{d}"
+//       );
+//       this.queryParams.page = 1;
+//       this.queryParams.limit = 15;
+//       this.getRecordList(this.queryParams);
+//     },
+//     openStartPicker: function() {
+//       this.$refs.start_date_picker.open();
+//     },
+//     openEndPicker: function() {
+//       this.$refs.end_date_picker.open();
+//     },
+//     getRecordList: function(val) {
+//       this.tableDate = [];
+//       getAllEducationList(val).then(response => {
+//         if (response.data.state == 0) {
+//           return false;
+//         } else {
+//           if (response.data.data.edus.length == 0) {
+//           } else {
+//             for (let i = 0; i < response.data.data.edus.length; i++) {
+//               this.tableDate.push(response.data.data.edus[i]);
+//             }
+//           }
+//         }
+//       });
+//     }
+//   },
+
+//   components: {
+//     Popover
+//   }
+// };
+</script>
+
+<script>
+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 {
-      tableDate: [],
+      newShow: false,
+      startShow: false,
+      endShow: false,
+      startTime: "请选择",
+      endTime: "请选择",
+      minDate: new Date(1970, 0, 1),
+      maxDate: new Date(2025, 10, 1),
+      currentDate: new Date(),
+      actions: [{ name: "查看全部" }, { name: "全部删除" }],
+      showOne: true,
+      showTwo: false,
+      limit: 10,
+      page: 1,
+      total: 0,
       loading: false,
       finished: false,
-
-      startTime: new Date(),
-      endTime: new Date(),
-
-      queryParams: {
-        mode_id: "",
-        start_time: "",
-        end_time: "",
-        page: 0,
-        patient_id: 0,
-        limit: 15
-      }
+      list: [],
+      Education: [],
+      patient_id: "",
+      id: 0,
+      index: 0
     };
   },
   methods: {
-    parseTime(time, layout) {
-      return parseTime(time, layout);
+    onCancel() {
+      this.typeShow = false;
     },
-    onLoad() {
-      this.queryParams.start_time = this.parseTime(
-        this.startTime.getTime() / 1000,
-        "{y}-{m}-{d}"
-      );
-      this.queryParams.end_time = this.parseTime(
-        this.endTime.getTime() / 1000,
-        "{y}-{m}-{d}"
+    onConfirm(value) {
+      this.type = value;
+      this.typeShow = false;
+    },
+    getstartTime(value) {
+      this.page = 1;
+      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.startTime = `${year}-${month}-${day}`;
+      this.Education = [];
+      this.getEducation(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
       );
-      this.queryParams.patient_id = this.$route.query.patient_id;
-      this.queryParams.page = this.queryParams.page + 1;
-      this.queryParams.limit = 15;
+      this.startShow = false;
+    },
+    getstartTime2(value) {
+      this.page = 1;
+      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}`;
+      }
 
-      getAllEducationList(params).then(response => {
-        if (response.data.state == 0) {
-          this.finished = true;
+      this.endTime = `${year}-${month}-${day}`;
+      this.Education = [];
+      this.getEducation(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
+      this.endShow = false;
+    },
+    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;
+          let arr = this.Education;
+          arr.push(...education);
+          this.Education = arr;
+          var total = response.data.data.total;
+          this.total = total;
           this.loading = false;
-          return false;
+        }
+      });
+    },
+    onLoad() {
+      setTimeout(() => {
+        this.page++;
+        if (this.page <= Math.ceil(this.total / 10)) {
+          this.getEducation(
+            this.patient_id,
+            this.limit,
+            this.page,
+            this.startTime,
+            this.endTime
+          );
         } else {
-          if (response.data.data.edus.length == 0) {
-            this.finished = true;
-            this.loading = false;
-          } else {
-            for (let i = 0; i < response.data.data.edus.length; i++) {
-              this.tableDate.push(response.data.data.edus[i]);
-            }
-            this.loading = false;
+          this.loading = false;
+          this.finished = true;
+        }
+      }, 3000);
+    },
+    getPatientDetail(patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.Education = [];
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
           }
+          this.patientName = patientDetail.name;
         }
       });
     },
-    handleStartDateConfirm: function(val) {
-      this.queryParams.start_time = this.parseTime(
-        this.startTime / 1000,
-        "{y}-{m}-{d}"
-      );
-      this.queryParams.end_time = this.parseTime(
-        this.endTime / 1000,
-        "{y}-{m}-{d}"
-      );
-      this.queryParams.page = 1;
-      this.queryParams.limit = 15;
-
-      this.getRecordList(this.queryParams);
+    getTime(time) {
+      // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, "{y}-{m}-{d}");
     },
-    handleEndDateConfirm: function(val) {
-      this.queryParams.start_time = this.parseTime(
-        this.startTime / 1000,
-        "{y}-{m}-{d}"
+    toEducationDetail(id) {
+      var patientid = this.$route.query.patientid;
+      this.$router.push(
+        "/editEducation?id=" +
+          id +
+          "&patientid=" +
+          patientid +
+          "&active=" +
+          this.active
       );
-      this.queryParams.end_time = this.parseTime(
-        this.endTime / 1000,
-        "{y}-{m}-{d}"
-      );
-      this.queryParams.page = 1;
-      this.queryParams.limit = 15;
-      this.getRecordList(this.queryParams);
     },
-    openStartPicker: function() {
-      this.$refs.start_date_picker.open();
+    toDeleteEducation(id, index) {
+      this.id = id;
+      this.index = index;
+      this.newShow = true;
     },
-    openEndPicker: function() {
-      this.$refs.end_date_picker.open();
+    DeleteEducation(value) {
+      // console.log("value", value);
+      if (value.name == "查看全部") {
+        var patientid = this.$route.query.patientid;
+        this.$router.push(
+          "/editEducation?id=" +
+            this.id +
+            "&patientid=" +
+            patientid +
+            "&active=" +
+            this.active
+        );
+      }
+      if (value.name == "全部删除") {
+        this.DeleteEducationOne(this.id, this.index);
+      }
     },
-    getRecordList: function(val) {
-      this.tableDate = [];
-      getAllEducationList(val).then(response => {
-        if (response.data.state == 0) {
-          return false;
-        } else {
-          if (response.data.data.edus.length == 0) {
-          } else {
-            for (let i = 0; i < response.data.data.edus.length; i++) {
-              this.tableDate.push(response.data.data.edus[i]);
-            }
+    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;
           }
-        }
+        });
       });
     }
   },
-
-  components: {
-    Popover
+  created() {
+    var patientid = this.$route.query.patientid;
+    this.getPatientDetail(patientid);
+    this.getEducation(patientid);
+    this.patient_id = patientid;
   }
 };
 </script>
 
-<style style="stylesheet/scss" lang="scss" scoped>
-.choice {
-  border-bottom: 1px #e5e5e5 solid;
-  ul {
-    @include display-flex;
-    @include align-items-center;
-    @include text-align;
-    @include justify-content-between;
-    width: 80%;
-    margin: 0 auto;
-    font-size: 0.45rem;
-    color: $pgh-color;
-    li {
-      @include display-flex;
-      @include align-items-center;
-      @include text-align;
-      @include justify-content-between;
-      padding: 0.3rem 0;
-      margin: 0 auto;
-      .iconfont {
-        margin: 0 0.1rem;
-        // @media only screen and (max-width: 812px) {
-        //   font-size: 12px !important;
-        // }
-      }
-      .line {
-        background: #a8b3ba;
-        width: 0.2rem;
-        height: 1px;
-        margin: 0 0.2rem;
-        display: inline-block;
-      }
+
+<style lang="scss" scoped>
+.newEducation {
+  height: 100%;
+  overflow-y: auto;
+  background: #fff;
+  .toolBox {
+    display: flex;
+    height: 1.6rem;
+    align-items: center;
+    .toolOne {
+      width: 3.4rem;
+      height: 1rem;
+      background: rgba(246, 246, 246, 1);
+      border-radius: 5px;
+      text-align: center;
+      font-size: 0.42rem;
+      color: #8d8d8d;
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      margin-left: 0.42rem;
     }
   }
-}
-.tableTit {
-  background: $main-color;
-  color: $text-color;
-  @include box-sizing;
-  ul {
-    @include display-flex;
-    @include align-items-center;
-    @include text-align;
-    @include justify-content-center;
-    li {
-      border-right: 2px #fff solid;
-      font-size: 0.45rem;
-      height: 1.2rem;
-      line-height: 1.2rem;
+  .adviceBox {
+    padding: 0 0.66rem;
+    margin-bottom: 1.6rem;
+  }
+  .adviceMain {
+    > div:last-child {
+      border: none;
     }
-    &:last-child {
-      border-right: none;
+  }
+  .adviceOne {
+    // box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+    border-bottom: 1px solid #e5e5e5;
+    padding-bottom: 0.34rem;
+  }
+  .adviceTitle {
+    padding-top: 0.34rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    p {
+      color: #000000;
+      font-weight: bold;
+      font-size: 0.5rem;
+    }
+    .ellipsis {
+      font-size: 0.66rem;
+      color: #cccccc;
     }
   }
-}
-.tableDate {
-  background: #ecf5ff;
-  color: $pgh-color;
-  @include box-sizing;
-  ul {
-    @include display-flex;
-    @include align-items-center;
-    @include text-align;
-    @include justify-content-center;
-    li {
-      font-size: 0.45rem;
-      padding: 0.16rem 0;
-      line-height: 0.5rem;
-      border-right: 2px #fff solid;
-      span {
-        @include flex;
-        border-right: 2px #fff solid;
-        border-bottom: 2px #fff solid;
-        background: #ecf5ff;
-        display: inline-block;
-        height: 1.2rem;
-        line-height: 1.2rem;
-        .iconfont {
-          color: $main-color;
-          font-size: 0.3rem;
-          margin-right: 0.1rem;
-        }
-      }
+  .orderContent {
+    font-size: 0.46rem;
+    color: rgba(49, 50, 52, 1);
+    margin-top: 0.34rem;
+    p {
+      line-height: 0.8rem;
     }
-    &:last-child {
-      border-right: none;
+  }
+  .doctorBox {
+    font-size: 0.4rem;
+    color: rgba(152, 152, 152, 1);
+    line-height: 0.6rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 0.34rem;
+  }
+  .all {
+    font-size: 0.43rem;
+    color: #5b98ff;
+    margin-top: 0.34rem;
+  }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 5rem;
+      height: 5rem;
+      margin: 0 auto;
+      display: block;
     }
   }
+  // .add {
+  //   position: fixed;
+  //   bottom: 0;
+  //   left: 0;
+  //   width: 100%;
+  //   height: 2.75rem;
+  //   background: rgba(255, 255, 255, 1);
+  //   box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
+  //   display: flex;
+  //   align-items: center;
+  //   justify-content: space-around;
+  //   font-size: 0.9375rem;
+  //   color: #979798;
+  //   .addIcon {
+  //     color: #5b98ff;
+  //     font-size: 1.25rem;
+  //     margin-right: 0.25rem;
+  //   }
+  // }
+  .van-popup {
+    border-radius: 0;
+    transform: translate3d(0, 0, 0);
+    top: initial;
+  }
+}
+::-webkit-scrollbar {
+  width: 0;
 }
 </style>
+<style lang="scss">
+.newEducation{
+  .van-picker__toolbar{
+    height: 1.46rem;
+    line-height: 1.46rem;
+  }
+  .van-picker__cancel, .van-picker__confirm{
+    padding: 0 0.53rem;
+    font-size: 0.46rem;
+  }
+  .van-picker-column{
+    font-size: 0.53rem;
+  }
+  .van-picker-column__item{
+    padding: 0 0.14rem;
+  }
+}
+</style>
+
+
+
+<style style="stylesheet/scss" lang="scss" scoped>
+// .choice {
+//   border-bottom: 1px #e5e5e5 solid;
+//   ul {
+//     @include display-flex;
+//     @include align-items-center;
+//     @include text-align;
+//     @include justify-content-between;
+//     width: 80%;
+//     margin: 0 auto;
+//     font-size: 0.45rem;
+//     color: $pgh-color;
+//     li {
+//       @include display-flex;
+//       @include align-items-center;
+//       @include text-align;
+//       @include justify-content-between;
+//       padding: 0.3rem 0;
+//       margin: 0 auto;
+//       .iconfont {
+//         margin: 0 0.1rem;
+//         // @media only screen and (max-width: 812px) {
+//         //   font-size: 12px !important;
+//         // }
+//       }
+//       .line {
+//         background: #a8b3ba;
+//         width: 0.2rem;
+//         height: 1px;
+//         margin: 0 0.2rem;
+//         display: inline-block;
+//       }
+//     }
+//   }
+// }
+// .tableTit {
+//   background: $main-color;
+//   color: $text-color;
+//   @include box-sizing;
+//   ul {
+//     @include display-flex;
+//     @include align-items-center;
+//     @include text-align;
+//     @include justify-content-center;
+//     li {
+//       border-right: 2px #fff solid;
+//       font-size: 0.45rem;
+//       height: 1.2rem;
+//       line-height: 1.2rem;
+//     }
+//     &:last-child {
+//       border-right: none;
+//     }
+//   }
+// }
+// .tableDate {
+//   background: #ecf5ff;
+//   color: $pgh-color;
+//   @include box-sizing;
+//   ul {
+//     @include display-flex;
+//     @include align-items-center;
+//     @include text-align;
+//     @include justify-content-center;
+//     li {
+//       font-size: 0.45rem;
+//       padding: 0.16rem 0;
+//       line-height: 0.5rem;
+//       border-right: 2px #fff solid;
+//       span {
+//         @include flex;
+//         border-right: 2px #fff solid;
+//         border-bottom: 2px #fff solid;
+//         background: #ecf5ff;
+//         display: inline-block;
+//         height: 1.2rem;
+//         line-height: 1.2rem;
+//         .iconfont {
+//           color: $main-color;
+//           font-size: 0.3rem;
+//           margin-right: 0.1rem;
+//         }
+//       }
+//     }
+//     &:last-child {
+//       border-right: none;
+//     }
+//   }
+// }
+</style>

src/pages/main/dialysis/RescueRecord.vue

@@ -0,0 +1,443 @@
+<template>
+  <div class="newRescueRecord">
+    <div>
+      <div class="toolBox">
+        <div class="toolOne" @click="startShow = true">
+          <div style="display: flex;align-items: center;">
+            {{ startTime }}
+            <van-icon name="arrow-down" />
+          </div>
+        </div>
+        <div class="toolOne" @click="endShow = true">
+          <div style="display: flex;align-items: center;">
+            {{ endTime }}
+            <van-icon name="arrow-down" />
+          </div>
+        </div>
+      </div>
+      <div class="adviceBox" v-if="rescueRecords.length > 0">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
+          <div class="adviceMain">
+            <div
+              class="adviceOne"
+              v-for="(item, index) in this.rescueRecords"
+              :key="index"
+            >
+              <div class="adviceTitle">
+                <p>{{ getTime(item.record_time) }}</p>
+                <van-icon
+                  class="ellipsis"
+                  name="ellipsis"
+                  @click="toDeleteRescueRecord(item.id, item.index)"
+                />
+              </div>
+              <div class="statOrder">
+                <div class="orderContent" @click="toRescueRecord(item.id)">
+                  <p>
+                    <span v-html="item.content"></span>
+                  </p>
+                </div>
+                <div class="doctorBox">
+                  <p>记录医生：{{ item.user_name }}</p>
+                </div>
+              </div>
+              <div class="all">全部</div>
+            </div>
+          </div>
+        </van-list>
+      </div>
+      <div class="noimgBox" v-else>
+        <img src="../../../assets/images/none.png" alt />
+      </div>
+    </div>
+    <!-- <div class="add">
+      <div style="display: flex;align-items: center;">
+        <van-icon class="addIcon" name="add" />新增
+      </div>
+    </div>-->
+
+    <!-- 弹出层 -->
+    <div>
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          :min-date="minDate"
+          :max-date="maxDate"
+          @confirm="getstartTime"
+          @cancel="startShow = false"
+        />
+      </van-popup>
+      <van-popup v-model="endShow" position="bottom" :style="{ height: '40%' }">
+        <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          :min-date="minDate"
+          :max-date="maxDate"
+          @confirm="getstartTime2"
+          @cancel="endShow = false"
+        />
+      </van-popup>
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @select="Delete"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+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: "请选择",
+      endTimes: "",
+      minDate: new Date(1970, 0, 1),
+      maxDate: new Date(2025, 10, 1),
+      currentDate: new Date(),
+      actions: [{ name: "查看全部" }, { name: "全部删除" }],
+      showOne: true,
+      showTwo: false,
+      limit: 10,
+      page: 1,
+      total: 0,
+      loading: false,
+      finished: false,
+      rescueRecords: [],
+      patient_id: 0,
+      list: [],
+      id: 0,
+      index: 0
+    };
+  },
+  methods: {
+    onCancel() {
+      this.typeShow = false;
+    },
+    onConfirm(value) {
+      this.type = value;
+      this.typeShow = false;
+    },
+    getstartTime(value) {
+      this.page = 1;
+      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.startTime = `${year}-${month}-${day}`;
+      this.rescueRecords = [];
+      this.getRescueRecord(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
+      this.startShow = false;
+    },
+    getstartTime2(value) {
+      this.page = 1;
+      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.endTime = `${year}-${month}-${day}`;
+      this.rescueRecords = [];
+      this.getRescueRecord(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
+      this.endShow = false;
+    },
+    getPatientDetail(patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.rescueRecords = [];
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
+          }
+          // console.log("病人详情", patientDetail);
+          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);
+          this.loading = false;
+        }
+      });
+    },
+    onLoad() {
+      setTimeout(() => {
+        this.page++;
+        // console.log(this.page)
+        if (this.page <= Math.ceil(this.total / 10)) {
+          this.getRescueRecord(
+            this.patient_id,
+            this.startTime,
+            this.endTimes,
+            this.limit,
+            this.page
+          );
+        } else {
+          this.loading = false;
+          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 == "查看全部") {
+        var patientid = this.$route.query.patientid;
+        this.$router.push(
+          "/rescuerecord?id=" +
+            this.id +
+            "&patientid=" +
+            patientid +
+            "&active=" +
+            this.active
+        );
+      }
+      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>
+
+<style lang="scss" scoped>
+.newRescueRecord {
+  height: 100%;
+  overflow-y: auto;
+  background: #fff;
+  .toolBox {
+    display: flex;
+    height: 1.6rem;
+    align-items: center;
+    .toolOne {
+      width: 3.4rem;
+      height: 1rem;
+      background: rgba(246, 246, 246, 1);
+      border-radius: 5px;
+      text-align: center;
+      font-size: 0.42rem;
+      color: #8d8d8d;
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      margin-left: 0.42rem;
+    }
+  }
+  .adviceBox {
+    padding: 0 0.66rem;
+    margin-bottom: 1.6rem;
+  }
+  .adviceMain {
+    > div:last-child {
+      border: none;
+    }
+  }
+  .adviceOne {
+    // box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+    border-bottom: 1px solid #e5e5e5;
+    padding-bottom: 0.34rem;
+  }
+  .adviceTitle {
+    padding-top: 0.34rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    p {
+      color: #000000;
+      font-weight: bold;
+      font-size: 0.5rem;
+    }
+    .ellipsis {
+      font-size: 0.66rem;
+      color: #cccccc;
+    }
+  }
+  .orderContent {
+    font-size: 0.46rem;
+    color: rgba(49, 50, 52, 1);
+    margin-top: 0.34rem;
+    p {
+      line-height: 0.8rem;
+      width: 50%;
+    }
+  }
+  .doctorBox {
+    font-size: 0.4rem;
+    color: rgba(152, 152, 152, 1);
+    line-height: 0.6rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 0.34rem;
+  }
+  .all {
+    font-size: 0.43rem;
+    color: #5b98ff;
+    margin-top: 0.34rem;
+  }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 5rem;
+      height: 5rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
+  // .add {
+  //   position: fixed;
+  //   bottom: 0;
+  //   left: 0;
+  //   width: 100%;
+  //   height: 2.75rem;
+  //   background: rgba(255, 255, 255, 1);
+  //   box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
+  //   display: flex;
+  //   align-items: center;
+  //   justify-content: space-around;
+  //   font-size: 0.9375rem;
+  //   color: #979798;
+  //   .addIcon {
+  //     color: #5b98ff;
+  //     font-size: 1.25rem;
+  //     margin-right: 0.25rem;
+  //   }
+  // }
+  .van-popup {
+    border-radius: 0;
+    transform: translate3d(0, 0, 0);
+    top: initial;
+  }
+  
+}
+::-webkit-scrollbar {
+  width: 0;
+}
+</style>
+<style lang="scss">
+.newRescueRecord{
+  .van-picker__toolbar{
+    height: 1.46rem;
+    line-height: 1.46rem;
+  }
+  .van-picker__cancel, .van-picker__confirm{
+    padding: 0 0.53rem;
+    font-size: 0.46rem;
+  }
+  .van-picker-column{
+    font-size: 0.53rem;
+  }
+  .van-picker-column__item{
+    padding: 0 0.14rem;
+  }
+}
+</style>

src/pages/main/dialysis/SchedulTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <!-- <div>
     <van-list width="100%" v-model="loading" :finished="finished" @load="onLoad">
       <div class="blueBorder"></div>
       <div class="schedulTable">
@@ -31,158 +31,825 @@
         </div>
       </div>
     </van-list>
-    <!--<div class="NoData" v-show="tableDate.length == 0"><img src="@/assets/login/data.jpg" alt=""></div>-->
     <div class="NoData" v-show="tableDate.length == 0">
       <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
     </div>
-  </div>
+  </div> -->
+  <div class="newScheduling">
+    <div>
+      <div class="toolBox">
+        <div class="toolOne" @click="typeShow = true">
+          <div style="display: flex;align-items: center;">
+            {{ type }}
+            <van-icon name="arrow-down" />
+          </div>
+        </div>
+        <div class="toolOne" @click="startShow = true">
+          <div style="display: flex;align-items: center;">
+            {{ startTime }}
+            <van-icon name="arrow-down" />
+          </div>
+        </div>
+        <div class="toolOne" @click="endShow = true">
+          <div style="display: flex;align-items: center;">
+            {{ endTime }}
+            <van-icon name="arrow-down" />
+          </div>
+        </div>
+      </div>
+      <div class="adviceBox" v-if="scheduLing.length > 0">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+          :immediate-check="immediateCheck"
+        >
+        <div class="adviceMain">
+          <div class="adviceOne" v-for="(item,index) in scheduLing" :key="index">
+            <div class="adviceTitle">
+              <p>{{getTime(item.schedule_date)}}</p>
+              <van-icon
+                class="ellipsis"
+                name="ellipsis"
+                @click="toDelete(item.id,index)"
+              />
+            </div>
+            <div class="orderContent" @click="toEditSchduling(item.id)">
+              <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>
+        </div>
+        </van-list>
+      </div>
+      <div class="noimgBox" v-else>
+        <img src="../../../assets/images/none.png" alt />
+      </div>
+    </div>
+    <!-- <div class="add">
+      <div style="display: flex;align-items: center;">
+        <van-icon class="addIcon" name="add" />新增
+      </div>
+    </div> -->
+
+    <!-- 弹出层 -->
+    <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"
+        :style="{ height: '40%' }"
+      >
+        <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          :min-date="minDate"
+          :max-date="maxDate"
+          @confirm="getstartTime"
+          @cancel="startShow = false"
+        />
+      </van-popup>
+      <van-popup v-model="endShow" position="bottom" :style="{ height: '40%' }">
+        <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          :min-date="minDate"
+          :max-date="maxDate"
+          @confirm="getstartTime2"
+          @cancel="endShow = false"
+        />
+      </van-popup>
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @select="onCancelOne"
+      />
+      </div>
+    </div>
 </template>
 
 <script>
-import { parseTime } from "@/utils";
-import { getSchedualList } from "@/api/patient";
+// import { parseTime } from "@/utils";
+// import { getSchedualList } from "@/api/patient";
+// export default {
+//   name: "LongTable",
+//   created() {
+//     this.tableDate = [];
+//     let params = {
+//       page: this.page + 1,
+//       limit: this.limit,
+//       patient_id: this.$route.query.patient_id
+//     };
+//     getSchedualList(params).then(response => {
+//       if (response.data.state == 0) {
+//         return false;
+//       } else {
+//         if (response.data.data.schedules.length == 0) {
+//         } else {
+//           for (let i = 0; i < response.data.data.schedules.length; i++) {
+//             this.tableDate.push(response.data.data.schedules[i]);
+//           }
+//         }
+//       }
+//     });
+//   },
+//   data() {
+//     return {
+//       tableDate: [],
+//       loading: false,
+//       finished: false,
+//       page: 0,
+//       limit: 15
+//     };
+//   },
+//   methods: {
+//     parseTime(time, layout) {
+//       return parseTime(time, layout);
+//     },
+//     onLoad() {
+//       this.page = this.page + 1;
+//       let params = {
+//         page: this.page + 1,
+//         limit: this.limit,
+//         patient_id: this.$route.query.patient_id
+//       };
+//       getAllEducationList(params).then(response => {
+//         if (response.data.state == 0) {
+//           this.finished = true;
+//           this.loading = false;
+//           return false;
+//         } else {
+//           if (response.data.data.schedules.length == 0) {
+//             this.finished = true;
+//             this.loading = false;
+//           } else {
+//             for (let i = 0; i < response.data.data.schedules.length; i++) {
+//               this.tableDate.push(response.data.data.schedules[i]);
+//             }
+//             this.loading = false;
+//           }
+//         }
+//       });
+//     },
+//     scheduleType(scheduleType) {
+//       var typeName = "";
+//       switch (scheduleType) {
+//         case 1:
+//           typeName = "上午";
+//           break;
+//         case 2:
+//           typeName = "下午";
+//           break;
+//         case 3:
+//           typeName = "晚上";
+//           break;
+
+//         default:
+//           break;
+//       }
+//       return typeName;
+//     }
+//   }
+// };
+</script>
+
+<script>
+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 {
-  name: "LongTable",
-  created() {
-    this.tableDate = [];
-    let params = {
-      page: this.page + 1,
-      limit: this.limit,
-      patient_id: this.$route.query.patient_id
-    };
-    getSchedualList(params).then(response => {
-      if (response.data.state == 0) {
-        return false;
-      } else {
-        if (response.data.data.schedules.length == 0) {
-        } else {
-          for (let i = 0; i < response.data.data.schedules.length; i++) {
-            this.tableDate.push(response.data.data.schedules[i]);
-          }
-        }
-      }
-    });
+  props: {
+    active: Number,
+    schedulingId: String
   },
   data() {
     return {
-      tableDate: [],
+      newShow: false,
+      typeShow: false,
+      startShow: false,
+      endShow: false,
+      type: "全部",
+      types: 0,
+      columns: [
+        "HD",
+        "HDF",
+        "HD+HP",
+        "HP",
+        "HF",
+        "SCUF",
+        "IUF",
+        "HFHD",
+        "HFHD+HP",
+        "PHF",
+        "HFR",
+        "HDF+HP",
+        "CRRT",
+        "腹水回输"
+      ],
+      startTime: "请选择",
+      endTime: "请选择",
+      minDate: new Date(1970, 0, 1),
+      maxDate: new Date(2025, 10, 1),
+      currentDate: new Date(),
+      actions: [{ name: "查看全部" }, { name: "全部删除" }],
+      showOne: true,
+      showTwo: false,
+      limit: 10,
+      page: 1,
+      total: 0,
       loading: false,
       finished: false,
-      page: 0,
-      limit: 15
+      list: [],
+      patient_id: "",
+      scheduLing: [],
+      list: [],
+      id: 0,
+      index: 0,
+      immediateCheck: false,
+      flag: true
     };
   },
   methods: {
-    parseTime(time, layout) {
-      return parseTime(time, layout);
+    onCancel() {
+      this.typeShow = false;
     },
-    onLoad() {
-      this.page = this.page + 1;
-      let params = {
-        page: this.page + 1,
-        limit: this.limit,
-        patient_id: this.$route.query.patient_id
-      };
-      getAllEducationList(params).then(response => {
-        if (response.data.state == 0) {
-          this.finished = true;
+    onConfirm(value) {
+      this.page = 1;
+      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.scheduLing = [];
+      this.getScheduling(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime,
+        this.types
+      );
+    },
+    getstartTime(value) {
+      this.page = 1;
+      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.startTime = `${year}-${month}-${day}`;
+      this.scheduLing = [];
+      this.getScheduling(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime,
+        this.types
+      );
+      this.startShow = false;
+    },
+    getstartTime2(value) {
+      this.page = 1;
+      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.endTime = `${year}-${month}-${day}`;
+      this.scheduLing = [];
+      this.getScheduling(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime,
+        this.types
+      );
+      this.endShow = false;
+    },
+    getPatientDetail(patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.scheduLing = [];
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
+          }
+          // console.log('病人详情', patientDetail)
+          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;
           this.loading = false;
-          return false;
-        } else {
-          if (response.data.data.schedules.length == 0) {
-            this.finished = true;
-            this.loading = false;
-          } else {
-            for (let i = 0; i < response.data.data.schedules.length; i++) {
-              this.tableDate.push(response.data.data.schedules[i]);
-            }
-            this.loading = false;
+          // console.log('1823792742736487362847623876执行这里')
+        }
+      });
+    },
+    getScheduling1(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 = "腹水回输";
+            }
           }
+
+          this.scheduLing = scheduling;
+          var total = response.data.data.total;
+          this.total = total;
+          this.loading = false;
         }
       });
     },
-    scheduleType(scheduleType) {
-      var typeName = "";
-      switch (scheduleType) {
-        case 1:
-          typeName = "上午";
-          break;
-        case 2:
-          typeName = "下午";
-          break;
-        case 3:
-          typeName = "晚上";
-          break;
-
-        default:
-          break;
-      }
-      return typeName;
+    getTime(time) {
+      // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    onLoad() {
+      setTimeout(() => {
+        this.page++;
+        // console.log(this.page)
+        if (this.page <= Math.ceil(this.total / 10)) {
+          this.getScheduling(
+            this.patient_id,
+            this.startTime,
+            this.endTimes,
+            this.limit,
+            this.page,
+            this.types
+          );
+        } else {
+          this.loading = false;
+          this.finished = true;
+        }
+      }, 3000);
+    },
+    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 == "查看全部") {
+        var patientid = this.$route.query.patientid;
+        this.$router.push(
+          "/editScheduling?id=" +
+            this.id +
+            "&patientid=" +
+            patientid +
+            "&active=" +
+            this.active
+        );
+      }
+      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>
 
-<style style="stylesheet/scss" lang="scss" scoped>
-.schedulTable {
-  width: 100%;
-  overflow: auto;
-}
-.tableTit {
-  background: $main-color;
-  color: $text-color;
-  @include box-sizing;
-  width: 768px;
-  ul {
-    @include display-flex;
-    @include align-items-center;
-    @include text-align;
-    @include justify-content-center;
-
-    li {
-      @include flex;
-      border-right: 2px #fff solid;
-      font-size: 0.45rem;
-      height: 1.2rem;
-      line-height: 1.2rem;
+
+<style lang="scss" scoped>
+.newScheduling {
+  height: 100%;
+  overflow-y: auto;
+  background: #fff;
+  .toolBox {
+    display: flex;
+    height: 1.6rem;
+    align-items: center;
+    .toolOne {
+      width: 3.4rem;
+      height: 1rem;
+      background: rgba(246, 246, 246, 1);
+      border-radius: 5px;
+      text-align: center;
+      font-size: 0.42rem;
+      color: #8d8d8d;
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      margin-left: 0.42rem;
     }
-    &:last-child {
-      border-right: none;
+  }
+  .adviceBox {
+    padding: 0 0.66rem;
+    margin-bottom: 1.6rem;
+  }
+  .adviceMain {
+    > div:last-child {
+      border: none;
     }
   }
-}
-.tableDate {
-  background: $text-color;
-  color: $pgh-color;
-  @include box-sizing;
-  ul {
-    width: 768px;
-    li {
-      font-size: 0.45rem;
-      height: 1.2rem;
-      line-height: 1.2rem;
-      @include display-flex;
-      @include align-items-center;
-      @include text-align;
-      @include justify-content-center;
-      span {
-        @include flex;
-        border-right: 2px #fff solid;
-        border-bottom: 2px #fff solid;
-        background: #ecf5ff;
-        display: inline-block;
-        height: 1.2rem;
-        line-height: 1.2rem;
-        .iconfont {
-          color: $main-color;
-          font-size: 0.3rem;
-          margin-right: 0.1rem;
-        }
-      }
+  .adviceOne {
+    // box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
+    border-bottom: 1px solid #e5e5e5;
+    padding-bottom: 0.34rem;
+  }
+  .adviceTitle {
+    padding-top: 0.34rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    p {
+      color: #000000;
+      font-weight: bold;
+      font-size: 0.5rem;
+    }
+    .ellipsis {
+      font-size: 0.66rem;
+      color: #cccccc;
     }
-    &:last-child {
-      border-right: none;
+  }
+  .orderContent {
+    font-size: 0.46rem;
+    color: rgba(49, 50, 52, 1);
+    margin-top: 0.34rem;
+    display: flex;
+    flex-wrap: wrap;
+    p {
+      line-height: 0.8rem;
+      width: 50%;
     }
   }
+  .doctorBox {
+    font-size: 0.4rem;
+    color: rgba(152, 152, 152, 1);
+    line-height: 0.6rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 0.34rem;
+  }
+  .all {
+    font-size: 0.43rem;
+    color: #5b98ff;
+    margin-top: 0.34rem;
+  }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 5rem;
+      height: 5rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
+  // .add {
+  //   position: fixed;
+  //   bottom: 0;
+  //   left: 0;
+  //   width: 100%;
+  //   height: 2.75rem;
+  //   background: rgba(255, 255, 255, 1);
+  //   box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
+  //   display: flex;
+  //   align-items: center;
+  //   justify-content: space-around;
+  //   font-size: 0.9375rem;
+  //   color: #979798;
+  //   .addIcon {
+  //     color: #5b98ff;
+  //     font-size: 1.25rem;
+  //     margin-right: 0.25rem;
+  //   }
+  // }
+  .van-popup {
+    border-radius: 0;
+    transform: translate3d(0, 0, 0);
+    top: initial;
+  }
+}
+::-webkit-scrollbar {
+  width: 0;
 }
 </style>
+<style lang="scss">
+.newScheduling{
+  .van-picker__toolbar{
+    height: 1.46rem;
+    line-height: 1.46rem;
+  }
+  .van-picker__cancel, .van-picker__confirm{
+    padding: 0 0.53rem;
+    font-size: 0.46rem;
+  }
+  .van-picker-column{
+    font-size: 0.53rem;
+  }
+  .van-picker-column__item{
+    padding: 0 0.14rem;
+  }
+}
+</style>
+
+
+
+<style style="stylesheet/scss" lang="scss" scoped>
+// .schedulTable {
+//   width: 100%;
+//   overflow: auto;
+// }
+// .tableTit {
+//   background: $main-color;
+//   color: $text-color;
+//   @include box-sizing;
+//   width: 768px;
+//   ul {
+//     @include display-flex;
+//     @include align-items-center;
+//     @include text-align;
+//     @include justify-content-center;
+
+//     li {
+//       @include flex;
+//       border-right: 2px #fff solid;
+//       font-size: 0.45rem;
+//       height: 1.2rem;
+//       line-height: 1.2rem;
+//     }
+//     &:last-child {
+//       border-right: none;
+//     }
+//   }
+// }
+// .tableDate {
+//   background: $text-color;
+//   color: $pgh-color;
+//   @include box-sizing;
+//   ul {
+//     width: 768px;
+//     li {
+//       font-size: 0.45rem;
+//       height: 1.2rem;
+//       line-height: 1.2rem;
+//       @include display-flex;
+//       @include align-items-center;
+//       @include text-align;
+//       @include justify-content-center;
+//       span {
+//         @include flex;
+//         border-right: 2px #fff solid;
+//         border-bottom: 2px #fff solid;
+//         background: #ecf5ff;
+//         display: inline-block;
+//         height: 1.2rem;
+//         line-height: 1.2rem;
+//         .iconfont {
+//           color: $main-color;
+//           font-size: 0.3rem;
+//           margin-right: 0.1rem;
+//         }
+//       }
+//     }
+//     &:last-child {
+//       border-right: none;
+//     }
+//   }
+// }
+</style>

src/pages/main/records/CaseHistory.vue

@@ -1,9 +1,9 @@
 <template>
-  <div>
+  <div class="fixedBox">
     <div class="nav">
-      <ul style="width: 50%">
+      <ul>
         <li
-          v-for="(item, i) in ['基本信息', '检验检查', '医嘱']"
+          v-for="(item, i) in ['基本信息', '医嘱', '干体重', '病程记录', '抢救记录']"
           :key="i"
           :class="index == i ? 'active' : ''"
           @click="ClickTab(i, item)"
@@ -14,8 +14,11 @@
     </div>
     <div class="tab-content">
       <records-tab v-show="index == 0"></records-tab>
-      <check-tab v-show="index == 1" ref="item"></check-tab>
-      <advice-table v-show="index == 2"></advice-table>
+      <!-- <check-tab v-show="index == 1" ref="item"></check-tab> -->
+      <advice-table v-show="index == 1"></advice-table>
+      <dry-weight v-show="index == 2"></dry-weight>
+      <course-management v-show="index == 3"></course-management>
+      <rescue-record v-show="index == 4"></rescue-record>
     </div>
   </div>
 </template>
@@ -25,6 +28,9 @@ import { GetInspection } from "@/api/check";
 import RecordsTab from "./RecordsTab";
 import AdviceTable from "../dialysis/AdviceTable";
 import CheckTab from "../dialysis/CheckTab";
+import DryWeight from "../dialysis/DryWeight";
+import CourseManagement from "../dialysis/CourseManagement";
+import RescueRecord from "../dialysis/RescueRecord";
 
 export default {
   name: "CaseHistory",
@@ -43,7 +49,10 @@ export default {
   components: {
     CheckTab,
     AdviceTable,
-    RecordsTab
+    RecordsTab,
+    DryWeight,
+    CourseManagement,
+    RescueRecord
   },
   methods: {
     ClickTab: function(tabIndex, row) {
@@ -69,6 +78,17 @@ export default {
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
+.fixedBox {
+  padding-top: 38px;
+  // background: #fff;
+  min-height: calc(100vh - 64px);
+  @media only screen and (min-width: 415px) and (max-width: 767px) {
+    padding-top: 58px;
+  }
+  @media only screen and (min-width: 768px) {
+    padding-top: 82px;
+  }
+}
 .nav {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
@@ -94,7 +114,7 @@ export default {
   //   padding-top: 20px;
   // }
   ul {
-    width: 60%;
+    width: 90%;
     margin: 0 auto;
     @include box-sizing;
     @include display-flex;