患者中心逻辑

src/pages/doctorAdvice/components/CourseManagement.vue

@@ -16,17 +16,8 @@
         </div>
       </div>
       <div class="adviceBox" v-show="showOne">
-        <van-list
-          v-model="loading"
-          finished-text="没有更多了"
-          @load="onLoad"
-          :finished="finished"
-        >
-          <div
-            class="adviceOne"
-            v-for="(item, index) in this.courseManagement"
-            :key="item.id"
-          >
+        <van-list v-model="loading" finished-text="没有更多了" @load="onLoad" :finished="finished">
+          <div class="adviceOne" v-for="(item, index) in this.courseManagement" :key="item.id">
             <div class="adviceTitle">
               <p>{{ getTime(item.record_time) }}</p>
               <van-icon
@@ -64,23 +55,10 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup
-        v-model="typeShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
-        <van-picker
-          show-toolbar
-          :columns="columns"
-          @cancel="onCancel"
-          @confirm="onConfirm"
-        />
+      <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-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -213,22 +191,18 @@ export default {
           var total = response.data.data.total;
           this.total = total;
           console.log("总共", total);
+          this.loading = false;
         }
       });
     },
     onLoad() {
       setTimeout(() => {
-        for (let i = 0; i < this.limit; i++) {
-          this.list.push(this.list.length + 1);
-        }
-        // 加载状态结束
-        this.loading = false;
-        if (this.courseManagement.length > 10) {
-          this.page++;
-        }
-        this.getCourseManagement(this.patientid);
-        // 数据全部加载完成
-        if (this.list.length >= this.total) {
+        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);
@@ -307,7 +281,7 @@ export default {
     height: 3.125rem;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;
@@ -317,7 +291,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: space-around;
-      margin-left: 1.25rem;
+      margin-left: 0.8125rem;
     }
   }
   .adviceBox {

src/pages/doctorAdvice/components/DialysisRecord.vue

@@ -23,20 +23,11 @@
       </div>
 
       <div class="adviceBox" v-show="showOne">
-        <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="onLoad"
-        >
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
           <div class="adviceOne" v-for="item in 3" :key="index">
             <div class="adviceTitle">
               <p>2019.09.01</p>
-              <van-icon
-                class="ellipsis"
-                name="ellipsis"
-                @click="newShow = true"
-              />
+              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
             </div>
             <div class="orderContent">
               <p>透析模式：HD</p>
@@ -65,23 +56,10 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup
-        v-model="typeShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
-        <van-picker
-          show-toolbar
-          :columns="columns"
-          @cancel="onCancel"
-          @confirm="onConfirm"
-        />
+      <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-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -101,12 +79,7 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet
-        v-model="newShow"
-        :actions="actions"
-        cancel-text="取消"
-        @cancel="onCancel"
-      />
+      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
     </div>
   </div>
 </template>
@@ -216,7 +189,7 @@ export default {
     justify-content: space-around;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;

src/pages/doctorAdvice/components/DryWeight.vue

@@ -17,17 +17,8 @@
       </div>
 
       <div class="adviceBox" v-show="showOne">
-        <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="onLoad"
-        >
-          <div
-            class="adviceOne"
-            v-for="(item, index) in dryweight"
-            :key="index"
-          >
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+          <div class="adviceOne" v-for="(item, index) in dryweight" :key="index">
             <div class="adviceTitle">
               <p>{{ getTime(item.ctime) }}</p>
               <van-icon
@@ -84,7 +75,8 @@ import { Dialog } from "vant";
 const moment = require("moment");
 export default {
   props: {
-    active: Number
+    active: Number,
+    dryId: String
   },
   data() {
     return {
@@ -172,33 +164,45 @@ export default {
           var total = response.data.data.total;
           console.log("total", 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;
+          console.log("dryweight", dryweight);
+          var total = response.data.data.total;
+          console.log("total", total);
+          this.total = total;
+          this.loading = false;
         }
       });
     },
     onLoad() {
       setTimeout(() => {
-        for (let i = 0; i < this.limit; i++) {
-          this.list.push(this.list.length + 1);
-        }
-        // 加载状态结束
-        this.loading = false;
-        console.log("长度", this.dryweight.length);
-        if (this.dryweight.length > 10) {
-          this.page++;
-        }
-        console.log("page是什么", this.page);
-        this.getDryWeight(
-          this.patient_id,
-          this.startTime,
-          this.endTimes,
-          this.limit,
-          this.page
-        );
-        // 数据全部加载完成
-        if (this.list.length >= this.total) {
+        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;
         }
-      }, 1);
+      }, 3000);
     },
     getTime(time) {
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
@@ -260,8 +264,10 @@ export default {
     }
   },
   created() {
+    console.log("created");
+    this.loading = true;
     var patientid = this.$route.query.patientid;
-    console.log("干体重id", patientid);
+    // console.log("干体重id", patientid);
     this.getDryWeight(patientid);
     this.patient_id = patientid;
     this.getPatientDetail(patientid);
@@ -278,7 +284,7 @@ export default {
     height: 3.125rem;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;
@@ -288,7 +294,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: space-around;
-      margin-left: 1.25rem;
+      margin-left: 0.8125rem;
     }
   }
   .adviceBox {

src/pages/doctorAdvice/components/Education.vue

@@ -16,17 +16,8 @@
         </div>
       </div>
       <div class="adviceBox" v-show="showOne">
-        <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="onLoad"
-        >
-          <div
-            class="adviceOne"
-            v-for="(item, index) in Education"
-            :key="index"
-          >
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+          <div class="adviceOne" v-for="(item, index) in Education" :key="index">
             <div class="adviceTitle">
               <p>{{ getTime(item.assessment_date) }}</p>
               <van-icon
@@ -37,9 +28,7 @@
             </div>
             <div class="statOrder">
               <div class="orderContent">
-                <p>
-                  {{ item.mission }}
-                </p>
+                <p>{{ item.mission }}</p>
               </div>
             </div>
             <div class="all" @click="toEducationDetail(item.id)">全部</div>
@@ -59,11 +48,7 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup
-        v-model="startShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
+      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -206,33 +191,26 @@ export default {
           var total = response.data.data.total;
           console.log("total", total);
           this.total = total;
+          this.loading = false;
         }
       });
     },
     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.page++;
+        if (this.page <= Math.ceil(this.total / 10)) {
+          this.getEducation(
+            this.patient_id,
+            this.limit,
+            this.page,
+            this.startTime,
+            this.endTime
+          );
+        } else {
+          this.loading = false;
           this.finished = true;
         }
-      }, 1);
+      }, 3000);
     },
     getTime(time) {
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
@@ -277,6 +255,7 @@ export default {
     }
   },
   created() {
+    this.loading = true;
     var patientid = this.$route.query.patientid;
     this.getPatientDetail(patientid);
     this.getEducation(patientid);
@@ -294,7 +273,7 @@ export default {
     height: 3.125rem;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;
@@ -304,7 +283,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: space-around;
-      margin-left: 1.25rem;
+      margin-left: 0.8125rem;
     }
   }
   .adviceBox {

src/pages/doctorAdvice/components/Inspection.vue

@@ -23,20 +23,11 @@
       </div>
 
       <div class="adviceBox" v-show="showOne">
-        <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="onLoad"
-        >
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
           <div class="adviceOne" v-for="item in 3" :key="index">
             <div class="adviceTitle">
               <p>2019.09.01</p>
-              <van-icon
-                class="ellipsis"
-                name="ellipsis"
-                @click="newShow = true"
-              />
+              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
             </div>
             <div class="orderContent">
               <p>血常规</p>
@@ -61,23 +52,10 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup
-        v-model="typeShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
-        <van-picker
-          show-toolbar
-          :columns="columns"
-          @cancel="onCancel"
-          @confirm="onConfirm"
-        />
+      <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-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -97,12 +75,7 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet
-        v-model="newShow"
-        :actions="actions"
-        cancel-text="取消"
-        @cancel="onCancel"
-      />
+      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
     </div>
   </div>
 </template>
@@ -212,7 +185,7 @@ export default {
     justify-content: space-around;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;

src/pages/doctorAdvice/components/LongDialysis.vue

@@ -17,30 +17,17 @@
       </div>
 
       <div class="adviceBox" v-show="showOne">
-        <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="onLoad"
-        >
-          <div
-            class="adviceOne"
-            v-for="(item, index) in dialysisrecord"
-            :key="index"
-          >
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+          <div class="adviceOne" v-for="(item, index) in dialysisrecord" :key="index">
             <div class="adviceTitle">
               <p>{{ getTime(item.created_time) }}</p>
-              <van-icon
-                class="ellipsis"
-                name="ellipsis"
-                @click="newShow = true"
-              />
+              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
             </div>
             <div class="orderContent">
               <p>透析模式：{{ item.mode_id }}</p>
               <p>
                 透析时长：{{ item.dialysis_duration_hour }}h{{
-                  item.dialysis_duration_minute
+                item.dialysis_duration_minute
                 }}min
               </p>
               <p>血流量(ml/min)：{{ item.blood_flow_volume }}</p>
@@ -100,7 +87,7 @@
               <p>体液过多其他症状：{{ item.body_fluid_other }}</p>
               <p>
                 透析前使用特殊药物：{{
-                  getSpecialMedicine(item.special_medicine)
+                getSpecialMedicine(item.special_medicine)
                 }}
               </p>
               <p>使用其他特殊药物：{{ item.special_medicine_other }}</p>
@@ -127,23 +114,10 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup
-        v-model="typeShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
-        <van-picker
-          show-toolbar
-          :columns="columns"
-          @cancel="onCancel"
-          @confirm="onConfirm"
-        />
+      <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-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -163,12 +137,7 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet
-        v-model="newShow"
-        :actions="actions"
-        cancel-text="取消"
-        @cancel="onCancel"
-      />
+      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
     </div>
   </div>
 </template>
@@ -358,33 +327,26 @@ export default {
           console.log("长期透析处方", dialysis);
           var total = response.data.data.total;
           console.log("total", total);
+          this.loading = false;
         }
       });
     },
     onLoad() {
       setTimeout(() => {
-        for (let i = 0; i < this.limit; i++) {
-          this.list.push(this.list.length + 1);
-        }
-        // 加载状态结束
-        this.loading = false;
-        console.log("长期处方", this.dialysisrecord.length);
-        if (this.dialysisrecord.length >= 10) {
-          this.page++;
-        }
-        console.log("页数", this.page);
-        this.GetLongDialysisRecord(
-          this.patient_id,
-          this.limit,
-          this.page,
-          this.startTime,
-          this.endTimes
-        );
-        // 数据全部加载完成
-        if (this.list.length >= this.total) {
+        this.page++;
+        if (this.page <= Math.ceil(this.total / 10)) {
+          this.GetLongDialysisRecord(
+            this.patient_id,
+            this.limit,
+            this.page,
+            this.startTime,
+            this.endTimes
+          );
+        } else {
+          this.loading = false;
           this.finished = true;
         }
-      }, 5000);
+      }, 1000);
     },
     getTime(time) {
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");

src/pages/doctorAdvice/components/RescueRecord.vue

@@ -16,17 +16,8 @@
         </div>
       </div>
       <div class="adviceBox" v-show="showOne">
-        <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="onLoad"
-        >
-          <div
-            class="adviceOne"
-            v-for="(item, index) in this.rescueRecords"
-            :key="index"
-          >
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+          <div class="adviceOne" v-for="(item, index) in this.rescueRecords" :key="index">
             <div class="adviceTitle">
               <p>{{ getTime(item.record_time) }}</p>
               <van-icon
@@ -61,11 +52,7 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup
-        v-model="startShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
+      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -85,12 +72,7 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet
-        v-model="newShow"
-        :actions="actions"
-        cancel-text="取消"
-        @select="Delete"
-      />
+      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @select="Delete" />
     </div>
   </div>
 </template>
@@ -207,30 +189,24 @@ export default {
           this.rescueRecords = arr;
           var total = response.data.data.total;
           console.log("总计", total);
+          this.loading = false;
         }
       });
     },
     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.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);
