冲突

src/api/admin_user.js

@@ -173,6 +173,20 @@ export function GetFunctionRoleInfo(params){
 
 
 
+export function GetAllRole(){
+  return request({
+    url:'/m/api/role',
+    method:'get',
+  })
+}
+
+
+
+
+
+
+
+
 
 
 

src/api/patient.js

@@ -15,14 +15,14 @@ export function EditDialysisSolution(id, solution) {
   })
 }
 
-export function EditAssessmentBeforeDislysis(id, assessment_date, before,mode) {
+export function EditAssessmentBeforeDislysis(id, assessment_date, before, mode) {
   return request({
-    url: '/m/api/assessmentbefore/commit?patient=' + id + '&assessment_date=' + assessment_date+"&mode="+mode,
+    url: '/m/api/assessmentbefore/commit?patient=' + id + '&assessment_date=' + assessment_date + '&mode=' + mode,
     method: 'post',
     data: before,
-    headers:{"Permission":1},
-
-
+    headers: {
+      'Permission': 1
+    }
 
   })
 }

src/api/patient/patient.js

@@ -584,9 +584,9 @@ export function SaveBirthday(data) {
   })
 }
 
-export function getOrgName(params) {
+export function getOrgName(id, params) {
   return request({
-    url: '/m/api/patient/getorgname',
+    url: '/m/api/patient/getorgname?id=' + id,
     method: 'Get',
     params: params
   })
@@ -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
   })
