更新

src/pages/allDoctorAdvice/index.vue

@@ -13,11 +13,11 @@
         :key="index"
       >
         <div v-for="(it, i) in item.child" :key="i">
-            <div style="display:flex;justify-content:space-between;align-items:center">
+          <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)" />
+            <span v-if="i<1"><van-icon class="ellipsis" name="ellipsis" @click="DeleteFive(item.start_time,item.child[0].execution_staff,index)" /></span>
             </div>
           <div class="statOrder">
             <div v-if="it.advice_type == 1 && it.parent_id == 0">

src/pages/configureCenter/editBed.vue

@@ -0,0 +1,253 @@
+<template>
+  <div class="page_newBed">
+    <div class="newBedTitle">
+      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
+      <span class="titleName">编辑床位</span>
+        <div style="margin-left:80px">
+        <span @click="spread" id="copy">修改</span>
+      </div>
+    </div>
+    <div class="infoBox">
+      <van-field v-model="name" required label="床位号" placeholder="请输入" :readonly="readonly"/>
+      <van-field
+        label="所属分区"
+        v-model="zone"
+        right-icon="arrow"
+        placeholder="请选择"
+        required
+        readonly
+        @click="clickType"
+      />
+      <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
+        <van-picker :columns="columns" show-toolbar @confirm="confirmZone" @cancel="cancelZone"/>
+      </van-popup>
+
+      <van-field
+        label="所属分组"
+        v-model="group"
+        right-icon="arrow"
+        placeholder="请选择"
+        required
+        readonly
+        @click="clickTypeOne"
+      />
+      <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
+        <van-picker :columns="columns1" show-toolbar @confirm="confirmGroup" @cancel="cancelGroup"/>
+      </van-popup>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getAllGroupOne, getBedDetail, updateBed } from "@/api/patient/patient";
+export default {
+  data() {
+    return {
+      show: false,
+      show1: false,
+      columns: [],
+      columns1: [],
+      active: 0,
+      group: "",
+      name: "",
+      zone: "",
+      form: {
+        id: 0,
+        zone: "",
+        group: ""
+      },
+      data: [],
+      dataOne: [],
+      zoneData: [],
+      groupData: [],
+      readonly: true
+    };
+  },
+  methods: {
+    toReturn() {
+      this.$router.push("/configurecenter?active=" + this.active);
+    },
+    getAllGroupOne() {
+      getAllGroupOne().then(response => {
+        if (response.data.state === 1) {
+          var group = response.data.data.group;
+          for (let i = 0; i < group.length; i++) {
+            this.columns1.push(group[i].name);
+          }
+          this.data = group;
+          var zone = response.data.data.zone;
+
+          for (let j = 0; j < zone.length; j++) {
+            this.columns.push(zone[j].name);
+          }
+          this.dataOne = zone;
+        }
+      });
+    },
+    confirmZone(val) {
+      this.zone = val;
+      for (let i = 0; i < this.dataOne.length; i++) {
+        if (this.dataOne[i].name === val) {
+          this.form.zone = this.dataOne[i].id;
+        }
+      }
+      this.show = false;
+    },
+    cancelZone() {
+      this.show = false;
+    },
+    confirmGroup(val) {
+      this.group = val;
+      for (let i = 0; i < this.data.length; i++) {
+        if (val === this.data[i].name) {
+          this.form.group = this.data[i].id;
+        }
+      }
+      this.show1 = false;
+    },
+    cancelGroup() {
+      this.show1 = false;
+    },
+    getBedDetail(id) {
+      getBedDetail(id).then(response => {
+        if (response.data.state === 1) {
+          var bedDetail = response.data.data.bedDetail;
+          this.form.id = bedDetail.id;
+          var zone = response.data.data.zone;
+          console.log(zone);
+          var group = response.data.data.group;
+          console.log("bedDetail", bedDetail);
+          // this.zone = bedDetail.zone_id;
+          this.name = bedDetail.number;
+          for (let i = 0; i < zone.length; i++) {
+            if (bedDetail.zone_id === zone[i].id) {
+              this.zone = zone[i].name;
+            }
+          }
+          for (let j = 0; j < group.length; j++) {
+            if (bedDetail.group_id === group[j].id) {
+              this.group = group[j].name;
+            }
+          }
+        }
+      });
+    },
+    spread() {
+      var spancontent = document.getElementById("copy").innerHTML;
+      if (spancontent == "修改") {
+        this.readonly = false;
+        document.getElementById("copy").innerHTML = "保存";
+      }
+      if (spancontent == "保存") {
+        this.updateBed();
+      }
+    },
+    clickType() {
+      if (this.readonly == true) {
+        this.show = false;
+      }
+      if (this.readonly == false) {
+        this.show = true;
+      }
+    },
+    clickTypeOne() {
+      if (this.readonly == true) {
+        this.show1 = false;
+      }
+      if (this.readonly == false) {
+        this.show1 = true;
+      }
+    },
+    updateBed() {
+      if (this.name === "") {
+        this.$toast("床位号不能为空");
+        return false;
+      }
+      if (this.form.zone === "") {
+        for (let i = 0; i < this.dataOne.length; i++) {
+          if (this.zone === this.dataOne[i].name) {
+            this.form.zone = this.dataOne[i].id;
+          }
+        }
+      }
+      if (this.form.group === "") {
+        for (let i = 0; i < this.data.length; i++) {
+          if ((this.group = this.data[i].name)) {
+            this.form.group = this.data[i].id;
+          }
+        }
+      }
+      const params = {
+        id: this.form.id,
+        name: this.name,
+        zone: this.form.zone,
+        group: this.form.group
+      };
+      updateBed(params).then(response => {
+        if (response.data.state === 1) {
+          var number = response.data.data.number;
+          console.log("number", number);
+          this.$router.push("/configurecenter?active=" + this.active);
+        }
+      });
+    }
+  },
+  created() {
+    this.active = parseInt(this.$route.query.active);
+    this.getAllGroupOne();
+    var id = this.$route.query.id;
+    this.getBedDetail(id);
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page_newBed {
+  height: 100%;
+  overflow: hidden;
+  overflow-y: auto;
+  background: #fafafa;
+  .newBedTitle {
+    background: #fff;
+    padding: 0 1.125rem;
+    height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 7rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .infoBox {
+    margin-top: 1rem;
+  }
+  .save {
+    width: 19.25rem;
+    height: 2.875rem;
+    margin: 0 auto;
+    background: rgba(51, 138, 251, 1);
+    box-shadow: 0px 1px 12px 0px rgba(51, 138, 251, 1);
+    border-radius: 1.4375rem;
+    text-align: center;
+    line-height: 2.875rem;
+    color: #fff;
+    margin-top: 2.875rem;
+  }
+}
+</style>
+<style lang="scss">
+.infoBox {
+  .van-field__body {
+    width: 100%;
+  }
+  .van-cell__value {
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

src/pages/configureCenter/editGrouping.vue

@@ -0,0 +1,128 @@
+<template>
+  <div class="page_newGrouping">
+    <div class="newGroupingTitle">
+      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
+      <span class="titleName">编辑分组</span>
+       <div style="margin-left:80px">
+        <span @click="spread" id="copy">修改</span>
+      </div>
+    </div>
+    <div class="infoBox">
+      <van-field v-model="name" required label="分组名称" placeholder="请输入" :readonly="readonly" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { getGroupDetail, updateGroup } from "@/api/patient/patient";
+export default {
+  data() {
+    return {
+      show: false,
+      id: 0,
+      name: "",
+      active: 0,
+      readonly: true
+    };
+  },
+  methods: {
+    getGroupDetail(id) {
+      getGroupDetail(id).then(response => {
+        if (response.data.state == 1) {
+          var groupdetail = response.data.data.groupDetail;
+          console.log("groupdetail", groupdetail);
+          this.name = groupdetail.name;
+          this.id = groupdetail.id;
+        }
+      });
+    },
+    updateGroup() {
+      if (this.name === "") {
+        this.$toast("请输入分组名");
+        return false;
+      }
+      const params = {
+        name: this.name,
+        id: this.id
+      };
+      updateGroup(params).then(response => {
+        if (response.data.state === 1) {
+          var group = response.data.data.group;
+          this.$router.push("/configurecenter?active=" + this.active);
+        }
+      });
+    },
+    toReturn() {
+      this.$router.push("/configurecenter?active=" + this.active);
+    },
+    spread() {
+      var spancontent = document.getElementById("copy").innerHTML;
+      if (spancontent == "修改") {
+        this.readonly = false;
+        document.getElementById("copy").innerHTML = "保存";
+      }
+      if (spancontent == "保存") {
+        this.updateGroup();
+      }
+    }
+  },
+  created() {
+    this.active = parseInt(this.$route.query.active);
+    var id = this.$route.query.id;
+    this.getGroupDetail(id);
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page_newGrouping {
+  height: 100%;
+  overflow: hidden;
+  overflow-y: auto;
+  background: #fafafa;
+  .newGroupingTitle {
+    background: #fff;
+    padding: 0 1.125rem;
+    height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 7rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .infoBox {
+    margin-top: 1rem;
+
+    .van-cell__value {
+      display: flex;
+      align-items: center;
+    }
+  }
+  .save {
+    width: 19.25rem;
+    height: 2.875rem;
+    margin: 0 auto;
+    background: rgba(51, 138, 251, 1);
+    box-shadow: 0px 1px 12px 0px rgba(51, 138, 251, 1);
+    border-radius: 1.4375rem;
+    text-align: center;
+    line-height: 2.875rem;
+    color: #fff;
+    margin-top: 2.875rem;
+  }
+}
+</style>
+<style lang="scss">
+.infoBox {
+  .van-cell__value {
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

src/pages/configureCenter/editPartion.vue

@@ -0,0 +1,240 @@
+<template>
+  <div class="page_newPartition">
+    <div class="newPartitionTitle">
+      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
+      <span class="titleName">编辑分区</span>
+      <div style="margin-left:80px">
+        <span @click="spread" id="copy">修改</span>
+      </div>
+    </div>
+    <div class="infoBox">
+      <van-field
+        v-model="form.name"
+        required
+        label="分区名称"
+        placeholder="请输入"
+        :readonly="readonly"
+      />
+      <van-field
+        label="分区类型"
+        v-model="type"
+        right-icon="arrow"
+        placeholder="请选择"
+        required
+        :readonly="readonly"
+        @click="clickType"
+      />
+      <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
+        <van-picker
+          :columns="columns"
+          show-toolbar
+          @confirm="onConfirm"
+          @cancel="oncancel"
+        />
+      </van-popup>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getPartionDetail, UpdatePartition } from "@/api/patient/patient";
+export default {
+  data() {
+    return {
+      show: false,
+      columns: ["普通", "乙肝", "丙肝", "艾滋病", "肺结核", "梅毒"],
+      form: {
+        id: "",
+        name: "",
+        zoneType: ""
+      },
+      type: "",
+      active: 0,
+      showOne: true,
+      shoTwo: false,
+      readonly: true
+    };
+  },
+  methods: {
+    onConfirm(val) {
+      if (val === "普通") {
+        this.type = val;
+        this.form.zoneType = 1;
+        this.show = false;
+      }
+      if (val === "乙肝") {
+        this.type = val;
+        this.form.zoneType = 2;
+        this.show = false;
+      }
+      if (val === "丙肝") {
+        this.type = val;
+        this.form.zoneType = 3;
+        this.show = false;
+      }
+      if (val === "艾滋病") {
+        this.type = val;
+        this.form.zoneType = 4;
+        this.show = false;
+      }
+      if (val === "肺结核") {
+        this.type = val;
+        this.form.zoneType = 5;
+        this.show = false;
+      }
+      if (val === "梅毒") {
+        this.type = val;
+        this.form.zoneType = 6;
+        this.show = false;
+      }
+    },
+    oncancel() {
+      this.show = false;
+    },
+    getPartionDetail(id) {
+      getPartionDetail(id).then(response => {
+        if (response.data.state === 1) {
+          var partionDetail = response.data.data.partionDetail;
+          this.form.name = partionDetail.name;
+          this.form.id = partionDetail.id;
+          if (partionDetail.type === 1) {
+            this.type = "普通";
+          }
+          if (partionDetail.type === 2) {
+            this.type = "乙肝";
+          }
+          if (partionDetail.type === 3) {
+            this.type = "丙肝";
+          }
+          if (partionDetail.type === 4) {
+            this.type = "艾滋病";
+          }
+          if (partionDetail.type === 5) {
+            this.type = "肺结核";
+          }
+          if (partionDetail.type === 6) {
+            this.type = "梅毒";
+          }
+          console.log("partionDetail", partionDetail);
+        }
+      });
+    },
+    UpdatePartition() {
+      if (this.form.name === "") {
+        this.$toast("请输入分区名");
+        return false;
+      }
+      if (this.form.zoneType === "") {
+        if (this.type == "普通") {
+          this.form.zoneType = 1;
+        }
+        if (this.type == "乙肝") {
+          this.form.zoneType = 2;
+        }
+        if (this.type == "丙肝") {
+          this.form.zoneType = 3;
+        }
+        if (this.type == "艾滋病") {
+          this.form.zoneType = 4;
+        }
+        if (this.type == "肺结核") {
+          this.form.zoneType = 5;
+        }
+        if (this.type == "梅毒") {
+          this.form.zoneType = 6;
+        }
+      }
+      const params = {
+        id: this.form.id,
+        name: this.form.name,
+        type: this.form.zoneType
+      };
+      UpdatePartition(params).then(response => {
+        if (response.data.state === 1) {
+          var zone = response.data.data.zone;
+          console.log("zone", zone);
+          this.$router.push("/configurecenter");
+        }
+      });
+    },
+    toReturn() {
+      this.$router.push("/configurecenter?active=" + this.active);
+    },
+    spread() {
+      var spancontent = document.getElementById("copy").innerHTML;
+      if (spancontent == "修改") {
+        this.readonly = false;
+        document.getElementById("copy").innerHTML = "保存";
+      }
+      if (spancontent == "保存") {
+        this.UpdatePartition();
+      }
+    },
+    clickType() {
+      if (this.readonly == true) {
+        this.show = false;
+      }
+      if (this.readonly == false) {
+        this.show = true;
+      }
+    }
+  },
+  created() {
+    this.active = parseInt(this.$route.query.active);
+    var id = this.$route.query.id;
+    console.log("id", id);
+    this.getPartionDetail(id);
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page_newPartition {
+  height: 100%;
+  overflow: hidden;
+  overflow-y: auto;
+  background: #fafafa;
+  .newPartitionTitle {
+    background: #fff;
+    padding: 0 1.125rem;
+    height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 7rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .infoBox {
+    margin-top: 1rem;
+  }
+  .save {
+    width: 19.25rem;
+    height: 2.875rem;
+    margin: 0 auto;
+    background: rgba(51, 138, 251, 1);
+    box-shadow: 0px 1px 12px 0px rgba(51, 138, 251, 1);
+    border-radius: 1.4375rem;
+    text-align: center;
+    line-height: 2.875rem;
+    color: #fff;
+    margin-top: 2.875rem;
+  }
+}
+</style>
+<style lang="scss">
+.infoBox {
+  .van-field__body {
+    width: 100%;
+  }
+  .van-cell__value {
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -37,10 +37,10 @@
             </div>
 
          <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="statOrder"  v-if="it.advice_type == 1 && it.parent_id == 0">
               <div class="statOrderTitle">
                 <span v-if="i<1">长期医嘱</span>
-                <span  v-if="i<1" style="margin-left:1rem">{{getTimes(it.start_time)}}</span>
+                <span v-if="i<1" style="margin-left:1rem">{{getTimes(it.start_time)}}</span>
               </div>
               <div class="orderContent" v-if="i<4">
                 <p> {{ it.advice_name }} {{ it.advice_desc
@@ -94,6 +94,7 @@
                 </div>
             </div>
          </div>
+
             <div class="all" @click="toDoctorAdviceDetail(item.start_time)">全部</div>
           </div>
         </van-list>
@@ -243,6 +244,7 @@ export default {
         this.form.limit,
         this.form.page
       );
+      this.onLoad();
     },
     getstartTime(value) {
       this.form.page = 1;
@@ -267,6 +269,7 @@ export default {
         this.form.page
       );
       this.startShow = false;
+      this.onLoad();
     },
     getstartTime2(value) {
       this.form.page = 1;
@@ -292,6 +295,7 @@ export default {
         this.form.page
       );
       this.endShow = false;
+      this.onLoad();
     },
     getDoctorAdvices(patientid) {
       if (this.type === "全部") {
@@ -394,7 +398,7 @@ export default {
           this.loading = false;
           this.finished = true;
         }
-      }, 1000);
+      }, 5000);
     },
 
     toDoctorAdviceDetail(id) {