@@ -295,7 +271,7 @@ export default {
     height: 3.125rem;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;
@@ -305,7 +281,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: space-around;
-      margin-left: 1.25rem;
+      margin-left: 0.8125rem;
     }
   }
   .adviceBox {

src/pages/doctorAdvice/components/Scheduling.vue

@@ -27,6 +27,7 @@
           :finished="finished"
           finished-text="没有更多了"
           @load="onLoad"
+          :immediate-check="immediateCheck"
         >
           <div class="adviceOne" v-for="(item,index) in scheduLing" :key="index">
             <div class="adviceTitle">
@@ -116,7 +117,8 @@ import { Dialog } from 'vant'
 const moment = require('moment')
 export default {
   props: {
-    active: Number
+    active: Number,
+    schedulingId: String
   },
   data () {
     return {
@@ -147,8 +149,9 @@ export default {
       scheduLing: [],
       list: [],
       id: 0,
-      index: 0
-
+      index: 0,
+      immediateCheck:false,
+      flag: true
     }
   },
   methods: {
@@ -248,7 +251,7 @@ export default {
             this.showOne = true
             this.showTwo = false
           }
-          console.log('病人详情', patientDetail)
+          // console.log('病人详情', patientDetail)
           this.patientName = patientDetail.name
         }
       })
@@ -313,11 +316,82 @@ export default {
           }
           let arr = this.scheduLing
           arr.push(...scheduling)
-          console.log('班次', scheduling)
+          // console.log('班次', scheduling)
           this.scheduLing = arr
           var total = response.data.data.total
-          console.log('total', total)
+          // console.log('total', total)
           this.total = total
+          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 = '腹水回输'
+            }
+          }
+          // console.log('班次', scheduling)
+          this.scheduLing = scheduling
+          var total = response.data.data.total
+          // console.log('total', total)
+          this.total = total
+          console.log("骄傲搜看得见爱仕达卡拉胶山东矿机奥施康定几哈刷卡机还贷款")
+          this.loading = false;
         }
       })
     },