@@ -725,7 +725,6 @@ export function getBloodPatient(params) {
 }
 
 export function DeletePatient(id, params) {
-  console.log('医嘱id', id)
   return request({
     url: '/m/api/patient/deletePatient?id=' + id,
     method: 'delete',
@@ -738,7 +737,6 @@ export function saveName(id, name) {
     id: id,
     name: name
   }
-  console.log('params', params)
   return request({
     url: '/m/api/patient/savename',
     method: 'get',
@@ -762,9 +760,9 @@ export function getMyOrganazition(id, params) {
   })
 }
 
-export function getOrgInformation(params) {
+export function getOrgInformation(id, params) {
   return request({
-    url: '/m/api/org/getorginformation',
+    url: '/m/api/org/getorginformation?id=' + id,
     method: 'get',
     params: params
   })
@@ -793,3 +791,52 @@ export function getMyInforName(id, params) {
     params: params
   })
 }
+
+export function getPartionDetail(id, params) {
+  return request({
+    url: '/m/api/patient/getpartiondetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function UpdatePartition(params) {
+  return request({
+    url: '/m/api/patient/updatepartition',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getGroupDetail(id, params) {
+  return request({
+    url: '/m/api/patient/getgroupdetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function updateGroup(params) {
+  return request({
+    url: '/m/api/patient/updategroup',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getBedDetail(id, params) {
+  return request({
+    url: '/m/api/patient/getbeddetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function updateBed(params) {
+  console.log('params', params)
+  return request({
+    url: '/m/api/patient/updatebed',
+    method: 'get',
+    params: params
+  })
+}

src/pages/allDoctorAdvice/index.vue

@@ -13,14 +13,17 @@
         :key="index"
       >
         <div v-for="(it, i) in item.child" :key="i">
-            <p class="time">
+          <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>
+            <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">
               <div class="statOrderTitle">
-                <span>长期医嘱</span>
-                <span style="margin-left:1rem">
+                <span v-if="i<1">长期医嘱</span>
+                <span style="margin-left:1rem" v-if="i<1">
                   {{ getTimes(it.start_time) }}
                 </span>
               </div>
@@ -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
@@ -56,24 +59,21 @@
                        />
                   </div>
                 </div>
-              </div>
-              <div
-                class="doctorBox"
-                v-if="it.advice_doctor || it.execution_staff || it.checker"
-              >
-                <p>开嘱医生：{{ getDoctor(it.advice_doctor) }}</p>
-                <p>执行护士：{{ getDoctor(item.execution_staff) }}</p>
-                <p>核对护士：{{ getDoctor(item.checker) }}</p>
-              </div>
-            </div>
+                  <div class="doctorBox">
+                      <p>开嘱医生：{{ getDoctor(it.advice_doctor)}}</p>
+                      <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
+                      <p>核对护士：{{ getDoctor(it.checker) }}</p>
+                  </div>
+               </div>
+             </div>
 
             <div
               class="statOrder"
               v-if="it.advice_type == 3 && it.parent_id == 0"
             >
               <div class="longOrderTitle">
-                <span>临时医嘱</span>
-                <span style="margin-left:1rem">
+                <span v-if="i<1">临时医嘱</span>
+                <span style="margin-left:1rem" v-if="i<1">
                   {{ getTimes(item.child[0].start_time) }}
                 </span>
               </div>
@@ -89,7 +89,7 @@
                       <van-icon
                         class="ellipsis"
                         name="ellipsis"
-                        @click="newShowTwo=true"
+                        @click="DeleteTwo(it.id,it.execution_state,index)"
                        />
                  </div>
                 <div v-for="(i, index) in childList" :key="index">
@@ -105,14 +105,13 @@
                      <van-icon
                         class="ellipsis"
                         name="ellipsis"
-                        @click="newShowThree=true"
+                        @click="DeleteThree(i.id,i.execution_state,index)"
                        />
                   </div>
                 </div>
               </div>
               <div
                 class="doctorBox"
-                v-if="it.advice_doctor || it.execution_staff || it.checker"
               >
                 <p>开嘱医生：{{ getDoctor(it.advice_doctor) }}</p>
                 <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
@@ -121,6 +120,7 @@
             </div>
           </div>
         </div>
+
       </div>
 
         <van-action-sheet
@@ -153,6 +153,14 @@
           @cancel="onCancelThree"
           @select="onSelectThree"
         />
+
+        <van-action-sheet
+          v-model="newShowFour"
+          :actions="actions4"
+          cancel-text="取消"
+          @cancel="onCancelFour"
+          @select="onSelectFour"
+      />
     </div>
   </div>
 </template>
@@ -162,7 +170,8 @@ import {
   GetDoctorAdviceDetail,
   getAllDoctor,
   DeleteChild,
-  DeletePatient
+  DeletePatient,
+  DeleteManagement
 } from "@/api/patient/patient";
 import { Dialog } from "vant";
 import { uParseTime } from "@/utils/tools";
@@ -181,10 +190,12 @@ export default {
       actions1: [{ name: "删除" }],
       actions2: [{ name: "删除" }],
       actions3: [{ name: "删除" }],
+      actions4: [{ name: "全部删除" }],
+      newShow: false,
       newShowOne: false,
       newShowTwo: false,
       newShowThree: false,
-      id: 0,
+      newShowFour: false,
       index: 0,
       state: 0
     };
@@ -210,47 +221,46 @@ 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 = [];
 
-          list.map(item => {
-            let arr2 = [];
-            if (item.child.length > 1) {
-              item.child.map(it => {
-                if (arr.indexOf(it.advice_date) == -1) {
-                  arr.push(it.advice_date);
-                } else {
-                  delete it["advice_date"];
-                }
-              });
-              for (var i = item.child.length - 1; i != -1; i--) {
-                let obj = {};
-                obj.checker = item.child[i].checker;
-                obj.execution_staff = item.child[i].execution_staff;
-                obj.user_name = item.child[i].advice_doctor;
-                if (
-                  JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
-                ) {
-                  console.log("ajsdkljasldkasjdlkasjs");
-                  arr2.push(obj);
-                } else {
-                  console.log("删除");
-                  delete item.child[i]["checker"];
-                  delete item.child[i]["execution_staff"];
-                  delete item.child[i]["advice_doctor"];
-                }
-              }
-            }
-          });
+          // list.map(item => {
+          //   let arr2 = [];
+          //   if (item.child.length > 1) {
+          //     item.child.map(it => {
+          //       if (arr.indexOf(it.advice_date) == -1) {
+          //         arr.push(it.advice_date);
+          //       } else {
+          //         delete it["advice_date"];
+          //       }
+          //     });
+          //     for (var i = item.child.length - 1; i != -1; i--) {
+          //       let obj = {};
+          //       obj.checker = item.child[i].checker;
+          //       obj.execution_staff = item.child[i].execution_staff;
+          //       obj.user_name = item.child[i].advice_doctor;
+          //       if (
+          //         JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
+          //       ) {
+          //         arr2.push(obj);
+          //       } else {
+          //         console.log("删除");
+          //         delete item.child[i]["checker"];
+          //         delete item.child[i]["execution_staff"];
+          //         delete item.child[i]["advice_doctor"];
+          //       }
+          //     }
+          //   }
+          // });
 
           console.log("list是 ", list);
           this.doctorAdvicedetail = list;
@@ -280,23 +290,36 @@ export default {
         }
       }
     },
+    DeleteFive(id, state, index) {
+      this.id = id;
+      this.state = state;
+      this.index = index;
+      this.newShowFour = true;
+    },
     toDelete(id, state, index) {
-      console.log("id", id);
-      console.log("state", state);
       this.id = id;
       this.state = state;
       this.index = index;
       this.newShow = true;
     },
     Delete(id, state, index) {
-      console.log("id", id);
-      console.log("state", state);
       this.id = id;
       this.state = state;
       this.index = index;
       this.newShowOne = true;
     },
-
+    DeleteTwo(id, state, index) {
+      this.id = id;
+      this.state = state;
+      this.index = index;
+      this.newShowTwo = true;
+    },
+    DeleteThree(id, state, index) {
+      this.id = id;
+      this.state = state;
+      this.index = index;
+      this.newShowThree = true;
+    },
     onCancel() {
       this.newShow = false;
     },
@@ -313,10 +336,29 @@ export default {
         this.DeleteChild(this.id, this.index, this.state);
       }
     },
-    onSelectTwo() {},
-    onCancelTwo() {},
-    onCancelThree() {},
-    onSelectThree() {},
+    onSelectTwo(val) {
+      if (val.name === "删除") {
+        this.DeletePatient(this.id, this.state, this.index);
+      }
+      this.newShowTwo = false;
+    },
+    onCancelTwo() {
+      this.newShowTwo = false;
+    },
+    onCancelThree() {
+      this.newShowThree = false;
+    },
+    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("医嘱已执行,无法删除");
@@ -330,6 +372,7 @@ export default {
           if (response.data.state === 1) {
             var msg = response.data.data.msg;
             this.GetDoctorAdviceDetail(this.id);
+            this.doctorAdvicedetail.splice(index, 1);
             this.newShow = false;
           }
         });
@@ -347,22 +390,41 @@ export default {
         DeleteChild(id).then(response => {
           if (response.data.state === 1) {
             var msg = response.data.data.msg;
-
             this.childList.splice(index, 1);
             this.newShowOne = false;
+            this.newShowThree = false;
+          }
+        });
+      });
+    },
+    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() {
-    this.active = parseInt(this.$route.query.active);
     setRem();
     setHeight();
     var id = this.$route.query.id;
+    console.log("id是--------", id);
     this.GetDoctorAdviceDetail(id);
     var patientid = this.$route.query.patientid;
     this.id = patientid;
+    this.active = parseInt(this.$route.query.active);
     this.getAllDoctor();
   }
 };

src/pages/configureCenter/components/Bed.vue

@@ -44,7 +44,7 @@ export default {
       finished: false,
       newShow: false,
       show: false,
-      actions: [{ name: "删除" }],
+      actions: [{ name: "编辑" }, { name: "删除" }],
       page: 1,
       limit: 10,
       total: 0,
@@ -114,6 +114,9 @@ export default {
       if (val.name === "删除") {
         this.DeleteBed(this.id, this.index);
       }
+      if (val.name === "编辑") {
+        this.$router.push("/editbed?id=" + this.id + "&active=" + this.active);
+      }
     },
     onCancel() {
       this.newShow = false;
@@ -129,6 +132,9 @@ export default {
             console.log("msg", msg);
             this.BedNumber.splice(index, 1);
             this.newShow = false;
+          } else {
+            this.$toast("该床位尚有排班安排，不能删除");
+            this.newShow = false;
           }
         });
       });

src/pages/configureCenter/components/Grouping.vue

@@ -40,7 +40,7 @@ export default {
       loading: false,
       finished: false,
       newShow: false,
-      actions: [{ name: "删除" }],
+      actions: [{ name: "编辑" }, { name: "删除" }],
       page: 1,
       limit: 10,
       group: [],
@@ -94,6 +94,11 @@ export default {
       if (val.name === "删除") {
         this.DeleteGroup(this.id, this.number, this.index);
       }
+      if (val.name === "编辑") {
+        this.$router.push(
+          "/editgroup?id=" + this.id + "&active=" + this.active
+        );
+      }
     },
     DeleteGroup(id, number, index) {
       if (number !== "") {

src/pages/configureCenter/components/Partition.vue

@@ -23,6 +23,7 @@
         <van-icon class="addIcon" name="add" @click="addPartition" />新增
       </div>
     </div>
+
     <van-action-sheet
       v-model="newShow"
       :actions="actions"
@@ -45,7 +46,7 @@ export default {
       loading: false,
       finished: false,
       newShow: false,
-      actions: [{ name: "删除" }],
+      actions: [{ name: "编辑" }, { name: "删除" }],
       page: 1,
       limit: 10,
       zone: [],
@@ -113,12 +114,15 @@ export default {
       if (val.name === "删除") {
         this.DeleteZone(this.id, this.number, this.index);
       }
+      if (val.name === "编辑") {
+        this.$router.push("/editpartition?id=" + this.id);
+      }
     },
     Delete(id, number, index) {
+      this.newShow = true;
       this.id = id;
       this.index = index;
       this.number = number;
-      this.newShow = true;
     },
     DeleteZone(id, number, index) {
       if (number !== "") {

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/console/managementConsole/staff_role/addStaff/index.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="editStaffTip">必填</div>
     <div class="staffBox">
-      <van-field v-model="name" label="姓名" clearable placeholder="请输入姓名" />
+      <van-field v-model="name" label="姓名" clearable placeholder="请输入姓名"/>
       <van-field
         v-model="tel"
         type="tel"
@@ -28,7 +28,8 @@
                 shape="square"
                 v-for="(item, index) in roles"
                 :key="index"
-              >{{item.name}}</van-checkbox>
+              >{{item.name}}
+              </van-checkbox>
             </van-checkbox-group>
           </div>
         </template>
@@ -39,12 +40,12 @@
           <span class="custom-title" style="width:90px">职称</span>
           <div style="display:flex;">
             <div style="margin-right:2rem;display: flex;align-items: center;" @click="show1 = true">
-              <span>请选择</span>
-              <van-icon name="arrow-down" />
+              <span>{{type_name}}</span>
+              <van-icon name="arrow-down"/>
             </div>
-            <div style="margin-right:2rem;display: flex;align-items: center;">
-              <span>请选择</span>
-              <van-icon name="arrow-down" />
+            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show2 = true">
+              <span>{{titles_name}}</span>
+              <van-icon name="arrow-down"/>
             </div>
           </div>
         </template>
@@ -52,114 +53,209 @@
     </div>
     <div class="editStaffTip">选填</div>
     <div class="staffBox">
-      <van-field v-model="title" label="职位" placeholder="请填写" />
+      <van-field v-model="title" label="职位" placeholder="请填写"/>
     </div>
     <div class="addnewStaff" @click="save(2)">
-      <van-icon class="addIcon" name="add" />
+      <van-icon class="addIcon" name="add"/>
       <p>保存并继续新增员工</p>
     </div>
     <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
-      <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-picker show-toolbar :columns="user_type_name" @cancel="onCancel" @confirm="onUserTypeConfirm"/>
     </van-popup>
     <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
-      <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-picker show-toolbar :columns="user_titles_name" @cancel="onCancel" @confirm="onUserTitleConfirm"/>
     </van-popup>
+
   </div>
 </template>
 
 <script>
-import { AdminInitData, CreateAdminUser } from "@/api/admin_user";
-import { checkMobile } from "@/utils/tools";
-import { setRem } from "@/libs/functionRem";
-
-export default {
-  data() {
-    return {
-      name: "",
-      tel: "",
-      role_ids: [],
-      title: "",
-      value1: "",
-      roles: [],
-      show1: false,
-      show2: false,
-      columns: ["杭州", "宁波", "温州", "嘉兴", "湖州"]
-    };
-  },
-  methods: {
-    GetAdminUserInitData() {
-      AdminInitData().then(response => {
-        if (response.data.state === 1) {
-          for (let i = 0; i < response.data.data.roles.length; i++) {
-            if (!response.data.data.roles[i].is_super_admin) {
-              this.roles.push(response.data.data.roles[i]);
-            }
+  import {AdminInitData, CreateAdminUser} from "@/api/admin_user";
+  import {checkMobile} from "@/utils/tools";
+  import {setRem} from "@/libs/functionRem";
+
+  export default {
+    data() {
+      return {
+        name: "",
+        tel: "",
+        role_ids: [],
+        title: "",
+        value1: "",
+        roles: [],
+        show1: false,
+        show2: false,
+        type_name:"",
+        titles_name:"",
+        user_type:2,
+        user_title:1,
+
+        user_types: [
+          {index: 2, name: '医生'},
+          {index: 3, name: '护士'}
+        ],
+        user_titles: [
+          {index: 1, name: '医士'},
+          {index: 2, name: '医师'},
+          {index: 3, name: '住院医师'},
+          {index: 4, name: '主治医师'},
+          {index: 5, name: '副主任医师'},
+          {index: 6, name: '主任医师'},
+          {index: 7, name: '护士'},
+          {index: 8, name: '护师'},
+          {index: 9, name: '主管护师'},
+          {index: 10, name: '副主任护师'},
+          {index: 11, name: '主任护师'},
+          {index: 12, name: '运营专员'},
+          {index: 13, name: '运营主管'}
+        ],
+
+        user_type_name: [
+          '医生',
+          '护士'
+        ],
+
+        user_titles_name: [
+          '医士',
+          '医师',
+          '住院医师',
+          '主治医师',
+          '副主任医师',
+          '主任医师',
+          '护士',
+          '护师',
+          '主管护师',
+          '副主任护师',
+          '主任护师',
+          '运营专员',
+          '运营主管'
+        ],
+
+      };
+    },
+    methods: {
+      onUserTypeConfirm(value, index){
+        this.show1 = false
+        for (let i = 0; i < this.user_types.length; i++){
+          if (this.user_types[i].name == value){
+            this.user_type = this.user_types[i].index
+            this.type_name= this.user_types[i].name
+
           }
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
+
         }
-      });
-    },
-    save(type) {
-      if (this.name.trim().length == 0) {
-        this.$toast({
-          message: "姓名不能为空!"
-        });
-        return;
-      }
-      if (!checkMobile(this.tel)) {
-        this.$toast({
-          message: "请填写正确的手机号码!"
-        });
-        return;
-      }
-      if (this.role_ids.length <= 0) {
-        this.$toast({
-          message: "至少选择一种角色"
-        });
-        return;
-      }
 
-      let params = {
-        name: this.name,
-        mobile: this.tel,
-        role_ids: this.role_ids.join(","),
-        title: this.title
-      };
-      console.log(params);
-      CreateAdminUser(params).then(response => {
-        if (response.data.state === 1) {
-          this.$toast({ message: "新增成功" });
-          if (type == 1) {
-            this.$router.go(-1);
+      },
+      onUserTitleConfirm(value, index){
+        this.show2 = false
+
+        for (let i = 0; i < this.user_titles.length; i++){
+          if (this.user_titles[i].name == value){
+            this.user_title = this.user_titles[i].index
+            this.titles_name= this.user_titles[i].name
+
+          }
+        }
+
+
+      },
+      onCancel() {
+        this.show1 = false
+        this.show2 = false
+
+
+      },
+
+      GetAdminUserInitData() {
+        AdminInitData().then(response => {
+          if (response.data.state === 1) {
+            for (let i = 0; i < response.data.data.roles.length; i++) {
+              if (!response.data.data.roles[i].is_super_admin) {
+                if(this.$store.getters.user.admin.is_super_admin){
+                  this.roles.push(response.data.data.roles[i]);
+                }else{
+                  if(response.data.data.roles[i].is_system != 1 && response.data.data.roles[i].name != "子管理员"){
+                    this.roles.push(response.data.data.roles[i]);
+                  }
+
+                }
+              }
+            }
           } else {
-            this.name = "";
-            this.mobile = "";
-            this.role_ids = [];
-            this.title = "";
+            this.$toast({
+              message: response.data.msg
+            });
           }
-        } else {
+        });
+      },
+      save(type) {
+        if (this.name.trim().length == 0) {
           this.$toast({
-            message: response.data.msg
+            message: "姓名不能为空!"
           });
+          return;
         }
-      });
+        if (!checkMobile(this.tel)) {
+          this.$toast({
+            message: "请填写正确的手机号码!"
+          });
+          return;
+        }
+        if (this.role_ids.length <= 0) {
+          this.$toast({
+            message: "至少选择一种角色"
+          });
+          return;
+        }
+
+        let params = {
+          name: this.name,
+          mobile: this.tel,
+          role_ids: this.role_ids.join(","),
+          title: this.title,
+          user_type: this.user_type,
+          user_title: this.user_title
+        };
+        CreateAdminUser(params).then(response => {
+          if (response.data.state === 1) {
+            this.$toast({message: "新增成功"});
+            if (type == 1) {
+              this.$router.go(-1);
+            } else {
+              this.name = "";
+              this.tel = "";
+              this.role_ids = [];
+              this.title = "";
+              this.user_type = 2
+              this.user_title = 1
+              this.titles_name = this.user_titles_name[0]
+              this.type_name = this.user_type_name[0]
+
+            }
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+      }
+    },
+    created() {
+      this.GetAdminUserInitData();
+      this.titles_name = this.user_titles_name[0]
+      this.type_name = this.user_type_name[0]
+
+      setRem();
     }
-  },
-  created() {
-    this.GetAdminUserInitData();
-    setRem();
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.page_addStaff {
-  height: 100%;
-  overflow: hidden;
-  background: #fafafa;
+  .page_addStaff {
+    height: 100%;
+    overflow: hidden;
+    background: #fafafa;
+
   .editStaffTitle {
     height: 3.125rem;
     display: flex;
@@ -169,15 +265,18 @@ export default {
     padding: 0 1.125rem;
     background: #fff;
   }
+
   .jiantou {
     font-size: 1.5rem;
     font-weight: 600;
     margin-right: 1.25rem;
   }
+
   .titleName {
     font-size: 1.125rem;
     font-weight: 600;
   }
+
   .editStaffTip {
     height: 1.875rem;
     line-height: 1.875rem;
@@ -185,24 +284,31 @@ export default {
     padding-left: 0.875rem;
     color: #989898;
   }
+
   .staffBox {
-    .van-cell {
-      font-size: 1rem;
-    }
-    .newCell {
-      padding-right: 0;
-    }
+
+  .van-cell {
+    font-size: 1rem;
+  }
+
+  .newCell {
+    padding-right: 0;
+  }
+
   }
   .van-cell__title {
     display: flex;
   }
+
   .van-checkbox-group {
     display: flex;
     flex-wrap: wrap;
   }
+
   .van-checkbox {
     margin-bottom: 0.625rem;
   }
+
   .addnewStaff {
     height: 2.8125rem;
     line-height: 2.8125rem;
@@ -212,19 +318,23 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 1rem;
-    .addIcon {
-      color: #338afb;
-      font-size: 1.5rem;
-      margin-right: 0.625rem;
-    }
+
+  .addIcon {
+    color: #338afb;
+    font-size: 1.5rem;
+    margin-right: 0.625rem;
+  }
+
+  }
   }
-}
 </style>
 <style lang="scss">
-.page_editStaff {
+  .page_editStaff {
+
   .van-cell__value {
     display: flex;
     align-items: center;
   }
-}
+
+  }
 </style>

src/pages/console/managementConsole/staff_role/editRole/index.vue

@@ -40,7 +40,8 @@
 
 <script>
   import {setRem} from "@/libs/functionRem";
-  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo,EditPurview} from "@/api/admin_user";
+  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo,EditPurview,GetAllRole} from "@/api/admin_user";
+  import {Dialog} from "vant";
 
   export default {
     data() {
@@ -64,7 +65,7 @@
         let purview_ids  = ""
         let type = 0
         if (value.pid == 0){ //当前页面只存在pid为0的数据，而且会出现开关按钮的情况只会是拥有一个子节点
-          console.log(value.sub_purview)
+
           if(value.sub_purview.length > 0) {
 
             purview_ids = value.id + "," + value.sub_purview[0].id
@@ -117,24 +118,27 @@
 
       },
       del(){
-        let params = {
-          role_id: this.$route.query.id,
-          enable:false,
-        }
-        DeleteRoleInfo(params).then(response => {
-          if (response.data.state === 1) {
-            this.$toast({
-              message: "删除成功"
-            });
-            this.$router.go(-1)
-          } else {
-            this.$toast({
-              message: response.data.msg
-            });
+        Dialog.confirm({
+          message: "是否删除该角色？"
+        }).then(() => {
+          let params = {
+            role_id: this.$route.query.id,
+            enable:false,
           }
-        });
-
+          DeleteRoleInfo(params).then(response => {
+            if (response.data.state === 1) {
+              this.$toast({
+                message: "删除成功"
+              });
+              this.$router.go(-1)
+            } else {
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
 
+        });
       },
       editRole(){
         let params = {

src/pages/console/managementConsole/staff_role/editStaff/index.vue

@@ -26,13 +26,39 @@
           </div>
         </template>
       </van-cell>
+
+
+      <van-cell class="newCell">
+        <!-- 使用 title 插槽来自定义标题 -->
+        <template slot="title">
+          <span class="custom-title" style="width:90px">职称</span>
+          <div style="display:flex;">
+            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show1 = true">
+              <span>{{type_name}}</span>
+              <van-icon name="arrow-down"/>
+            </div>
+            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show2 = true">
+              <span>{{titles_name}}</span>
+              <van-icon name="arrow-down"/>
+            </div>
+          </div>
+        </template>
+      </van-cell>
+
     </div>
     <div class="editStaffTip">选填</div>
     <div class="staffBox">
       <van-field v-model="title" label="职位" placeholder="请填写"/>
     </div>
-    <div v-if="adminInfo.status == 1" class="stop" @click="onClick(2)">禁用该员工账号</div>
-    <div v-if="adminInfo.status != 1" class="stop1" @click="onClick(1)">恢复该员工账号</div>
+    <div v-if="adminInfo.status == 1 && !adminInfo.admin.is_super_admin  &&  !adminInfo.is_sub_super_admin" class="stop" @click="onClick(2)">禁用该员工账号</div>
+    <div v-if="adminInfo.status != 1 && !adminInfo.admin.is_super_admin  &&  !adminInfo.is_sub_super_admin " class="stop1" @click="onClick(1)">恢复该员工账号</div>
+
+    <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
+      <van-picker show-toolbar :columns="user_type_name" @cancel="onCancel" @confirm="onUserTypeConfirm"/>
+    </van-popup>
+    <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
+      <van-picker show-toolbar :columns="user_titles_name" @cancel="onCancel" @confirm="onUserTitleConfirm"/>
+    </van-popup>
   </div>
 </template>
 
@@ -53,10 +79,97 @@
         name: "",
         tel: "",
         title: "",
-        adminInfo: {},
+        adminInfo: {
+          admin:{},
+
+        },
+        show1: false,
+        show2: false,
+        type_name:"",
+        titles_name:"",
+        user_type:2,
+        user_title:1,
+        user_types: [
+          {index: 2, name: '医生'},
+          {index: 3, name: '护士'}
+        ],
+        user_titles: [
+          {index: 1, name: '医士'},
+          {index: 2, name: '医师'},
+          {index: 3, name: '住院医师'},
+          {index: 4, name: '主治医师'},
+          {index: 5, name: '副主任医师'},
+          {index: 6, name: '主任医师'},
+          {index: 7, name: '护士'},
+          {index: 8, name: '护师'},
+          {index: 9, name: '主管护师'},
+          {index: 10, name: '副主任护师'},
+          {index: 11, name: '主任护师'},
+          {index: 12, name: '运营专员'},
+          {index: 13, name: '运营主管'}
+        ],
+
+        user_type_name: [
+          '医生',
+          '护士'
+        ],
+
+        user_titles_name: [
+          '医士',
+          '医师',
+          '住院医师',
+          '主治医师',
+          '副主任医师',
+          '主任医师',
+          '护士',
+          '护师',
+          '主管护师',
+          '副主任护师',
+          '主任护师',
+          '运营专员',
+          '运营主管'
+        ],
       };
     },
     methods: {
+      onUserTypeConfirm(value, index){
+        this.type_name = value
+        this.show1 = false
+
+        for (let i = 0; i < this.user_types.length; i++){
+          if (this.user_types[i].name == value){
+            this.user_type = this.user_types[i].index
+            this.type_name= this.user_types[i].name
+
+          }
+
+        }
+
+
+
+      },
+      onUserTitleConfirm(value, index){
+        this.titles_name = value
+        this.show2 = false
+
+        for (let i = 0; i < this.user_titles.length; i++){
+          if (this.user_titles[i].name == value){
+            this.user_title = this.user_titles[i].index
+            this.titles_name= this.user_titles[i].name
+
+          }
+        }
+
+
+
+
+      },
+      onCancel() {
+        this.show1 = false
+        this.show2 = false
+
+
+      },
       save() {
         if (this.name.trim().length == 0) {
           this.$toast({
@@ -76,6 +189,8 @@
           mobile: this.tel,
           role_ids: this.role_ids.join(","),
           title: this.title,
+          user_type: this.user_type,
+          user_title: this.user_title
         }
         EditAdmin(params).then(response => {
           if (response.data.state === 1) {
@@ -95,6 +210,7 @@
         GetAdminUserInfo(params).then(response => {
           if (response.data.state === 1) {
             this.adminInfo = response.data.data.user_info
+            console.log(this.adminInfo)
             // this.name = this.adminInfo.
             this.name = this.adminInfo.user_name
             this.tel = this.adminInfo.admin.mobile
@@ -103,6 +219,31 @@
             for (let i = 0; i < roles.length; i++) {
               this.role_ids.push(parseInt(roles[i]))
             }
+
+            for (let i = 0; i < this.user_types.length; i++){
+              if (this.user_types[i].index == this.adminInfo.user_type){
+                  this.user_type = this.adminInfo.user_type
+                  this.type_name= this.user_types[i].name
+
+              }
+
+            }
+            for (let i = 0; i < this.user_titles.length; i++){
+              if (this.user_titles[i].index == this.adminInfo.user_title){
+                this.user_title = this.adminInfo.user_title
+                this.titles_name= this.user_titles[i].name
+              }
+            }
+
+            //如果当前用户是超级管理员，而且是在编辑自己的信息的时候，将子管理员角色去除
+            for (let i = 0; i < this.roles.length; i++){
+              if(this.adminInfo.admin.id == this.$store.getters.user.admin.id && this.$store.getters.user.admin.is_super_admin && this.roles[i].is_system == 1 && this.roles[i].name == "子管理员"){
+                this.roles.splice(i,1)
+                i = i - 1;
+              }
+            }
+
+
           } else {
             this.$toast({
               message: response.data.msg
@@ -129,20 +270,34 @@
           }
         });
       },
+
       GetAdminUserInitData() {
         AdminInitData().then(response => {
           if (response.data.state === 1) {
             for (let i = 0; i < response.data.data.roles.length; i++) {
               if (!response.data.data.roles[i].is_super_admin) {
-                this.roles.push(response.data.data.roles[i])
+                if(this.$store.getters.user.admin.is_super_admin){
+                  this.roles.push(response.data.data.roles[i]);
+                }else{
+                  if(response.data.data.roles[i].is_system != 1 && response.data.data.roles[i].name != "子管理员"){
+                    this.roles.push(response.data.data.roles[i]);
+                  }
+
+                }
               }
             }
+
+            this.GetAdminUserInfo(this.$route.query.id)
+
+
+
           } else {
             this.$toast({
               message: response.data.msg
             });
           }
         });
+
       },
       onClick(id) {
         if (id == 2) {
@@ -165,8 +320,7 @@
       }
     }, created() {
       this.GetAdminUserInitData()
-      var id = this.$route.query.id
-      this.GetAdminUserInfo(id)
+
       setRem()
 
     }

src/pages/console/managementConsole/staff_role/employeeList/index.vue

@@ -16,7 +16,7 @@
         @change="onChange"
       >
         <div class="checkOne" v-for="(item, index) in admin_user" :key="index">
-          <van-checkbox :name="item.id"></van-checkbox>
+          <van-checkbox :name="item.id" @change="onChange"></van-checkbox>
           <div class="checkUserBox">
             <img v-if="item.avatar.length > 0" :src="item.avatar" alt="" />
             <img
@@ -45,6 +45,13 @@ export default {
   },
   methods: {
     save() {
+      if(this.result.length == 0){
+        this.$toast({
+          message: "至少选择一个用户"
+        });
+        return
+      }
+
       let params = {
         id: this.$route.query.id,
         ids: this.result.join(",")
@@ -68,16 +75,19 @@ export default {
             if (this.admin_user[i].role_ids.length > 0) {
               let isExist = -1;
               let ids = this.admin_user[i].role_ids.split(",");
-              console.log(ids);
               isExist = ids.indexOf(this.$route.query.id.toString());
-              console.log(isExist);
-
               if (isExist >= 0) {
                 this.admin_user.splice(i, 1);
                 i = i - 1;
               }
             }
           }
+          for (let i = 0; i < this.admin_user.length; i++) {
+              if(this.admin_user[i].user_id == this.$store.getters.user.org.creator){
+                this.admin_user.splice(i, 1);
+                i = i - 1;
+              }
+          }
         } else {
           this.$toast({
             message: response.data.msg
@@ -89,7 +99,7 @@ export default {
     checkAll() {
       if (this.allChecked == false) {
         for (let i = 0; i < this.admin_user.length; i++) {
-          this.result.push(this.admin_user[i].user_id);
+          this.result.push(this.admin_user[i].id);
         }
         this.allChecked = true;
       } else {
@@ -97,12 +107,10 @@ export default {
       }
     },
     onChange() {
-      if (this.result.length == this.list.length) {
+      if (this.result.length == this.admin_user.length) {
         this.allChecked = true;
-        this.$refs.checkboxes.toggle();
       } else {
         this.allChecked = false;
-        this.$refs.checkboxes.toggle();
       }
     }
   },

src/pages/console/managementConsole/staff_role/newAddRole/index.vue

@@ -8,6 +8,7 @@
       <van-field
         v-model="name"
         required
+        maxlength="30"
         label="角色名称"
         placeholder="请填写角色名称"
       />

src/pages/console/managementConsole/staff_role/newAddStaff/index.vue

@@ -21,6 +21,23 @@
         placeholder="请输入手机号"
         clearable
       />
+      <van-cell class="newCell">
+        <!-- 使用 title 插槽来自定义标题 -->
+        <template slot="title">
+          <span class="custom-title" style="width:90px">职称</span>
+          <div style="display:flex;">
+            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show1 = true">
+              <span>{{type_name}}</span>
+              <van-icon name="arrow-down"/>
+            </div>
+            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show2 = true">
+              <span>{{titles_name}}</span>
+              <van-icon name="arrow-down"/>
+            </div>
+          </div>
+        </template>
+      </van-cell>
+
     </div>
     <div class="editStaffTip">选填</div>
     <div class="staffBox">
@@ -30,6 +47,13 @@
       <van-icon class="addIcon" name="add" />
       <p>保存并继续新增员工</p>
     </div>
+    <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
+      <van-picker show-toolbar :columns="user_type_name" @cancel="onCancel" @confirm="onUserTypeConfirm"/>
+    </van-popup>
+    <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
+      <van-picker show-toolbar :columns="user_titles_name" @cancel="onCancel" @confirm="onUserTitleConfirm"/>
+    </van-popup>
+
   </div>
 </template>
 
@@ -46,10 +70,89 @@ export default {
       role_ids: [],
       title: "",
       value1: "",
-      roles: []
+      roles: [],
+      show1: false,
+      show2: false,
+      type_name:"",
+      titles_name:"",
+      user_type:2,
+      user_title:1,
+
+      user_types: [
+        {index: 2, name: '医生'},
+        {index: 3, name: '护士'}
+      ],
+      user_titles: [
+        {index: 1, name: '医士'},
+        {index: 2, name: '医师'},
+        {index: 3, name: '住院医师'},
+        {index: 4, name: '主治医师'},
+        {index: 5, name: '副主任医师'},
+        {index: 6, name: '主任医师'},
+        {index: 7, name: '护士'},
+        {index: 8, name: '护师'},
+        {index: 9, name: '主管护师'},
+        {index: 10, name: '副主任护师'},
+        {index: 11, name: '主任护师'},
+        {index: 12, name: '运营专员'},
+        {index: 13, name: '运营主管'}
+      ],
+
+      user_type_name: [
+        '医生',
+        '护士'
+      ],
+
+      user_titles_name: [
+        '医士',
+        '医师',
+        '住院医师',
+        '主治医师',
+        '副主任医师',
+        '主任医师',
+        '护士',
+        '护师',
+        '主管护师',
+        '副主任护师',
+        '主任护师',
+        '运营专员',
+        '运营主管'
+      ],
+
     };
   },
   methods: {
+    onUserTypeConfirm(value, index){
+      this.show1 = false
+      for (let i = 0; i < this.user_types.length; i++){
+        if (this.user_types[i].name == value){
+          this.user_type = this.user_types[i].index
+          this.type_name= this.user_types[i].name
+
+        }
+
+      }
+
+    },
+    onUserTitleConfirm(value, index){
+      this.show2 = false
+
+      for (let i = 0; i < this.user_titles.length; i++){
+        if (this.user_titles[i].name == value){
+          this.user_title = this.user_titles[i].index
+          this.titles_name= this.user_titles[i].name
+
+        }
+      }
+
+
+    },
+    onCancel() {
+      this.show1 = false
+      this.show2 = false
+
+
+    },
     GetAdminUserInitData() {
       AdminInitData().then(response => {
         if (response.data.state === 1) {
@@ -89,7 +192,9 @@ export default {
         name: this.name,
         mobile: this.tel,
         role_ids: this.role_ids.join(","),
-        title: this.title
+        title: this.title,
+        user_type: this.user_type,
+        user_title: this.user_title
       };
       CreateAdminUser(params).then(response => {
         if (response.data.state === 1) {
@@ -112,6 +217,8 @@ export default {
   },
   created() {
     this.GetAdminUserInitData();
+    this.titles_name = this.user_titles_name[0]
+    this.type_name = this.user_type_name[0]
     this.role_ids.push(this.$route.query.id);
     setRem();
   }

src/pages/console/managementConsole/staff_role/privilegeManagement/index.vue

@@ -52,7 +52,7 @@
 
 <script>
   // import "../libs/rem.js";
-  import {AdminInitData} from "@/api/admin_user";
+  import {GetAllRole} from "@/api/admin_user";
   import {setRem} from "@/libs/functionRem";
 
   export default {
@@ -63,7 +63,7 @@
     },
     methods: {
       GetInitRoles() {
-        AdminInitData().then(response => {
+        GetAllRole().then(response => {
           if (response.data.state === 1) {
             console.log(response.data.data.roles.length)
             for (let i = 0; i < response.data.data.roles.length; i++) {

src/pages/console/managementConsole/staff_role/staffManagement/index.vue

@@ -83,15 +83,55 @@ export default {
         if (response.data.state === 1) {
           for(let i = 0; i < response.data.data.admins.length; i++){
             if(response.data.data.admins[i].status == 1){
-              this.admin_user.push(response.data.data.admins[i])
+              if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员，不展示管理员信息
+                  if(response.data.data.admins[i].user_id != response.data.data.org_creator){
+                    this.admin_user.push(response.data.data.admins[i])
+                  }
+              }else{
+                this.admin_user.push(response.data.data.admins[i])
+
+              }
             }else{
-              this.del_admin_user.push(response.data.data.admins[i])
+              if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员，不展示管理员信息
+                if(response.data.data.admins[i].user_id != response.data.data.org_creator){
+                  // this.admin_user.push(response.data.data.admins[i])
+                  this.del_admin_user.push(response.data.data.admins[i])
+
+                }
+              }else{
+                // this.admin_user.push(response.data.data.admins[i])
+                this.del_admin_user.push(response.data.data.admins[i])
+
+
+              }
+
+
+            }
+          }
+
+
+          for(let i = 0; i < this.admin_user.length; i++) {
+            if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员，不展示管理员和其他子管理信息
+              if(this.admin_user[i].is_sub_admin && this.admin_user[i].user_id != this.$store.getters.user.admin.id){
+                this.admin_user.splice(i,1)
+                i = i - 1;
+              }
+            }
+          }
+
+
+          for(let i = 0; i < this.del_admin_user.length; i++) {
+            if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员，不展示管理员和其他子管理信息
+              if(this.del_admin_user[i].is_sub_admin && this.del_admin_user[i].user_id != this.$store.getters.user.admin.id){
+                this.del_admin_user.splice(i,1)
+                i = i - 1;
+              }
             }
           }
 
 
 
-        } else {
+          } else {
           this.$toast({
             message: response.data.msg
           });

src/pages/console/managementConsole/staff_role/userManage/index.vue

@@ -12,6 +12,8 @@
         v-for="(item, index) in admin_user"
         :key="index"
         v-if="admin_user.length > 0"
+        @click="goEditStaff(item.user_id,item.is_sub_admin)"
+
       >
         <img v-if="item.avatar.length > 0" :src="item.avatar" alt />
         <img
@@ -19,10 +21,10 @@
           src="../../../../../assets/images/default_avatar.jpg"
           alt
         />
-        <p>
+        <p >
           <span>{{ item.user_name }}</span>
           <i
-            @click="goEditStaff(item.user_id)"
+            v-if="!item.is_sub_admin && org_creator != item.user_id"
             class="iconfont icon-bianji bianji"
           ></i>
         </p>
@@ -39,7 +41,8 @@ export default {
   data() {
     return {
       active: 0,
-      admin_user: []
+      admin_user: [],
+      org_creator:0,
     };
   },
   methods: {
@@ -65,8 +68,10 @@ export default {
         }
       });
     },
-    goEditStaff: function(id) {
-      this.$router.push({ path: "/staff/editstaff?id=" + id });
+    goEditStaff: function(id,is_sub_admin) {
+      if (!is_sub_admin && org_creator != id){
+        this.$router.push({ path: "/staff/editstaff?id=" + id });
+      }
     },
     goAddStaff: function() {
       this.$router.push({ path: "/staff/addstaff" });
@@ -75,6 +80,8 @@ export default {
   created() {
     setRem();
     //获取没被禁用的用户
+    this.org_creator  = this.$store.getters.user.org.creator
+    console.log(this.org_creator)
     this.GetAllStaff();
   }
 };

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -30,17 +30,17 @@
          finished-text="没有更多了"
          >
 
-          <div class="adviceOne" v-for="(item,index) in this.doctorAdvice" :key="index">
+          <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="newShow = true" />
+              <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 class="statOrder"  v-if="it.advice_type == 1 && it.parent_id == 0" >
+         <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>
-                <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,134 +94,12 @@
                 </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 +223,8 @@ export default {
       index: 0,
       staff: 0,
       childId: 0,
-      state: 0
+      state: 0,
+      list: []
     };
   },
   methods: {
@@ -353,7 +232,7 @@ export default {
       this.typeShow = false;
     },
     onConfirm(value) {
-      this.page = 1;
+      this.form.page = 1;
       this.type = value;
       this.typeShow = false;
       this.doctorAdvice = [];
@@ -365,9 +244,10 @@ export default {
         this.form.limit,
         this.form.page
       );
+      this.onLoad();
     },
     getstartTime(value) {
-      this.page = 1;
+      this.form.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -389,9 +269,10 @@ export default {
         this.form.page
       );
       this.startShow = false;
+      this.onLoad();
     },
     getstartTime2(value) {
-      this.page = 1;
+      this.form.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -414,8 +295,8 @@ export default {
         this.form.page
       );
       this.endShow = false;
+      this.onLoad();
     },
-    changeData(val) {},
     getDoctorAdvices(patientid) {
       if (this.type === "全部") {
         this.form.type = 0;
@@ -438,20 +319,25 @@ export default {
           var advice = response.data.data.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]);
               }
             }
@@ -463,14 +349,11 @@ export default {
             }
           }
           this.childList = objarr;
-          console.log("list", list);
           let arr = this.doctorAdvice;
           arr.push(...list.reverse());
+          console.log("arr", arr);
           this.doctorAdvice = arr;
-          console.log("listtwo", this.doctorAdvice);
-          var total = response.data.data.total;
-          this.total = total;
-          console.log("total", total);
+
           this.loading = false;
         }
       });
@@ -515,8 +398,9 @@ export default {
           this.loading = false;
           this.finished = true;
         }
-      }, 1000);
+      }, 5000);
     },
+
     toDoctorAdviceDetail(id) {
       var patientid = this.$route.query.patientid;
       this.$router.push(

src/pages/homeIndex/index.vue

@@ -42,15 +42,7 @@
         </van-swipe-item>
       </van-swipe>
     </div>
-    <van-overlay :show="show" @click="show = false">
-      <div class="arrowBox">
-        <img src="../../assets/images/toparrow.png" alt />
-      </div>
-      <div class="signBox">
-        <p>请点击右上角“+”图标</p>
-        <p style="color:#1989fa">创建自己的医院/组织/团队</p>
-      </div>
-    </van-overlay>
+    <van-overlay :show="show" @click="show = false" />
     <!--<div class="noticeBox">-->
     <!--<i class="iconfont icon-public-notice notice"></i>-->
     <!--<div class="noticeNews">-->
@@ -73,8 +65,10 @@
     <div
       class="management"
       v-if="
-        this.$store.getters.user.admin.id ==
-          this.$store.getters.user.org.creator && this.isCreateOrg
+        (this.$store.getters.user.admin.id ==
+          this.$store.getters.user.org.creator &&
+          this.isCreateOrg) ||
+          this.isSubSuperAdmin
       "
     >
       <div class="managementTitle">
@@ -83,7 +77,8 @@
           <span>（仅管理员可见）</span>
         </div>
         <div class="setting" @click="toConsole()">
-          <van-icon name="setting-o" />管理
+          <van-icon name="setting-o" />
+          管理
         </div>
       </div>
       <div class="managementBox">
@@ -105,23 +100,22 @@
     <div class="management" v-if="!this.isCreateOrg">
       <div class="managementTitle">
         <div class="managementName">
-          管理控制台
-          <span>（仅管理员可见）</span>
+          管理控制台<span>（仅管理员可见）</span>
         </div>
         <div class="setting"><van-icon name="setting-o" />管理</div>
       </div>
       <div class="managementBox">
         <div class="managementOne" @click="toStaffManage()">
-          <img src="../../assets/images/M1.png" alt />员工管理
+          <img src="../../assets/images/M1.png" alt="" />员工管理
         </div>
         <div class="managementOne" @click="toRoleManage()">
-          <img src="../../assets/images/M2.png" alt />权限管理
+          <img src="../../assets/images/M2.png" alt="" />权限管理
         </div>
         <div class="managementOne" @click="toConfigCenter()">
-          <img src="../../assets/images/M3.png" alt />配置中心
+          <img src="../../assets/images/M3.png" alt="" />配置中心
         </div>
         <div class="managementOne" @click="toOrgSetting()">
-          <img src="../../assets/images/M4.png" alt />机构设置
+          <img src="../../assets/images/M4.png" alt="" />机构设置
         </div>
       </div>
     </div>
@@ -140,8 +134,7 @@
           "
           @click="jumpApp(item)"
         >
-          <img :src="item.url" alt />
-          {{ item.name }}
+          <img :src="item.url" alt />{{ item.name }}
         </div>
       </div>
     </div>
@@ -202,7 +195,7 @@ export default {
     },
     toOrgSetting() {
       if (this.isCreateOrg) {
-        this.$router.push("/editorg");
+        this.$router.push("/editorg?id=" + this.value1);
       } else {
         this.$toast({
           message: "你尚未创建机构，请先创建机构"
@@ -236,23 +229,30 @@ export default {
           this.$store.dispatch("SetConfigList", config_list);
           this.GetHomeData();
           Toast.success("切换机构成功");
+          // this.$toast({
+          //   message: "切换机构成功"
+          // });
         } else {
-          Toast.fail(response.data.msg);
+          Toast(response.data.msg);
         }
       });
     },
     jump(url) {
-      window.location.href = url;
+      if (url.length != 0) {
+        window.location.href = url;
+      }
     },
     jumpApp(app) {
       if (!this.isCreateOrg) {
-        Toast.fail("你尚未创建机构,无法使用该功能");
+        Toast("你尚未创建机构，请先创建机构");
         return;
       }
       if (app.open_status == 0) {
-        Toast.success("敬请期待");
+        Toast("敬请期待");
+
         return;
       }
+      console.log(app.name);
       switch (app.app_type) {
         case 6:
           this.toPatients();
@@ -262,6 +262,7 @@ export default {
           break;
         case 8:
           this.$router.push({ path: "/shop" });
+
           break;
         case 9:
           break;
@@ -284,12 +285,18 @@ export default {
       this.$router.push({ path: "/patients" });
     },
     toSearch() {
+      if (!this.isCreateOrg) {
+        Toast("你尚未创建机构，请先创建机构");
+        return;
+      }
       this.$router.push({ path: "/search" });
     },
     GetHomeData() {
       GetHomeData().then(response => {
         if (response.data.state === 1) {
           this.isCreateOrg = response.data.data.isCreateOrg;
+          this.isSubSuperAdmin = response.data.data.isSubSuperAdmin;
+
           if (this.isCreateOrg) {
             this.orgs = response.data.data.orgs;
             this.apps = response.data.data.apps;
@@ -303,9 +310,11 @@ export default {
               this.org_arr.push(obj);
             }
             this.value1 = this.$store.getters.user.org.id;
+            this.show = false;
           } else {
             this.apps = response.data.data.apps;
             this.banners = response.data.data.banners;
+            this.show = true;
           }
         } else {
           this.$toast({
@@ -481,25 +490,6 @@ export default {
     top: 3.125rem;
     z-index: 9;
   }
-  .arrowBox {
-    text-align: right;
-    img {
-      width: 2.5rem;
-      margin-right: 1.625rem;
-    }
-  }
-  .signBox {
-    width: 18.75rem;
-    height: 5.625rem;
-    margin: 0 auto;
-    background: #fff;
-    border-radius: 0.25rem;
-    text-align: center;
-    padding-top: 1.25rem;
-    p {
-      line-height: 1.5rem;
-    }
-  }
 }
 </style>
 <style lang="scss"></style>

src/pages/my/index.vue

@@ -13,22 +13,20 @@
       <div class="userMain" @click="toMyIndex">
         <div class="userBox">
           <div class="userTxt">
-            <span v-if="roleInfo.user_name != ''">
-              <p class="userName">{{ roleInfo.user_name }}</p>
-            </span>
-            <span v-if="roleInfo.user_name == ''">
-              <p class="userName">{{ userName.name }}</p>
-            </span>
+            <span v-if="roleInfo.user_name != ''"
+              ><p class="userName">{{ roleInfo.user_name }}</p></span
+            >
+            <span v-if="roleInfo.user_name == ''"
+              ><p class="userName">{{ userName.name }}</p></span
+            >
             <p class="signature">{{ roleInfo.message }}</p>
           </div>
           <van-icon name="arrow" />
         </div>
       </div>
-      <router-link to="/invite">
-        <div class="invitebox">
-          <img src="../../assets/images/invite.png" alt />
-        </div>
-      </router-link>
+      <div class="invitebox">
+        <img src="../../assets/images/invite.png" alt />
+      </div>
 
       <div class="myInfo" @click="toMyInfo">
         <div class="myInfoLeft">
@@ -62,17 +60,25 @@
         :key="index"
       >
         <div class="myInfoLeft">
-          <span v-if="item.org_logo == ''">
-            <img src="../../assets/images/m01.png" alt />
-          </span>
-          <span v-if="item.org_logo !== ''">
-            <img :src="item.org_logo" />
-          </span>
+          <span v-if="item.org_logo == ''"
+            ><img src="../../assets/images/m01.png" alt
+          /></span>
+          <span v-if="item.org_logo !== ''"><img :src="item.org_logo"/></span>
           <p>{{ item.org_name }}</p>
         </div>
-        <div class="myInfoRight" v-if="item.is_super_admin == 1">
-          <div class="myInfoRightBtn" @click="toEditOrg()">管理</div>
-          <van-icon class="arrow" name="arrow" @click="toManage" />
+        <div class="myInfoRight">
+          <div
+            v-if="item.creator == $store.getters.user.org.creator"
+            class="myInfoRightBtn"
+            @click="toEditOrg(item.id)"
+          >
+            管理
+          </div>
+          <van-icon
+            class="arrow"
+            name="arrow"
+            @click="toManage(item.creator, item.id)"
+          />
         </div>
       </div>
     </div>
@@ -144,6 +150,7 @@ import {
   getMyInforName
 } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
+import { GetHomeData } from "@/api/home";
 export default {
   data() {
     return {
@@ -151,15 +158,16 @@ export default {
       admin_user_id: 0,
       adminid: 0,
       organaziton: [],
-      userName: {}
+      userName: {},
+      creator: 0
     };
   },
   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;
@@ -168,22 +176,32 @@ export default {
         }
       });
     },
+    GetHomeData() {
+      GetHomeData().then(response => {
+        if (response.data.state === 1) {
+          var orgs = response.data.data.orgs;
+          // console.log("orgs", orgs);
+          this.organaziton = orgs;
+        }
+      });
+    },
     getMyInformation(id) {
       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;
         }
       });
     },
+
     getMyOrganazition(id) {
       getMyOrganazition(id).then(response => {
         if (response.data.state === 1) {
           var organaziton = response.data.data.organaziton;
-          this.organaziton = organaziton;
+          // this.organaziton = organaziton;
         }
       });
     },
@@ -206,11 +224,11 @@ export default {
     toMyInfo() {
       this.$router.push("/myInfo?id=" + this.admin_user_id);
     },
-    toManage() {
-      this.$router.push("/organizationinfo?id=" + this.adminid);
+    toManage(id, orgid) {
+      this.$router.push("/organizationinfo?id=" + id + "&orgid=" + orgid);
     },
-    toEditOrg() {
-      this.$router.push("/newMy");
+    toEditOrg(id) {
+      this.$router.push("/editorg?id=" + id);
     },
     toMyIndex() {
       this.$router.push("/myInfo?id=" + this.admin_user_id);
@@ -221,6 +239,8 @@ export default {
     this.getMyInformation(adminid);
     this.getMyOrganazition(adminid);
     this.getMyInforName(adminid);
+    this.GetHomeData();
+    this.creator = this.$store.getters.user.org.creator;
   }
 };
 </script>

src/pages/my/modifyPassword.vue

@@ -15,6 +15,7 @@
               v-model="forgetForm.phone"
               v-on:input="watchNum"
               maxlength="11"
+              readonly
               @input="change(forgetForm.phone)"
             ></el-input>
           </div>

src/pages/my/organizationInfo.vue

@@ -7,7 +7,8 @@
     <div class="organizeBox">
       <div class="organizeBoxOne">
         <div class="organizeBoxOneLeft">
-          <img src="../../assets/images/m01.png" alt />
+          <span v-if="org_logo==''"><img src="../../assets/images/m01.png" alt /></span>
+          <span v-if="org_logo!=''"><img :src="org_logo" alt /></span>
           <p>{{ org_short_name }}</p>
         </div>
         <van-icon class="arrow" name="arrow" />
@@ -27,13 +28,13 @@
       </div>
       <div class="organizeBoxTwo">
         <div>角色</div>
-        <div class="rolebox">
+        <div class="rolebox" v-if="role_name !=''">
           <div class="roleboxBtn">{{ role_name }}</div>
         </div>
       </div>
       <div class="organizeBoxTwo">
         <div>职位</div>
-        <div class="organizeBoxTwoTxt">{{ positionName }}</div>
+        <div class="organizeBoxTwoTxt" v-if="positionName!=''">{{ positionName }}</div>
       </div>
     </div>
   </div>
@@ -51,16 +52,19 @@ export default {
       org_short_name: "",
       telephone: "",
       role_name: "",
-      positionName: ""
+      positionName: "",
+      org_logo: ""
     };
   },
   methods: {
-    getOrgName() {
-      getOrgName().then(response => {
+    getOrgName(id) {
+      getOrgName(id).then(response => {
         if (response.data.state === 1) {
           var name = response.data.data.name;
+          this.org_short_name = name.org_name;
+          this.org_logo = name.org_logo;
           this.telephone = name.telephone;
-          // console.log("name", name);
+          console.log("name", name);
         }
       });
     },
@@ -124,10 +128,11 @@ export default {
   },
   created() {
     this.user_name = this.$store.getters.user.user.user_name;
-    this.org_short_name = this.$store.getters.user.org.org_short_name;
+    // this.org_short_name = this.$store.getters.user.org.org_short_name;
     var id = this.$route.query.id;
     console.log("id", id);
-    this.getOrgName();
+    var orgid = this.$route.query.orgid;
+    this.getOrgName(orgid);
     this.getRoleName(id);
     this.getAllOrganization(id);
   }

src/pages/patientCenter/editOrg/index.vue

@@ -3,16 +3,21 @@
     <div class="createOrganizationTitle">
       <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">创建医院/组织/团队</span>
+       <div style="margin-left:40px">
+        <span @click="spread" id="copy">修改</span>
+      </div>
     </div>
     <div class="tips">填写真实信息，获取更精准服务</div>
     <div class="infoBox">
       <div class="infoOne">
         <p class="infoTitle">机构名称</p>
-        <van-field v-model="orgForm.org_name" placeholder="请填写机构名称"/>
+        <van-field v-model="orgForm.org_name" placeholder="请填写机构名称" :readonly="readonly"/>
       </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"
@@ -21,12 +26,15 @@
             @confirm="chooseCityTwo"
             :columns-num="2"
             @change="onChangeTwo"
+           :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"
@@ -34,23 +42,23 @@
             @cancel="show2=false"
             @confirm="chooseCity"
             @change="onChange"
+            :readonly="readonly"
           />
         </van-popup>
       </div>
       <div class="infoOne">
         <p class="infoTitle">详细地址</p>
-        <van-field v-model="orgForm.address" placeholder="请填写"/>
+        <van-field v-model="orgForm.address" placeholder="请填写" :readonly="readonly"/>
       </div>
       <div class="infoOne">
         <p class="infoTitle">联系人</p>
-        <van-field v-model="orgForm.contact_name" placeholder="请填写"/>
+        <van-field v-model="orgForm.contact_name" placeholder="请填写" :readonly="readonly"/>
       </div>
       <div class="infoOne">
         <p class="infoTitle">联系电话</p>
-        <van-field v-model="orgForm.telephone" placeholder="请填写"/>
+        <van-field v-model="orgForm.telephone" placeholder="请填写" :readonly="readonly"/>
       </div>
     </div>
-    <div class="create" @click="updateOrg()">保存</div>
     <div class="problem">
       遇到问题？点击
       <span @click="contact = true">联系客服</span>
@@ -86,6 +94,7 @@ export default {
   components: {},
   data() {
     return {
+      readonly: true,
       org_area: "",
       type_name: "",
       contact: false,
@@ -4201,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 => {
@@ -4258,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;
@@ -4291,11 +4309,11 @@ export default {
     callPhone() {
       window.location.href = "tel://075586526342";
     },
-    getOrgInformation() {
-      getOrgInformation().then(response => {
+    getOrgInformation(id) {
+      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;
@@ -4314,6 +4332,7 @@ export default {
         }
       });
     },
+
     updateOrg() {
       if (this.orgForm.org_name.trim().length <= 0) {
         Toast("机构名字不能为空");
@@ -4349,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);
@@ -4366,7 +4385,8 @@ export default {
     }
   },
   created() {
-    this.getOrgInformation();
+    var id = this.$route.query.id;
+    this.getOrgInformation(id);
     this.getAllOrgType();
   }
 };

src/pages/patients/editPatient.vue

@@ -4,7 +4,7 @@
       <div class="addPatientsTitle">
         <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
         <span class="titleName">编辑患者</span>
-        <div @click="updatedPatient"><p>保存</p></div>
+        <span @click="spread" id="copy">修改</span>
       </div>
     </van-sticky>
     <div class="basicTitle">基本信息</div>
@@ -13,6 +13,7 @@
         v-model="patientForm.name"
         required
         label="姓名"
+        :readonly="readonly"
         placeholder="请输入"
       />
       <van-field
@@ -21,8 +22,8 @@
         right-icon="arrow"
         placeholder="请选择"
         required
-        readonly
-        @click="show = true"
+        :readonly="readonly"
+        @click="clickSex"
       />
       <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
         <van-picker :columns="columns" show-toolbar @change="onChange" />
@@ -33,12 +34,13 @@
         label="身份证号"
         @blur="checkIdCardNo"
         placeholder="请输入"
+        :readonly="readonly"
       />
       <van-field
         v-model="patientForm.birthday"
         required
         label="出生日期"
-        readonly
+        :readonly="readonly"
         placeholder="请输入"
       />
       <van-field
@@ -47,6 +49,7 @@
         required
         label="手机号"
         placeholder="请输入"
+        :readonly="readonly"
       />
       <van-cell>
         <!-- 使用 title 插槽来自定义标题 -->
@@ -77,6 +80,7 @@
           clearable
           required
           label="透析号"
+          :readonly="readonly"
         >
           <van-button
             slot="button"
@@ -91,9 +95,9 @@
           v-model="patientForm.patientsoure"
           right-icon="arrow"
           required
-          readonly
+          :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" />
@@ -103,9 +107,9 @@
           v-model="patientForm.lapseto"
           right-icon="arrow"
           required
-          readonly
+          :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" />
@@ -151,9 +155,9 @@
           label="首次透析日期"
           v-model="patientForm.fistDate"
           right-icon="arrow"
-          readonly
+          :readonly="readonly"
           placeholder="请选择"
-          @click="show2 = true"
+          @click="clickDate"
         />
         <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
           <van-datetime-picker
@@ -172,6 +176,7 @@
           label="诊断"
           type="textarea"
           maxlength="50"
+          :readonly="readonly"
           placeholder="请输入主要诊断信息"
         />
       </div>
@@ -183,6 +188,7 @@
           v-model="patientForm.requipmentId"
           label="设备ID"
           placeholder="请输入"
+          :readonly="readonly"
         />
 
         <van-cell>
@@ -227,9 +233,9 @@
           label="首次透析日期"
           v-model="patientForm.memberFistDate"
           right-icon="arrow"
-          readonly
+          :readonly="readonly"
           placeholder="请选择"
-          @click="show12 = true"
+          @click="clickDateTwo"
         />
         <van-popup
           v-model="show12"
@@ -249,9 +255,9 @@
           label="病种"
           v-model="patientForm.patient_type"
           right-icon="arrow"
-          readonly
+          :readonly="readonly"
           placeholder="请选择"
-          @click="show14 = true"
+          @click="clickPatientType"
         />
         <van-popup
           v-model="show14"
@@ -268,9 +274,9 @@
           label="治疗方式"
           v-model="patientForm.treatmentMethod"
           right-icon="arrow"
-          readonly
+          :readonly="readonly"
           placeholder="请选择"
-          @click="show13 = true"
+          @click="clickTreatMethod"
         />
         <van-popup
           v-model="show13"
@@ -403,7 +409,8 @@ export default {
       ],
       illnesslist: [],
       radio: "1",
-      showOne: false
+      showOne: false,
+      readonly: true
     };
   },
   methods: {
@@ -763,6 +770,72 @@ export default {
         "-" +
         birth.substr(6, 2);
     },
+    spread() {
+      var spancontent = document.getElementById("copy").innerHTML;
+      if (spancontent == "修改") {
+        this.readonly = false;
+        document.getElementById("copy").innerHTML = "保存";
+      }
+      if (spancontent == "保存") {
+        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("姓名不能为空");

src/permission.js

@@ -1,8 +1,8 @@
-import router from './router'
-import store from './store'
-import isLogin from '@/api/login'
+import router from "./router";
+import store from "./store";
+import  isLogin  from "@/api/login";
 
-const loginWhiteList = ['/', '/login', '/privacy', '/forgetPassword', '/userAgreement', '/nopassword', '/forget', '/register', '/setname', '/join', '/createorg'] // 登录验证白名单
+const loginWhiteList = ["/", "/login", "/privacy", "/forgetPassword", "/userAgreement","/nopassword","/forget","/register","/setname",'/join','/createorg']; // 登录验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释
@@ -10,13 +10,11 @@ router.beforeEach((to, from, next) => {
   //   return
   if (store.getters.user.admin == null) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
-      next()
+      next();
     } else {
-      next({
-        path: '/'
-      })
+      next({ path: "/" });
     }
   } else {
-    next()
+    next();
   }
-})
+});

src/router/index.js

@@ -287,7 +287,7 @@ export default new Router({
       name: "longdialysis",
       component: () => import("@/pages/allLongDialysis/index")
     },
-    //,
+    //, 
     {
       path: "/alldoctoradvice",
       name: "/alldoctoradvice",
@@ -305,6 +305,19 @@ export default new Router({
       name: "/addpartition",
       component: () => import("@/pages/configureCenter/newPartition")
     },
+    // 编辑分区
+    {
+      path: '/editpartition',
+      name: 'editpartition',
+      component: () => import('@/pages/configureCenter/editPartion')
+
+    },
+    // 编辑分组
+    {
+      path: '/editgroup',
+      name: 'editgroup',
+      component: () => import('@/pages/configureCenter/editGrouping')
+    },
     // 新增分组
     {
       path: "/addgroup",
@@ -317,6 +330,19 @@ export default new Router({
       name: "/addbed",
       component: () => import("@/pages/configureCenter/newBed")
     },
+    // 编辑床位号
+    {
+      path: '/editbed',
+      name: 'editbed',
+      component: () => import('@/pages/configureCenter/editBed')
+
+    },
+    {
+      path: '/allinspection',
+      name: '/allinspection',
+      component: () => import('@/pages/patientCenter/allCheck/index')
+
+    },
     // 我的页面管理
     {
       path: "/editorg",

src/utils/request.js

@@ -28,7 +28,12 @@ service.interceptors.response.use(
         Toast("登录超时");
         location.reload();
         return Promise.reject("error");
-      } else {
+      } else if (res.code == 20035){
+        Toast("你已经被管理员禁用,无法使用该系统");
+        location.reload();
+        return Promise.reject("error");
+
+      }else {
         return response;
       }
     } else {