更新

src/api/patient/patient.js

@@ -448,6 +448,14 @@ export function DeleteManagement(id, params) {
   })
 }
 
+export function DeleteChild(id, params) {
+  return request({
+    url: '/m/api/patient/deletechild?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}
+
 export function updatedPatient(data) {
   return request({
     url: '/m/api/patient/updatedpatient',
@@ -526,3 +534,14 @@ export function submitFeed(params) {
     params: params
   })
 }
+
+export function DeleteInspection(date) {
+  const params = {
+    date: date
+  }
+  return request({
+    url: '/m/api/patient/deleteinspection',
+    method: 'delete',
+    params: params
+  })
+}

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -66,7 +66,7 @@
                     <van-icon
                       class="ellipsis"
                       name="ellipsis"
-                      @click="Delete(item.groupno, index, it.execution_staff)"
+                      @click="DeleteOne(it.id)"
                     />
                   </div>
                   <div v-for="(i, index) in childList" :key="index">
@@ -82,7 +82,7 @@
                       <van-icon
                         class="ellipsis"
                         name="ellipsis"
-                        @click="Delete(item.groupno, index, it.execution_staff)"
+                        @click="DeleteChild(i.id, index, i.execution_state)"
                       />
                     </div>
                   </div>
@@ -123,7 +123,7 @@
                     <van-icon
                       class="ellipsis"
                       name="ellipsis"
-                      @click="Delete(item.groupno, index, it.execution_staff)"
+                      @click="DeleteTemporary(it.id)"
                     />
                   </div>
                   <div v-for="(i, index) in childList" :key="index">
@@ -139,7 +139,7 @@
                       <van-icon
                         class="ellipsis"
                         name="ellipsis"
-                        @click="Delete(item.groupno, index, it.execution_staff)"
+                        @click="DeleteChild(i.id, index, it.execution_state)"
                       />
                     </div>
                   </div>
@@ -225,11 +225,18 @@
         @select="toDelete"
       />
       <van-action-sheet
-        v-model="newShow"
+        v-model="newChildShow"
         :actions="actions1"
         cancel-text="取消"
         @cancel="onCancel"
-        @select="toDelete"
+        @select="toChildDelete"
+      />
+      <van-action-sheet
+        v-model="newChildShow"
+        :actions="actions2"
+        cancel-text="取消"
+        @cancel="onCancel"
+        @select="toChildDelete"
       />
     </div>
   </div>
@@ -239,7 +246,8 @@
 import {
   getDoctorAdvices,
   getPatientDetail,
-  DeleteManagement
+  DeleteManagement,
+  DeleteChild
 } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 import { Dialog } from "vant";
@@ -253,6 +261,7 @@ export default {
       loading: false,
       finished: false,
       newShow: false,
+      newChildShow: false,
       typeShow: false,
       startShow: false,
       endShow: false,
@@ -266,6 +275,7 @@ export default {
       currentDate: new Date(),
       actions: [{ name: "全部删除" }],
       actions1: [{ name: "删除" }],
+      actions2: [{ name: "删除" }],
       form: {
         type: "",
         limit: 10,
@@ -280,7 +290,9 @@ export default {
       doctor: [],
       id: 0,
       index: 0,
-      staff: 0
+      staff: 0,
+      childId: 0,
+      state: 0
     };
   },
   methods: {
@@ -427,10 +439,9 @@ export default {
 
           var doctor = response.data.data.doctor;
           this.doctor = doctor;
-          console.log("医生", doctor);
-          console.log("list", list);
           this.doctorAdvice = list.reverse();
           this.loading = false;
+          this.finished = true;
         }
       });
     },
@@ -457,24 +468,25 @@ export default {
     getTimes(time) {
       return uParseTime(time, "{h}:{i}");
     },
-    onLoad() {
-      setTimeout(() => {
-        this.page++;
-        if (this.page <= Math.ceil(this.total / 10)) {
-          this.getDoctorAdvices(
-            this.patient_id,
-            this.form.type,
-            this.startTime,
-            this.endTimes,
-            this.form.limit,
-            this.form.page
-          );
-        } else {
-          this.loading = false;
-          this.finished = true;
-        }
-      }, 1000);
-    },
+    // onLoad() {
+    //   setTimeout(() => {
+    //     this.page++;
+    //     if (this.page <= Math.ceil(this.total / 10)) {
+    //       this.getDoctorAdvices(
+    //         this.patient_id,
+    //         this.form.type,
+    //         this.startTime,
+    //         this.endTimes,
+    //         this.form.limit,
+    //         this.form.page
+    //       );
+    //     } else {
+    //       this.loading = false;
+    //       this.finished = true;
+    //     }
+    //   }, 1000);
+    // },
+    onLoad() {},
     toDoctorAdviceDetail(id) {
       var patientid = this.$route.query.patientid;
       this.$router.push(
@@ -499,11 +511,32 @@ export default {
       this.staff = staff;
       this.newShow = true;
     },
+    // 长期
+    DeleteOne(id) {
+      alert(id);
+    },
+    DeleteChild(id, index, state) {
+      this.id = id;
+      this.index = index;
+      this.state = state;
+      this.newChildShow = true;
+    },
+    // 临时
+    DeleteTemporary(id) {
+      alert(id);
+    },
     toDelete(val) {
-      if (val.name == "删除") {
+      if (val.name == "全部删除") {
         this.DeleteManagement(this.id, this.index, this.staff);
       }
     },
+    toChildDelete(val) {
+      console.log(val);
+      if (val.name == "删除") {
+        this.DeleteChild(this.id, this.index, this.state);
+      }
+    },
+    // 删除整组医嘱
     DeleteManagement(id, index, staff) {
       if (staff > 0) {
         this.$toast("医嘱已执行,无法删除");
@@ -522,6 +555,25 @@ export default {
           }
         });
       });
+    },
+    DeleteChild(id, index, state) {
+      if (state == 1) {
+        this.$toast("医嘱已执行,无法删除");
+        return false;
+      }
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteChild(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+
+            this.childList.splice(index, 1);
+            this.newShow = false;
+          }
+        });
+      });
     }
   },
   created() {

src/pages/doctorAdvice/components/Inspection.vue

@@ -23,16 +23,32 @@
       </div>
 
       <div class="adviceBox" v-show="showOne">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了">
-          <div class="adviceOne" v-for="(item, index) in Inspection" :key="index">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+        >
+          <div
+            class="adviceOne"
+            v-for="(item, index) in Inspection"
+            :key="index"
+          >
             <div class="adviceTitle">
               <p>{{ getTime(item.inspect_date) }}</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+              <van-icon
+                class="ellipsis"
+                name="ellipsis"
+                @click="Delete(item.inspect_date, index)"
+              />
             </div>
             <div class="orderContent">
               <div class="flexBox" v-for="(it, i) in item.child" :key="i">
                 <p>{{ it }}</p>
-                <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+                <van-icon
+                  class="ellipsis"
+                  name="ellipsis"
+                  @click="DeleteOne(it, item.inspect_date, i)"
+                />
               </div>
             </div>
             <div class="all" @click="toInspection(item.inspect_date)">全部</div>
@@ -52,10 +68,23 @@
 
     <!-- 弹出层 -->
     <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"
@@ -75,7 +104,18 @@
           @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="取消"
+        @select="toDelete"
+      />
+      <van-action-sheet
+        v-model="newShowOne"
+        :actions="actions1"
+        cancel-text="取消"
+        @select="DeleteInspection"
+      />
     </div>
   </div>
 </template>
@@ -84,7 +124,8 @@
 import {
   getPatientDetail,
   getAllInspection,
-  getInspection
+  getInspection,
+  DeleteInspection
 } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 import { Dialog } from "vant";
@@ -98,6 +139,7 @@ export default {
       loading: false,
       finished: false,
       newShow: false,
+      newShowOne: false,
       typeShow: false,
       startShow: false,
       endShow: false,
@@ -108,7 +150,8 @@ export default {
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
-      actions: [{ name: "删除" }],
+      actions: [{ name: "全部删除" }],
+      actions1: [{ name: "删除" }],
       showOne: true,
       showTwo: false,
       list: [],
@@ -118,7 +161,12 @@ export default {
       Inspection: [],
       project_id: 0,
       patientid: 0,
-      checkdata: []
+      checkdata: [],
+      date: 0,
+      index: 0,
+      name: "",
+      date: "",
+      index: ""
     };
   },
   methods: {
@@ -255,6 +303,7 @@ export default {
                 arr.push(it.project_name);
               }
             });
+            console.log("arr", arr);
             item.child = arr;
           });
           this.Inspection = list.reverse();
@@ -277,6 +326,59 @@ export default {
           "&active=" +
           this.active
       );
+    },
+    Delete(date, index) {
+      this.newShow = true;
+      this.date = date;
+      this.index = index;
+    },
+    toDelete(val) {
+      console.log("val", val);
+      if (val.name === "全部删除") {
+        this.DeleteInspection(this.date, this.index);
+      }
+    },
+    DeleteInspection(id, index) {
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteInspection(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+
+            this.Inspection.splice(index, 1);
+            this.newShow = false;
+          }
+        });
+      });
+    },
+    DeleteOne(name, date, index) {
+      this.newShowOne = true;
+      this.name = name;
+      this.date = date;
+      this.index = index;
+    },
+    DeleteInspection(val) {
+      if (val.name == "删除") {
+        this.DeleteChildInspection(this.name, this.date, this.index);
+      }
+    },
+    // 删除整组医嘱
+    DeleteInspection(name, index, staff) {
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteInspection(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+
+            this.doctorAdvice.splice(index, 1);
+            this.newShow = false;
+          }
+        });
+      });
     }
   },
   created() {