@@ -327,29 +401,23 @@ export default {
     },
     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.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
-        )
-        // 数据全部加载完成
-        if (this.list.length >= this.total) {
-          this.finished = true
+            this.patient_id,
+            this.startTime,
+            this.endTimes,
+            this.limit,
+            this.page,
+            this.types
+          )
+          
+        } else {
+          this.loading = false;
+          this.finished = true;
         }
-      }, 1000)
+      }, 3000)
     },
     toEditSchduling (id) {
       var patientid = this.$route.query.patientid
@@ -379,28 +447,29 @@ export default {
           }
         })
       })
-    }
+    },
   },
   created () {
-    var patientid = this.$route.query.patientid
-    this.getPatientDetail(patientid)
-    this.getScheduling(patientid)
-    this.patient_id = patientid
-  }
+      this.loading = true;
+      var patientid = this.$route.query.patientid
+      this.getPatientDetail(patientid)
+      this.getScheduling(patientid)
+      this.patient_id = patientid
+  },
 }
 </script>
 
 <style lang="scss" scoped>
 .scheduling {
   height: 100%;
-  overflow-y: auto;
+  // overflow-y: auto;
   .toolBox {
     display: flex;
     height: 3.125rem;
     justify-content: space-around;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;

src/pages/doctorAdvice/index.vue

@@ -8,39 +8,70 @@
       </div>
       <p @click="toEditPatient">基本信息</p>
     </div>
-    <van-tabs v-model="active" sticky>
+    <van-tabs v-model="active" sticky @click="onClick">
       <van-sticky>
         <div class="wapBox" @click="show1 = true">
           <van-icon class="wap" name="wap-nav" />
         </div>
       </van-sticky>
-      <van-tab v-for="(item, index) in title" :title="item" :key="index">
-        <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" :active="active"></dry-weight>
-        <inspection v-if="active == 4"></inspection>
-        <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 title="医嘱">
+        <doctor-management :dryId="patient_id"></doctor-management>
       </van-tab>
+      <van-tab title="长期透析处方">
+        <long-dialysis></long-dialysis>
+      </van-tab>
+      <van-tab title="透析记录">
+        <dialysis-record></dialysis-record>
+      </van-tab>
+      <van-tab title="干体重">
+        <dry-weight :active="active" :dryId="patient_id"></dry-weight>
+      </van-tab>
+      <van-tab title="检验检查">
+        <inspection></inspection>
+      </van-tab>
+      <van-tab title="病程记录">
+        <course-management :active="active"></course-management>
+      </van-tab>
+      <van-tab title="抢救记录">
+        <rescue-record :active="active"></rescue-record>
+      </van-tab>
+      <van-tab title="排班信息">
+        <scheduling :active="active" :schedulingId="patient_id"></scheduling>
+      </van-tab>
+      <van-tab title="宣教信息">
+        <education :active="active"></education>
+      </van-tab>
+      <van-tab title="体征信息">
+        <signs-record :active="active"></signs-record>
+      </van-tab>
+      <van-tab title="康复笔记">
+        <recover-notes :active="active"></recover-notes>
+      </van-tab>
+      <van-tab title="用药管理">
+        <medication-plan :active="active"></medication-plan>
+      </van-tab>
+      <van-tab title="设备管理">
+        <device-management :active="active"></device-management>
+      </van-tab>
+
+      <!-- <van-tab v-for="(item, index) in title" :title="item" :key="index">
+        <doctor-management :dryId="patient_id"></doctor-management>
+        <long-dialysis></long-dialysis>
+        <dialysis-record></dialysis-record>
+        <dry-weight :active="active" :dryId="patient_id"></dry-weight>
+        <inspection></inspection>
+        <course-management :active="active"></course-management>
+        <rescue-record :active="active"></rescue-record>
+        <scheduling :active="active" :schedulingId="patient_id"></scheduling>
+        <education :active="active"></education>
+        <signs-record :active="active"></signs-record>
+        <recover-notes :active="active"></recover-notes>
+        <medication-plan :active="active"></medication-plan>
+        <device-management :active="active"></device-management>
+      </van-tab>-->
     </van-tabs>
     <van-popup v-model="show" position="top" :style="{ height: '100%' }">
-      <div
-        style="padding:10px;font-size:1.25rem;text-align:right"
-        @click="show = false"
-      >
+      <div style="padding:10px;font-size:1.25rem;text-align:right" @click="show = false">
         <van-icon name="cross" />
       </div>
       <van-search
@@ -67,10 +98,7 @@
     </van-popup>
 
     <van-popup v-model="show1" position="top" :style="{ height: '40%' }">
-      <div
-        style="padding:10px;font-size:1.25rem;text-align:right"
-        @click="show1 = false"
-      >
+      <div style="padding:10px;font-size:1.25rem;text-align:right" @click="show1 = false">
         <van-icon name="cross" />
       </div>
       <div class="titleBox">
@@ -79,9 +107,7 @@
           v-for="(item, index) in title"
           :key="index"
           @click="changeActive(index)"
-        >
-          {{ item }}
-        </div>
+        >{{ item }}</div>
       </div>
     </van-popup>
   </div>
@@ -127,6 +153,7 @@ export default {
     medicationPlan,
     deviceManagement
   },
+  inject: ["reload"],
   data() {
     return {
       show: false,
@@ -221,7 +248,10 @@ export default {
       limit: 10,
       page: 1,
       patient: [],
-      patient_id: ""
+      patient_id: "",
+      patient_info: {
+        patient_id: this.patient_id
+      }
     };
   },
   methods: {
@@ -403,8 +433,11 @@ export default {
         if (this.value === this.patient[i].name) {
           var id = this.patient[i].id;
           this.show = false;
-          this.$router.push("/patientdetail?patientid=" + id);
+          this.$router.push(
+            "/patientdetail?patientid=" + id + "&active=" + this.active
+          );
           this.patientName = this.value;
+          this.reload();
         }
       }
     },
@@ -421,6 +454,12 @@ export default {
     this.patient_id = patientid;
     this.getPatientDetail(patientid);
     this.getBloodDialysisPatientTwo();
+  },
+  watch: {
+    $route(newVal) {
+      console.log("index", newVal);
+      this.patient_id = newVal.query.patientid;
+    }
   }
 };
 </script>

src/pages/patientManagement/components/Blood.vue

@@ -15,12 +15,7 @@
       </div>
     </div>
     <div class="patientBox">
-      <van-list
-        v-model="loading"
-        :finished="finished"
-        finished-text="没有更多了"
-        @load="onLoad"
-      >
+      <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
         <div
           class="patientOne"
           v-for="(item, index) in patients"
@@ -34,23 +29,10 @@
     </div>
     <!-- 弹出层 -->
     <div>
-      <van-popup
-        v-model="typeShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
-        <van-picker
-          show-toolbar
-          :columns="columns"
-          @cancel="onCancel"
-          @confirm="onConfirm"
-        />
+      <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="typeShowOne"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
+      <van-popup v-model="typeShowOne" position="bottom" :style="{ height: '40%' }">
         <van-picker
           show-toolbar
           :columns="columnsOne"
@@ -169,17 +151,22 @@ export default {
         if (response.data.state === 1) {
           var bloodpatient = response.data.data.bloodPatient;
           console.log("血透病人", bloodpatient);
+          this.patients = bloodpatient;
         }
       });
     }
   },
   created() {
     console.log(this.searchValue);
-    this.getAllBloodDialysisPatient();
+    if (this.searchValue) {
+      this.SearchAllBlood(this.searchValue);
+    } else {
+      this.getAllBloodDialysisPatient();
+    }
   },
   watch: {
     searchValue(newVal) {
-      console.log("监听", newVal);
+      // console.log("监听", newVal);
       this.SearchAllBlood(newVal);
     }
   }

