更新

src/api/patient/patient.js

@@ -692,9 +692,9 @@ export function DeleteBed(id, params) {
   })
 }
 
-export function LoginOut(params) {
+export function LoginOut(id, params) {
   return request({
-    url: '/m/api/patient/loginout',
+    url: '/m/api/patient/loginout?id=' + id,
     method: 'get',
     params: params
   })

src/pages/allDoctorAdvice/index.vue

@@ -13,9 +13,12 @@
         :key="index"
       >
         <div v-for="(it, i) in item.child" :key="i">
+            <div style="display:flex;justify-content:space-between;align-items:center">
             <p class="time" v-if="i<1">
               {{ it.advice_date ? getTime(it.advice_date) : "" }}
             </p>
+            <van-icon class="ellipsis" name="ellipsis" @click="DeleteFive(item.start_time,item.child[0].execution_staff,index)" />
+            </div>
           <div class="statOrder">
             <div v-if="it.advice_type == 1 && it.parent_id == 0">
               <div class="statOrderTitle">
@@ -40,7 +43,7 @@
                 />
                 </div>
                 <div v-for="(i, index) in childList" :key="index">
-                 <div style="display:flex;justify-content:space-between" v-if="i.parent_id == it.id">
+                 <div style="display:flex;justify-content:space-between" >
                     <p>
                       ▲ {{ i.advice_name }} {{ i.advice_desc
                       }}{{ i.drug_spec_unit }} {{ i.prescribing_number
@@ -150,6 +153,14 @@
           @cancel="onCancelThree"
           @select="onSelectThree"
         />
+
+        <van-action-sheet
+          v-model="newShowFour"
+          :actions="actions4"
+          cancel-text="取消"
+          @cancel="onCancelFour"
+          @select="onSelectFour"
+      />
     </div>
   </div>
 </template>
@@ -159,7 +170,8 @@ import {
   GetDoctorAdviceDetail,
   getAllDoctor,
   DeleteChild,
-  DeletePatient
+  DeletePatient,
+  DeleteManagement
 } from "@/api/patient/patient";
 import { Dialog } from "vant";
 import { uParseTime } from "@/utils/tools";
@@ -178,9 +190,12 @@ export default {
       actions1: [{ name: "删除" }],
       actions2: [{ name: "删除" }],
       actions3: [{ name: "删除" }],
+      actions4: [{ name: "全部删除" }],
+      newShow: false,
       newShowOne: false,
       newShowTwo: false,
       newShowThree: false,
+      newShowFour: false,
       index: 0,
       state: 0
     };
@@ -206,14 +221,14 @@ export default {
           this.childList = objarr;
           let dataInfo = {};
           doctorAdvicedetail.forEach((item, index) => {
-            let { groupno } = item;
-            if (!dataInfo[groupno]) {
-              dataInfo[groupno] = {
-                groupno,
+            let { start_time } = item;
+            if (!dataInfo[start_time]) {
+              dataInfo[start_time] = {
+                start_time,
                 child: []
               };
             }
-            dataInfo[groupno].child.push(item);
+            dataInfo[start_time].child.push(item);
           });
           let list = Object.values(dataInfo); // list 转换成功的数据
           let arr = [];
@@ -275,6 +290,12 @@ export default {
         }
       }
     },
+    DeleteFive(id, state, index) {
+      this.id = id;
+      this.state = state;
+      this.index = index;
+      this.newShowFour = true;
+    },
     toDelete(id, state, index) {
       this.id = id;
       this.state = state;
@@ -330,6 +351,14 @@ export default {
     onSelectThree() {
       this.DeleteChild(this.id, this.index, this.state);
     },
+    onSelectFour(val) {
+      if (val.name === "全部删除") {
+        this.DeleteManagement(this.id, this.staff, this.index);
+      }
+    },
+    onCancelFour() {
+      this.newShowFour = false;
+    },
     DeletePatient(id, index, state) {
       if (state == 1) {
         this.$toast("医嘱已执行,无法删除");
@@ -367,6 +396,24 @@ export default {
           }
         });
       });
+    },
+    DeleteManagement(id, index, staff) {
+      if (staff > 0) {
+        this.$toast("医嘱已执行,无法删除");
+        return false;
+      }
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteManagement(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+            this.doctorAdvicedetail.splice(index, 1);
+            this.newShowFour = false;
+          }
+        });
+      });
     }
   },
   created() {

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -32,11 +32,11 @@
 
           <div class="adviceOne" v-for="(item,index) in this.doctorAdvice" :key="index" v-show="showOne">
             <div class="adviceTitle">
-              <p>{{getTime(item.child[0].start_time)}}</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="Delete(item.groupno, index, item.child[0].execution_staff)" />
+              <p>{{getTime(item.start_time)}}</p>
+              <van-icon class="ellipsis" name="ellipsis" @click="Delete(item.start_time, index, item.child[0].execution_staff)" />
             </div>
 
-         <div v-for="(it,i) in item.child" :key="i">
+         <div v-for="(it,i) in item.child.slice(0,3)" :key="i">
             <div class="statOrder"  v-if="it.advice_type == 1 && it.parent_id == 0" >
               <div class="statOrderTitle">
                 <span v-if="i<1">长期医嘱</span>
@@ -94,134 +94,11 @@
                 </div>
             </div>
          </div>
-<!--             <div class="doctorBox">-->
-<!--                <p>开嘱医生：{{ item.child[0].user_name }}</p>-->
-<!--                <p>执行护士：{{ getDoctor(item.child[0].execution_staff) }}</p>-->
-<!--                <p>核对护士：{{ getDoctor(item.child[0].checker) }}</p>-->
-<!--              </div>-->
-            <div class="all" @click="toDoctorAdviceDetail(item.groupno)">全部</div>
+            <div class="all" @click="toDoctorAdviceDetail(item.start_time)">全部</div>
           </div>
         </van-list>
       </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 doctorAdvice"-->
-<!--            :key="index"-->
-<!--          >-->
-<!--            <div v-for="(it, i) in item.child" :key="i">-->
-<!--              <div class="adviceTitle" v-if="it.advice_date">-->
-<!--                <p>{{ it.advice_date ? getTime(it.advice_date) : "" }}</p>-->
-<!--                <van-icon-->
-<!--                  class="ellipsis"-->
-<!--                  name="ellipsis"-->
-<!--                  @click="Delete(item.groupno, index, it.execution_staff)"-->
-<!--                />-->
-<!--              </div>-->
-
-<!--              <div-->
-<!--                class="statOrder"-->
-<!--                v-if="it.advice_type == 1 && it.parent_id == 0"-->
-<!--              >-->
-<!--                <div class="statOrderTitle" v-if="i < 3">-->
-<!--                  <span>长期医嘱</span>-->
-<!--                  <span style="margin-left:1rem">-->
-<!--                    {{ getTimes(it.start_time) }}-->
-<!--                  </span>-->
-<!--                </div>-->
-<!--                <div class="orderContent" v-if="i < 3">-->
-<!--                  <p v-if="it.parent_id === 0">-->
-<!--                    {{ it.advice_name }} {{ it.advice_desc-->
-<!--                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number-->
-<!--                    }}{{ it.prescribing_number_unit }} {{ it.single_dose-->
-<!--                    }}{{ it.single_dose_unit }} {{ it.delivery_way }}-->
-<!--                    {{ it.execution_frequency }}-->
-<!--                  </p>-->
-<!--                  <div v-for="(i, index) in childList" :key="index">-->
-<!--                    <p v-if="i.parent_id == it.id">-->
-<!--                      ▲ {{ i.advice_name }} {{ i.advice_desc-->
-<!--                      }}{{ i.drug_spec_unit }} {{ i.prescribing_number-->
-<!--                      }}{{ i.prescribing_number_unit }} {{ i.single_dose-->
-<!--                      }}{{ i.single_dose_unit }}-->
-<!--                      {{ i.delivery_way }}-->
-<!--                      {{ i.execution_frequency }}-->
-<!--                    </p>-->
-<!--                  </div>-->
-<!--                </div>-->
-<!--                <div-->
-<!--                  class="doctorBox"-->
-<!--                  v-if="-->
-<!--                    it.user_name ||-->
-<!--                      it.execution_staff ||-->
-<!--                      (it.checker && i == item.child.length)-->
-<!--                  "-->
-<!--                >-->
-<!--                  <p>开嘱医生：{{ it.user_name }}</p>-->
-<!--                  <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>-->
-<!--                  <p>核对护士：{{ getDoctor(it.checker) }}</p>-->
-<!--                </div>-->
-<!--              </div>-->
-
-<!--              <div-->
-<!--                class="statOrder"-->
-<!--                v-if="it.advice_type == 3 && it.parent_id == 0"-->
-<!--              >-->
-<!--                <div class="longOrderTitle" v-if="i < 3">-->
-<!--                  <span>临时医嘱</span>-->
-<!--                  <span style="margin-left:1rem">-->
-<!--                    {{ getTimes(item.child[0].start_time) }}-->
-<!--                  </span>-->
-<!--                </div>-->
-<!--                <div class="orderContent" v-if="i < 3">-->
-<!--                  <p>-->
-<!--                    {{ it.advice_name }} {{ it.advice_desc-->
-<!--                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number-->
-<!--                    }}{{ it.prescribing_number_unit }} {{ it.single_dose-->
-<!--                    }}{{ it.single_dose_unit }} {{ it.delivery_way }}-->
-<!--                    {{ it.execution_frequency }}-->
-<!--                  </p>-->
-<!--                  <div v-for="(i, index) in childList" :key="index">-->
-<!--                    <p v-if="i.parent_id == it.id">-->
-<!--                      ▲ {{ i.advice_name }} {{ i.advice_desc-->
-<!--                      }}{{ i.drug_spec_unit }} {{ i.prescribing_number-->
-<!--                      }}{{ i.prescribing_number_unit }} {{ i.single_dose-->
-<!--                      }}{{ i.single_dose_unit }}-->
-<!--                      {{ i.delivery_way }}-->
-<!--                      {{ i.execution_frequency }}-->
-<!--                    </p>-->
-<!--                  </div>-->
-<!--                </div>-->
-<!--                <div-->
-<!--                  class="doctorBox"-->
-<!--                  v-if="-->
-<!--                    it.user_name ||-->
-<!--                      it.execution_staff ||-->
-<!--                      (it.checker && i == item.child.length)-->
-<!--                  "-->
-<!--                >-->
-<!--                  <p>开嘱医生：{{ it.user_name }}</p>-->
-<!--                  <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>-->
-<!--                  <p>核对护士：{{ getDoctor(it.checker) }}</p>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </div>-->
-<!--            <div-->
-<!--              class="all"-->
-<!--              @click="toDoctorAdviceDetail(item.child[0].groupno)"-->
-<!--            >-->
-<!--              全部-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </van-list>-->
-<!--      </div>-->
-
       <div class="noimgBox" v-show="showTwo">
         <img src="../../../assets/images/none.png" alt />
       </div>
@@ -345,7 +222,8 @@ export default {
       index: 0,
       staff: 0,
       childId: 0,
-      state: 0
+      state: 0,
+      list: []
     };
   },
   methods: {
@@ -353,7 +231,7 @@ export default {
       this.typeShow = false;
     },
     onConfirm(value) {
-      this.page = 1;
+      this.form.page = 1;
       this.type = value;
       this.typeShow = false;
       this.doctorAdvice = [];
@@ -367,7 +245,7 @@ export default {
       );
     },
     getstartTime(value) {
-      this.page = 1;
+      this.form.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -391,7 +269,7 @@ export default {
       this.startShow = false;
     },
     getstartTime2(value) {
-      this.page = 1;
+      this.form.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -435,22 +313,27 @@ export default {
       ).then(response => {
         if (response.data.state === 1) {
           var advice = response.data.data.advice;
-          // console.log("advice", advice);
+          console.log("advice", advice);
           var one = response.data.data.one;
+          console.log("one", one);
+          var total = response.data.data.total;
+          this.total = total;
+          console.log("total", total);
           let dataInfo = {};
           one.forEach((item, index) => {
-            let { groupno } = item;
-            if (!dataInfo[groupno]) {
-              dataInfo[groupno] = {
-                groupno,
+            let { start_time } = item;
+            if (!dataInfo[start_time]) {
+              dataInfo[start_time] = {
+                start_time,
                 child: []
               };
             }
           });
           let list = Object.values(dataInfo);
+          console.log("list", list);
           list.map(item => {
             for (let i = 0; i < advice.length; i++) {
-              if (item.groupno === advice[i].groupno) {
+              if (item.start_time === advice[i].start_time) {
                 item.child.push(advice[i]);
               }
             }
@@ -464,10 +347,9 @@ export default {
           this.childList = objarr;
           let arr = this.doctorAdvice;
           arr.push(...list.reverse());
+          console.log("arr", arr);
           this.doctorAdvice = arr;
-          var total = response.data.data.total;
-          this.total = total;
-          // console.log("total", total);
+
           this.loading = false;
         }
       });
@@ -498,7 +380,7 @@ export default {
     onLoad() {
       setTimeout(() => {
         this.form.page++;
-        // console.log("page", this.form.page);
+        console.log("page", this.form.page);
         if (this.form.page <= Math.ceil(this.total / 5)) {
           this.getDoctorAdvices(
             this.patient_id,
@@ -514,6 +396,7 @@ export default {
         }
       }, 1000);
     },
+
     toDoctorAdviceDetail(id) {
       var patientid = this.$route.query.patientid;
       this.$router.push(

src/pages/homeIndex/index.vue

@@ -269,6 +269,7 @@ export default {
           this.isCreateOrg = response.data.data.isCreateOrg;
           if (this.isCreateOrg) {
             this.orgs = response.data.data.orgs;
+            console.log("orgs", this.orgs);
             this.apps = response.data.data.apps;
             this.banners = response.data.data.banners;
             this.org_arr = [];

src/pages/my/index.vue

@@ -144,10 +144,10 @@ export default {
   },
   methods: {
     LoginOut() {
-      LoginOut().then(response => {
+      LoginOut(this.adminid).then(response => {
         if (response.data.state === 1) {
           var msg = response.data.data.msg;
-          console.log("msg是", msg);
+          // console.log("msg是", msg);
           this.isRouterAlive = false;
           this.$nextTick(function() {
             this.isRouterAlive = true;
@@ -160,7 +160,7 @@ export default {
       GetHomeData().then(response => {
         if (response.data.state === 1) {
           var orgs = response.data.data.orgs;
-          console.log("orgs", orgs);
+          // console.log("orgs", orgs);
           this.organaziton = orgs;
         }
       });
@@ -169,7 +169,7 @@ export default {
       getMyInformation(id).then(response => {
         if (response.data.state === 1) {
           var roleInfo = response.data.data.roleInfo;
-          console.log("roleInfo", roleInfo);
+          // console.log("roleInfo", roleInfo);
           this.admin_user_id = roleInfo.id;
           this.adminid = roleInfo.admin_user_id;
           this.roleInfo = roleInfo;
@@ -216,13 +216,11 @@ export default {
   },
   created() {
     var adminid = this.$store.getters.user.user.id;
-
     this.getMyInformation(adminid);
     this.getMyOrganazition(adminid);
     this.getMyInforName(adminid);
     this.GetHomeData();
     this.creator = this.$store.getters.user.org.creator;
-    console.log("id是dongxi", this.creator);
   }
 };
 </script>

src/pages/patientCenter/editOrg/index.vue

@@ -15,7 +15,9 @@
       </div>
       <div class="infoOne">
         <p class="infoTitle">机构类型</p>
-        <van-cell is-link @click="showPopup(1)">{{ type_name }}</van-cell>
+        <van-cell is-link>
+          <van-field v-model="type_name" :readonly="readonly" @click="showPopup(1)"></van-field>
+        </van-cell>
         <van-popup v-model="show1" position="bottom" :style="{ height: '60%' }">
           <van-area
             :area-list="orgtype"
@@ -24,13 +26,15 @@
             @confirm="chooseCityTwo"
             :columns-num="2"
             @change="onChangeTwo"
-            :readonly="readonly"
+           :readonly="readonly"
           />
         </van-popup>
       </div>
       <div class="infoOne">
         <p class="infoTitle">机构地区</p>
-        <van-cell is-link @click="showPopup(2)">{{ org_area }}</van-cell>
+        <van-cell is-link>
+          <van-field v-model="org_area" :readonly="readonly" @click="showPopup(2)"></van-field>
+        </van-cell>
         <van-popup v-model="show2" position="bottom" :style="{ height: '60%' }">
           <van-area
             :area-list="area"
@@ -90,7 +94,7 @@ export default {
   components: {},
   data() {
     return {
-      readonly:true,
+      readonly: true,
       org_area: "",
       type_name: "",
       contact: false,
@@ -4206,27 +4210,39 @@ export default {
     };
   },
   methods: {
+    spread() {
+      var spancontent = document.getElementById("copy").innerHTML;
+      if (spancontent == "修改") {
+        this.readonly = false;
+        document.getElementById("copy").innerHTML = "保存";
+      }
+      if (spancontent == "保存") {
+        this.updateOrg();
+      }
+    },
     showPopup(index) {
-      if (index === 1) {
-        this.show1 = true;
-      } else if (index === 2) {
-        this.show2 = true;
+      if (this.readonly == true) {
+        return false;
+      }
+      if (this.readonly == false) {
+        if (index === 1) {
+          this.show1 = true;
+        } else if (index === 2) {
+          this.show2 = true;
+        }
       }
     },
     // 机构地址
     chooseCity(value) {
-      console.log("city", value);
       this.show2 = false;
       const arr = [];
       value.map(item => {
-        console.log(item);
         arr.push(item.name);
       });
       const str = arr.join("-");
       this.org_area = str;
     },
     chooseCityTwo(value) {
-      console.log("value是什么", value);
       this.show1 = false;
       const arr = [];
       value.map(item => {
@@ -4263,9 +4279,6 @@ export default {
       this.orgForm.district_name = countName;
     },
     onChangeTwo(picker, value, index) {
-      console.log(picker);
-      console.log(value);
-      console.log(index);
       let orgtypeName = "";
       for (let index = 0; index < value.length; index++) {
         orgtypeName = value[0].name;
@@ -4300,7 +4313,7 @@ export default {
       getOrgInformation(id).then(response => {
         if (response.data.state === 1) {
           var information = response.data.data.information;
-          console.log("information", information);
+         // console.log("information", information);
           var typeName = response.data.data.typeName;
           var name = response.data.data.name;
           this.orgForm.org_name = information.org_name;
@@ -4319,16 +4332,7 @@ export default {
         }
       });
     },
-    spread() {
-      var spancontent = document.getElementById("copy").innerHTML;
-      if (spancontent == "修改") {
-        this.readonly = false;
-        document.getElementById("copy").innerHTML = "保存";
-      }
-      if (spancontent == "保存") {
-        this.updateOrg();
-      }
-    },
+
     updateOrg() {
       if (this.orgForm.org_name.trim().length <= 0) {
         Toast("机构名字不能为空");
@@ -4364,7 +4368,7 @@ export default {
       updateOrg(this.orgForm, this.orgForm.id).then(response => {
         if (response.data.state === 1) {
           var org = response.data.data.org;
-          console.log("org", org);
+          // console.log('org', org)
           this.$router.push("/homeIndex");
         } else {
           Toast.fail(response.data.msg);
@@ -4378,8 +4382,7 @@ export default {
           var orgtype = response.data.data.orgType;
         }
       });
-    },
- 
+    }
   },
   created() {
     var id = this.$route.query.id;

src/pages/patients/editPatient.vue

@@ -23,7 +23,7 @@
         placeholder="请选择"
         required
         :readonly="readonly"
-        @click="show = true"
+        @click="clickSex"
       />
       <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
         <van-picker :columns="columns" show-toolbar @change="onChange" />
@@ -97,7 +97,7 @@
           required
           :readonly="readonly"
           placeholder="请选择"
-          @click="show3 = true"
+          @click="clickPatientSoure"
         />
         <van-popup v-model="show3" position="bottom" :style="{ height: '40%' }">
           <van-picker :columns="columns2" show-toolbar @change="onChange1" />
@@ -109,7 +109,7 @@
           required
           :readonly="readonly"
           placeholder="请选择"
-          @click="show4 = true"
+          @click="clickLapseto"
         />
         <van-popup v-model="show4" position="bottom" :style="{ height: '40%' }">
           <van-picker :columns="columns4" show-toolbar @change="onChange2" />
@@ -157,7 +157,7 @@
           right-icon="arrow"
           :readonly="readonly"
           placeholder="请选择"
-          @click="show2 = true"
+          @click="clickDate"
         />
         <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
           <van-datetime-picker
@@ -235,7 +235,7 @@
           right-icon="arrow"
           :readonly="readonly"
           placeholder="请选择"
-          @click="show12 = true"
+          @click="clickDateTwo"
         />
         <van-popup
           v-model="show12"
@@ -257,7 +257,7 @@
           right-icon="arrow"
           :readonly="readonly"
           placeholder="请选择"
-          @click="show14 = true"
+          @click="clickPatientType"
         />
         <van-popup
           v-model="show14"
@@ -276,7 +276,7 @@
           right-icon="arrow"
           :readonly="readonly"
           placeholder="请选择"
-          @click="show13 = true"
+          @click="clickTreatMethod"
         />
         <van-popup
           v-model="show13"
@@ -780,6 +780,62 @@ export default {
         this.updatedPatient();
       }
     },
+    clickSex() {
+      if (this.readonly == true) {
+        this.show = false;
+      }
+      if (this.readonly == false) {
+        this.show = true;
+      }
+    },
+    clickPatientSoure() {
+      if (this.readonly == true) {
+        this.show3 = false;
+      }
+      if (this.readonly == false) {
+        this.show3 = true;
+      }
+    },
+    clickLapseto() {
+      if (this.readonly == true) {
+        this.show4 = false;
+      }
+      if (this.readonly == false) {
+        this.show4 = true;
+      }
+    },
+    clickDate() {
+      if (this.readonly == true) {
+        this.show2 = false;
+      }
+      if (this.readonly == false) {
+        this.show2 = true;
+      }
+    },
+    clickDateTwo() {
+      if (this.readonly == true) {
+        this.show12 = false;
+      }
+      if (this.readonly == false) {
+        this.show12 = true;
+      }
+    },
+    clickPatientType() {
+      if (this.readonly == true) {
+        this.show14 = false;
+      }
+      if (this.readonly == false) {
+        this.show14 = true;
+      }
+    },
+    clickTreatMethod() {
+      if (this.readonly == true) {
+        this.show13 = false;
+      }
+      if (this.readonly == false) {
+        this.show13 = true;
+      }
+    },
     updatedPatient() {
       if (this.patientForm.name === "") {
         this.$toast("姓名不能为空");