src/pages/patientManagement/components/Member.vue

@@ -82,7 +82,11 @@ export default {
   },
   created () {
     console.log(this.searchValue)
-    this.getAllMemberPatient()
+    if(this.searchValue){
+      this.getMemberSearchPatient(this.searchValue)
+    }else{
+      this.getAllMemberPatient()
+    }
   },
   watch: {
     searchValue (newVal) {

src/pages/patientManagement/components/Slow.vue

@@ -78,12 +78,17 @@ export default {
         if (response.data.state === 1) {
           var slowpatient = response.data.data.slowPatient
           console.log('慢病病人', slowpatient)
+          this.patients = slowpatient
         }
       })
     }
   },
   created () {
-    this.getAllSlowPatient()
+    if (this.searchValue) {
+      this.getSlowSearchPatient(this.searchValue)
+    }else{
+      this.getAllSlowPatient()
+    }
   },
   watch: {
     searchValue (newVal) {

src/pages/patientManagement/patientManagement.vue

@@ -10,22 +10,13 @@
       </div>
     </van-sticky>
     <div class="searchBox">
-      <van-search
-        v-model="value"
-        placeholder="搜索患者透析号/姓名/首拼"
-        @search="SearchAllPatient"
-      />
+      <van-search v-model="value" placeholder="搜索患者透析号/姓名/首拼" @search="SearchAllPatient" />
     </div>
     <div class="chooseBox">
       <van-tabs v-model="active" sticky>
         <van-tab title="全部患者">
           <div class="patientBox">
-            <van-list
-              v-model="loading"
-              finished-text="没有更多了"
-              @load="onLoad"
-              :finished="finished"
-            >
+            <van-list v-model="loading" finished-text="没有更多了" @load="onLoad" :finished="finished">
               <div
                 class="patientOne"
                 v-for="(item, index) in patients"
@@ -51,17 +42,8 @@
     </div>
     <!-- 弹出层 -->
     <div>
-      <van-popup
-        v-model="typeShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
-        <van-picker
-          show-toolbar
-          :columns="columns"
-          @cancel="onCancel"
-          @confirm="onConfirm"
-        />
+      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
+        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
       </van-popup>
     </div>
   </div>
@@ -167,6 +149,7 @@ export default {
         if (response.data.state === 1) {
           var patient = response.data.data.patient;
           console.log("patient", patient);
+          this.patients = patient;
         }
       });
     }
@@ -175,6 +158,15 @@ export default {
     setRem();
     setHeight();
     this.getBloodDialysisPatient();
+  },
+  watch: {
+    value(newVal) {
+      if (newVal == "") {
+        this.getBloodDialysisPatient();
+      } else {
+        this.SearchAllPatient(newVal);
+      }
+    }
   }
 };
 </script>