更新

src/api/patient/patient.js

@@ -723,3 +723,40 @@ export function getBloodPatient(params) {
     params: params
   })
 }
+
+export function DeletePatient(id, params) {
+  return request({
+    url: '/m/api/patient/deletePatient?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}
+
+export function saveName(id, name) {
+  const params = {
+    id: id,
+    name: name
+  }
+  console.log('params', params)
+  return request({
+    url: '/m/api/patient/savename',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllOrganization(id, params) {
+  return request({
+    url: '/m/api/patient/getallorganization?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function getMyOrganazition(id, params) {
+  return request({
+    url: '/m/api/patient/getmyorganazition?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

src/pages/allCourseManagement/index.vue

@@ -2,7 +2,7 @@
   <div class="page_allCourse">
     <van-sticky>
       <div class="allCourseTitle">
-        <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
         <span class="titleName">{{ couseDetail.name }}的病程记录</span>
       </div>
     </van-sticky>

src/pages/allDoctorAdvice/index.vue

@@ -36,12 +36,12 @@
                    <van-icon
                   class="ellipsis"
                   name="ellipsis"
-                  @click="newShow = true"
+                  @click="toDelete(it.id,it.execution_state,i)"
                 />
                 </div>
                 <div v-for="(i, index) in childList" :key="index">
-                 <div style="display:flex;justify-content:space-between">
-                    <p v-if="i.parent_id == it.id">
+                 <div style="display:flex;justify-content:space-between" v-if="i.parent_id == it.id">
+                    <p>
                       ▲ {{ i.advice_name }} {{ i.advice_desc
                       }}{{ i.drug_spec_unit }} {{ i.prescribing_number
                       }}{{ i.prescribing_number_unit }} {{ i.single_dose
@@ -52,7 +52,7 @@
                        <van-icon
                         class="ellipsis"
                         name="ellipsis"
-                        @click="Delete(i.id,index)"
+                        @click="Delete(i.id,i.execution_state,index)"
                        />
                   </div>
                 </div>
@@ -158,7 +158,13 @@
 </template>
 <script>
 import { setRem, setHeight } from "@/libs/functionRem";
-import { GetDoctorAdviceDetail, getAllDoctor } from "@/api/patient/patient";
+import {
+  GetDoctorAdviceDetail,
+  getAllDoctor,
+  DeleteChild,
+  DeletePatient
+} from "@/api/patient/patient";
+import { Dialog } from "vant";
 import { uParseTime } from "@/utils/tools";
 export default {
   data() {
@@ -179,7 +185,8 @@ export default {
       newShowTwo: false,
       newShowThree: false,
       id: 0,
-      index: 0
+      index: 0,
+      state: 0
     };
   },
   methods: {
@@ -273,22 +280,81 @@ export default {
         }
       }
     },
-    Delete(id, index) {
+    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;
     },
-    onCancel() {},
-    onSelect() {},
+
+    onCancel() {
+      this.newShow = false;
+    },
+    onSelect(val) {
+      if (val.name === "删除") {
+        this.DeletePatient(this.id, this.state, this.index);
+      }
+    },
     onCancelOne() {
       this.newShowOne = false;
     },
-    onSelectOne() {},
+    onSelectOne(val) {
+      if (val.name === "删除") {
+        this.DeleteChild(this.id, this.index, this.state);
+      }
+    },
     onSelectTwo() {},
     onCancelTwo() {},
     onCancelThree() {},
-    onSelectThree() {}
+    onSelectThree() {},
+    DeletePatient(id, index, state) {
+      if (state == 1) {
+        this.$toast("医嘱已执行,无法删除");
+        return false;
+      }
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeletePatient(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+
+            this.doctorAdvicedetail.splice(index, 1);
+            this.newShow = false;
+          }
+        });
+      });
+    },
+    DeleteChild(id, index, state) {
+      if (state == 1) {
+        this.$toast("医嘱已执行,无法删除");
+        return false;
+      }
+      Dialog.confirm({
+        title: "删除提示!",
+        message: "确认删除该条信息吗?,删除后将无法恢复!"
+      }).then(() => {
+        DeleteChild(id).then(response => {
+          if (response.data.state === 1) {
+            var msg = response.data.data.msg;
+
+            this.childList.splice(index, 1);
+            this.newShowOne = false;
+          }
+        });
+      });
+    }
   },
   created() {
     this.active = parseInt(this.$route.query.active);

src/pages/configureCenter/components/Bed.vue

@@ -2,11 +2,12 @@
   <div class="Bed">
     <van-list
       v-model="loading"
+      @load="onLoad"
       :finished="finished"
       finished-text="没有更多了"
-      @load="onLoad"
+      :immediate-check='show'
     >
-      <div class="BedOne" v-for="(item,index) in this.Number" :key="index">
+      <div class="BedOne" v-for="(item,index) in BedNumber" :key="index">
         <div class="BedLeft">
           <p>床位号：{{item.number}}</p>
           <p>分区类型：{{getZone(item.zone_id)}}</p>
@@ -42,11 +43,12 @@ export default {
       loading: false,
       finished: false,
       newShow: false,
+      show: false,
       actions: [{ name: "删除" }],
       page: 1,
       limit: 10,
       total: 0,
-      Number: [],
+      BedNumber: [],
       Zone: [],
       Group: [],
       id: 0,
@@ -54,7 +56,6 @@ export default {
     };
   },
   methods: {
-    onLoad() {},
     onCancel() {},
     addBed() {
       this.$router.push("/addbed?active=" + this.active);
@@ -63,8 +64,12 @@ export default {
       GetAllNumber(this.page, this.limit).then(response => {
         if (response.data.state === 1) {
           var number = response.data.data.number;
-          this.Number = number;
+          console.log("number", number);
+          let arr = this.BedNumber;
+          arr.push(...number);
+          this.BedNumber = arr;
           var total = response.data.data.total;
+          console.log("total", total);
           this.total = total;
           var zone = response.data.data.zone;
           this.Zone = zone;
@@ -74,6 +79,17 @@ export default {
         }
       });
     },
+    onLoad() {
+      setTimeout(() => {
+        this.page++;
+        if (this.page <= Math.ceil(this.total / 10)) {
+          this.GetAllNumber(this.page, this.limit);
+        } else {
+          this.loading = false;
+          this.finished = true;
+        }
+      }, 1000);
+    },
     getZone(id) {
       for (let i = 0; i < this.Zone.length; i++) {
         if (id === this.Zone[i].id) {
@@ -88,17 +104,7 @@ export default {
         }
       }
     },
-    onLoad() {
-      setTimeout(() => {
-        this.page++;
-        if (this.page <= Math.ceil(this.total / 10)) {
-          this.GetAllNumber(this.page, this.limit);
-        } else {
-          this.loading = false;
-          this.finished = true;
-        }
-      }, 1000);
-    },
+
     Delete(id, index) {
       this.newShow = true;
       this.id = id;
@@ -137,6 +143,7 @@ export default {
 
 <style lang="scss" scoped>
 .Bed {
+  margin-bottom: 3.125rem;
   .BedOne {
     padding: 1.375rem 1.125rem 0 1.5rem;
     display: flex;

src/pages/configureCenter/components/Grouping.vue

@@ -10,7 +10,7 @@
         <div class="GroupingLeft">
           <p>分组名称：{{item.name}}</p>
         </div>
-        <van-icon class="ellipsis" name="ellipsis" @click="Delete(item.id,index)" />
+        <van-icon class="ellipsis" name="ellipsis" @click="Delete(item.id,item.number,index)" />
       </div>
     </van-list>
     <div class="add">
@@ -45,7 +45,9 @@ export default {
       limit: 10,
       group: [],
       id: 0,
-      index: 0
+      index: 0,
+      total: 0,
+      number: ""
     };
   },
   methods: {
@@ -57,10 +59,13 @@ export default {
       getAllGroup(this.page, this.limit).then(response => {
         if (response.data.state === 1) {
           var group = response.data.data.group;
-          this.group = group;
+          let arr = this.group;
+          arr.push(...group);
+          this.group = arr;
           console.log("group", group);
           var total = response.data.data.total;
           console.log("total", total);
+          this.total = total;
           this.loading = false;
         }
       });
@@ -79,17 +84,23 @@ export default {
     onCancel() {
       this.newShow = false;
     },
-    Delete(id, index) {
+    Delete(id, number, index) {
       this.newShow = true;
       this.id = id;
       this.index = index;
+      this.number = number;
     },
     OnSelect(val) {
       if (val.name === "删除") {
-        this.DeleteGroup(this.id, this.index);
+        this.DeleteGroup(this.id, this.number, this.index);
       }
     },
-    DeleteGroup(id, index) {
+    DeleteGroup(id, number, index) {
+      if (number !== "") {
+        this.$toast("该分组存在床位号，不能删除");
+        this.newShow = false;
+        return false;
+      }
       Dialog.confirm({
         title: "删除提示!",
         message: "确认删除该条信息吗?,删除后将无法恢复!"
@@ -113,6 +124,7 @@ export default {
 
 <style lang="scss" scoped>
 .Grouping {
+  margin-bottom: 3.125rem;
   .GroupingOne {
     padding: 1.375rem 1.125rem 1.125rem 1.5rem;
     display: flex;

src/pages/configureCenter/components/Partition.vue

@@ -14,7 +14,7 @@
         <van-icon
           class="ellipsis"
           name="ellipsis"
-          @click="Delete(item.id, index)"
+          @click="Delete(item.id,item.number,index)"
         />
       </div>
     </van-list>
@@ -51,7 +51,8 @@ export default {
       zone: [],
       total: 0,
       id: 0,
-      index: 0
+      index: 0,
+      number: 0
     };
   },
   methods: {
@@ -64,6 +65,7 @@ export default {
       GetAllZone(this.page, this.limit).then(response => {
         if (response.data.state === 1) {
           var zone = response.data.data.zone;
+          console.log("分区", zone);
           for (let i = 0; i < zone.length; i++) {
             if (zone[i].type === 1) {
               zone[i].type = "普通";
@@ -84,7 +86,9 @@ export default {
               zone[i].type = "梅毒";
             }
           }
-          this.zone = zone;
+          let arr = this.zone;
+          arr.push(...zone);
+          this.zone = arr;
           var total = response.data.data.total;
           this.total = total;
           this.loading = false;
@@ -107,15 +111,21 @@ export default {
     },
     onSelect(val) {
       if (val.name === "删除") {
-        this.DeleteZone(this.id, this.index);
+        this.DeleteZone(this.id, this.number, this.index);
       }
     },
-    Delete(id, index) {
+    Delete(id, number, index) {
       this.id = id;
       this.index = index;
+      this.number = number;
       this.newShow = true;
     },
-    DeleteZone(id, index) {
+    DeleteZone(id, number, index) {
+      if (number !== "") {
+        this.$toast("该分区存在床位号，不能删除");
+        this.newShow = false;
+        return false;
+      }
       Dialog.confirm({
         title: "删除提示!",
         message: "确认删除该条信息吗?,删除后将无法恢复!"
@@ -139,6 +149,7 @@ export default {
 
 <style lang="scss" scoped>
 .partition {
+  margin-bottom: 3.125rem;
   .partitionOne {
     padding: 1.375rem 1.125rem 0 1.5rem;
     display: flex;

src/pages/configureCenter/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="page_configureCenter">
     <div class="configureCenterTitle">
-      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">配置中心</span>
     </div>
     <div class="configureCenterMain">
-      <van-tabs v-model="active">
+      <van-tabs v-model="active" sticky>
         <van-tab title="分区">
           <partition :active="active"></partition>
         </van-tab>

src/pages/configureCenter/newPartition.vue

@@ -42,7 +42,7 @@ export default {
       columns: ["普通", "乙肝", "丙肝", "艾滋病", "肺结核", "梅毒"],
       form: {
         name: "",
-        zoneType: 0
+        zoneType: ""
       },
       type: "",
       active: 0

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -218,8 +218,7 @@
 import {
   getDoctorAdvices,
   getPatientDetail,
-  DeleteManagement,
-  DeleteChild
+  DeleteManagement
 } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 import { Dialog } from "vant";
@@ -355,6 +354,8 @@ export default {
       ).then(response => {
         if (response.data.state === 1) {
           var advice = response.data.data.advice;
+          var one = response.data.data.one;
+          console.log("one", one);
           // this.doctorAdvice = advice;
           let objarr = [];
           for (let i = 0; i < advice.length; i++) {
@@ -377,8 +378,8 @@ export default {
             dataInfo[groupno].child.push(item);
           });
           let list = Object.values(dataInfo); // list 转换成功的数据
+          console.log("list", list);
           let arr = [];
-
           list.map(item => {
             // console.log(item.child);
             let arr2 = [];

src/pages/doctorAdvice/index.vue

@@ -380,6 +380,7 @@ export default {
     getBloodDialysisPatientTwo() {
       getBloodDialysisPatientTwo(this.page, this.limit).then(response => {
         var patient = response.data.data.patient;
+        console.log("patient", patient);
         this.patient = patient;
         let cityNameList = [];
         for (let p in patient) {
@@ -562,9 +563,9 @@ export default {
     this.patient_id = patientid;
     this.getPatientDetail(patientid);
     var seacherActive = this.$route.query.seacherActive;
-    // console.log("seacherActive是", seacherActive);
+    console.log("seacherActive是", seacherActive);
 
-    if (seacherActive === 0) {
+    if (seacherActive == 0) {
       this.getBloodDialysisPatientTwo();
     }
     if (seacherActive == 1) {

src/pages/homeIndex/index.vue

@@ -45,7 +45,6 @@
     <!--</div>-->
     <div class="background1"></div>
 
-
     <div class="management" v-if="this.$store.getters.user.admin.id ==  this.$store.getters.user.org.creator&&this.isCreateOrg">
       <div class="managementTitle">
         <div class="managementName">
@@ -96,10 +95,6 @@
       </div>
     </div>
 
-
-
-
-
     <div class="application">
       <div class="applicationTitle">
         <div class="applicationName">应用工作台</div>
@@ -114,196 +109,178 @@
   </div>
 </template>
 <script>
-  // import "../libs/rem.js";
-  import { Toast } from "vant";
-
-  import {GetHomeData,ChangeOrg} from "@/api/home";
-  import "../../libs/rem.js";
-  import "../../styles/newStyle.scss";
-  import {setRem} from "@/libs/functionRem";
-
-  export default {
-    data() {
-      return {
-        value1: 0,
-        isCreateOrg: false,
-        org_arr: [],
-        banners: [],
-        apps: [],
-        option1: [
-          {text: "新款商品", value: 0},
-          {text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1},
-          {text: "活动商品", value: 2}
-        ]
-      };
+// import "../libs/rem.js";
+import { Toast } from "vant";
+
+import { GetHomeData, ChangeOrg } from "@/api/home";
+import "../../libs/rem.js";
+import "../../styles/newStyle.scss";
+import { setRem } from "@/libs/functionRem";
+
+export default {
+  data() {
+    return {
+      value1: 0,
+      isCreateOrg: false,
+      org_arr: [],
+      banners: [],
+      apps: [],
+      option1: [
+        { text: "新款商品", value: 0 },
+        { text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1 },
+        { text: "活动商品", value: 2 }
+      ]
+    };
+  },
+  methods: {
+    toStaffManage() {
+      if (this.isCreateOrg) {
+        this.$router.push({ path: "/manageconsole/staff" });
+      } else {
+        this.$toast({
+          message: "你尚未创建机构，请先创建机构"
+        });
+      }
     },
-    methods: {
-      toStaffManage(){
-        if(this.isCreateOrg){
-          this.$router.push({path: "/manageconsole/staff"});
-        }else{
-          this.$toast({
-            message: "你尚未创建机构，请先创建机构"
-          });
-        }
-
-      },toRoleManage(){
-        if(this.isCreateOrg){
-          this.$router.push({path: "/manageconsole/role"});
-        }else{
-          this.$toast({
-            message: "你尚未创建机构，请先创建机构"
-          });
-        }
-      },toConfigCenter(){
-        if(this.isCreateOrg){
-
-
-        }else{
-          this.$toast({
-            message: "你尚未创建机构，请先创建机构"
-          });
-        }
-
-      },toOrgSetting(){
-        if(this.isCreateOrg){
-
-
-        }else{
-          this.$toast({
-            message: "你尚未创建机构，请先创建机构"
-          });
-        }
-
-      },
-      changeOrg(value){
-        Toast.loading({forbidClick: true, duration: 0})
-        let params={
-          org_id : value
-
-        }
-        ChangeOrg(params).then(response => {
-          if (response.data.state === 1) {
-            //清除之前的数据
-
-
-            var user = response.data.data.user;
-            var admin = response.data.data.admin;
-            var org = response.data.data.org;
-            var subscibe = response.data.data.subscibe;
-            var config_list = response.data.data.config_list;
-            var template_info = response.data.data.template_info;
-            var filed_list = response.data.data.filed_list;
-            this.$store.dispatch("InitUserInfo", {
-              admin: admin,
-              user: user,
-              org: org,
-              subscibe: subscibe,
-              template_info: template_info,
-              filed_list: filed_list
-            });
-            this.$store.dispatch("SetConfigList", config_list);
-            this.GetHomeData()
-            Toast.success('切换机构成功')
-          } else {
-            Toast.fail(response.data.msg)
-          }
+    toRoleManage() {
+      if (this.isCreateOrg) {
+        this.$router.push({ path: "/manageconsole/role" });
+      } else {
+        this.$toast({
+          message: "你尚未创建机构，请先创建机构"
         });
-
-
-      },
-      jump(url){
-        window.location.href = url
-      },jumpApp(app){
-        if(!this.isCreateOrg){
-          Toast.fail('你尚未创建机构,无法使用该功能')
-          return
-        }
-        if(app.open_status == 0){
-          Toast.success('敬请期待')
-          return
-        }
-        switch (app.app_type) {
-          case 6:
-            this.toPatients()
-            break
-          case 7:
-            this.$router.push({ path: "/main" });
-            break
-          case 8:
-
-            break
-          case 9:
-
-            break
-          case 10:
-
-            break
-          case 11:
-
-            break
-          case 12:
-
-            break
-          case 13:
-
-            break
-          case 14:
-
-            break
+      }
+    },
+    toConfigCenter() {
+      if (this.isCreateOrg) {
+        this.$router.push("/configurecenter");
+      } else {
+        this.$toast({
+          message: "你尚未创建机构，请先创建机构"
+        });
+      }
+    },
+    toOrgSetting() {
+      if (this.isCreateOrg) {
+      } else {
+        this.$toast({
+          message: "你尚未创建机构，请先创建机构"
+        });
+      }
+    },
+    changeOrg(value) {
+      Toast.loading({ forbidClick: true, duration: 0 });
+      let params = {
+        org_id: value
+      };
+      ChangeOrg(params).then(response => {
+        if (response.data.state === 1) {
+          // 清除之前的数据
+
+          var user = response.data.data.user;
+          var admin = response.data.data.admin;
+          var org = response.data.data.org;
+          var subscibe = response.data.data.subscibe;
+          var config_list = response.data.data.config_list;
+          var template_info = response.data.data.template_info;
+          var filed_list = response.data.data.filed_list;
+          this.$store.dispatch("InitUserInfo", {
+            admin: admin,
+            user: user,
+            org: org,
+            subscibe: subscibe,
+            template_info: template_info,
+            filed_list: filed_list
+          });
+          this.$store.dispatch("SetConfigList", config_list);
+          this.GetHomeData();
+          Toast.success("切换机构成功");
+        } else {
+          Toast.fail(response.data.msg);
         }
-
-
-
-
-      },toCreateOrg(){
-        this.$router.push({path: "/perfectOrg"});
-
-      },
-      toPatients() {
-        this.$router.push({path: "/patients"});
-      },
-      toSearch() {
-        this.$router.push({path: "/search"});
-      }, GetHomeData() {
-        GetHomeData().then(response => {
-          if (response.data.state === 1) {
-            this.isCreateOrg = response.data.data.isCreateOrg
-            if(this.isCreateOrg){
-              this.orgs = response.data.data.orgs
-              this.apps = response.data.data.apps
-              this.banners = response.data.data.banners
-              this.org_arr = []
-              for (let i = 0; i < this.orgs.length; i++){
-                let obj= {
-                  text: this.orgs[i].org_name,
-                  value: this.orgs[i].id
-
-                }
-                this.org_arr.push(obj)
-              }
-              this.value1 = this.$store.getters.user.org.id
-            }else{
-              this.apps = response.data.data.apps
-              this.banners = response.data.data.banners
+      });
+    },
+    jump(url) {
+      window.location.href = url;
+    },
+    jumpApp(app) {
+      if (!this.isCreateOrg) {
+        Toast.fail("你尚未创建机构,无法使用该功能");
+        return;
+      }
+      if (app.open_status == 0) {
+        Toast.success("敬请期待");
+        return;
+      }
+      switch (app.app_type) {
+        case 6:
+          this.toPatients();
+          break;
+        case 7:
+          this.$router.push({ path: "/main" });
+          break;
+        case 8:
+          break;
+        case 9:
+          break;
+        case 10:
+          break;
+        case 11:
+          break;
+        case 12:
+          break;
+        case 13:
+          break;
+        case 14:
+          break;
+      }
+    },
+    toCreateOrg() {
+      this.$router.push({ path: "/perfectOrg" });
+    },
+    toPatients() {
+      this.$router.push({ path: "/patients" });
+    },
+    toSearch() {
+      this.$router.push({ path: "/search" });
+    },
+    GetHomeData() {
+      GetHomeData().then(response => {
+        if (response.data.state === 1) {
+          this.isCreateOrg = response.data.data.isCreateOrg;
+          if (this.isCreateOrg) {
+            this.orgs = response.data.data.orgs;
+            this.apps = response.data.data.apps;
+            this.banners = response.data.data.banners;
+            this.org_arr = [];
+            for (let i = 0; i < this.orgs.length; i++) {
+              let obj = {
+                text: this.orgs[i].org_name,
+                value: this.orgs[i].id
+              };
+              this.org_arr.push(obj);
             }
+            this.value1 = this.$store.getters.user.org.id;
           } else {
-            this.$toast({
-              message: response.data.msg
-            });
+            this.apps = response.data.data.apps;
+            this.banners = response.data.data.banners;
           }
-        });
-
-      },toConsole(){
-        this.$router.push({path: "/manageconsole"});
-
-      },
+        } else {
+          this.$toast({
+            message: response.data.msg
+          });
+        }
+      });
     },
-    created() {
-      this.GetHomeData()
-      setRem();
+    toConsole() {
+      this.$router.push({ path: "/manageconsole" });
     }
-  };
+  },
+  created() {
+    this.GetHomeData();
+    setRem();
+  }
+};
 </script>
 <style lang="scss" scoped>
 .page_homeIndex {
@@ -460,4 +437,5 @@
   }
 }
 </style>
-<style lang="scss"></style>
+<style lang="scss">
+</style>

src/pages/main/today/dialysisMonitoring.vue

@@ -29,8 +29,7 @@
           <th v-if="isShow('置换量')&& template_id == 6" width="50px">置换量(ml)</th>
           <th v-if="isShow('置换量')&& template_id != 6" width="50px">置换量(L)</th>
 
-
-          <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
+          <th v-if="isShow('电导度')" width="92px">电导度(mS/cm)</th>
           <th v-if="isShow('置换液流量')" width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
           <th v-if="isShow('处理')" width="92px">处理</th>
@@ -54,8 +53,6 @@
             {{ item.pulse_frequency ? item.pulse_frequency : "" }}
           </td>
 
-
-
           <td v-if="isShow('呼吸频率')">
             {{ item.breathing_rate ? item.breathing_rate : "" }}
           </td>
@@ -195,7 +192,7 @@
       </span>
 
       <span v-if="isShow('电导度')">
-        <el-table-column prop="zip" label="电导度(mS/m)" width="200" align="center">
+        <el-table-column prop="zip" label="电导度(mS/cm)" width="200" align="center">
           <template slot-scope="scope">{{scope.row.conductivity?scope.row.conductivity:''}}</template>
         </el-table-column>
       </span>

src/pages/main/today/dialysisPrescription.vue

@@ -117,20 +117,17 @@
           <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_zongliang != '0'?"ml":""}}</span>
         </li>
 
-
         <li v-if="isShow('钙名称')&&this.prescription.anticoagulant == 5">
           <label>钙名称: </label>
           <span class="content">{{this.prescription.anticoagulant_gaimingcheng}}</span>
         </li>
 
-
         <li v-if="isShow('钙剂量')&&this.prescription.anticoagulant == 5">
           <label>钙剂量: </label>
           <span class="content">{{this.prescription.anticoagulant_gaijiliang}}</span>
           <span class="unit" v-if="this.prescription.anticoagulant == 5">{{'ml'}}</span>
         </li>
 
-
         <li v-if="isShow('钠')">
           <label>钠 : </label>
           <span class="content">{{sodium != '0'?sodium:""}}</span>
@@ -204,7 +201,7 @@
         <li v-if="isShow('电导度')">
           <label>电导度 : </label>
           <span class="content">{{conductivity != '0'?conductivity:""}}</span>
-          <span class="unit">{{conductivity != '0'?"mS/m":""}}</span>
+          <span class="unit">{{conductivity != '0'?"mS/cm":""}}</span>
         </li>
 
       </ul>
@@ -214,291 +211,337 @@
 </template>
 
 <script>
-  import {getDataConfig} from '@/utils/data'
-  export default {
-    name: 'DialysisPrescription',
-    data () {
-      return {
-        title: '透析处方',
-        perfusion_apparatus_map: {},
-        dialysateFormulationMap: {}
+import { getDataConfig } from "@/utils/data";
+export default {
+  name: "DialysisPrescription",
+  data() {
+    return {
+      title: "透析处方",
+      perfusion_apparatus_map: {},
+      dialysateFormulationMap: {}
+    };
+  },
+  props: {
+    prescription: {
+      type: Object
+    },
+    solution: {
+      type: Object
+    },
+    device_number_map: {
+      type: Object
+    }
+  },
+  computed: {
+    target_ultrafiltration: function() {
+      var v = this.getValueStr(
+        "target_ultrafiltration",
+        "target_ultrafiltration"
+      );
+      v = this.getFloat(v);
+      return v.length == 0 ? "0" : v;
+    },
+    dialysis_mode: function() {
+      var mode = this.getValueStr("mode_id", "mode_id");
+      if (mode.length == 0) {
+        return "";
       }
+      if (this.$store.getters.treatment_mode[mode] != undefined) {
+        return this.$store.getters.treatment_mode[mode].name;
+      }
+      return "";
     },
-    props: {
-      prescription: {
-        type: Object
-      },
-      solution: {
-        type: Object
-      },
-      device_number_map: {
-        type: Object
+    perfusion_apparatus: function() {
+      var v = this.getValueStr("perfusion_apparatus", "perfusion_apparatus");
+      if (v.length == 0) {
+        return "";
+      }
+      if (this.perfusion_apparatus_map[v] != undefined) {
+        return this.perfusion_apparatus_map[v].name;
       }
+      return "";
+    },
+    displace_liqui: function() {
+      var v = this.getValueStr("displace_liqui", "displace_liqui");
+      return v.length == 0 ? "0" : v;
+    },
+    anticoagulant_shouji: function() {
+      var v = this.getValueStr("anticoagulant_shouji", "anticoagulant_shouji");
+      return v.length == 0 ? "0" : v;
+    },
+    kalium: function() {
+      var v = this.getValueStr("kalium", "kalium");
+      v = this.getFloat(v);
+      return v == 0 ? "0" : v;
+    },
+    replacement_total: function() {
+      var v = this.getValueStr("replacement_total", "replacement_total");
+      return v.length == 0 ? "0" : v;
+    },
+    bicarbonate: function() {
+      var v = this.getValueStr("bicarbonate", "bicarbonate");
+      return v.length == 0 ? "0" : v;
+    },
+    dialysate_flow: function() {
+      var v = this.getValueStr("dialysate_flow", "dialysate_flow");
+      return v.length == 0 ? "0" : v;
+    },
+    dialysis_duration: function() {
+      var dialysis_duration_hour = this.getValueStr(
+        "dialysis_duration_hour",
+        "dialysis_duration_hour"
+      );
+      var dialysis_duration_minute = this.getValueStr(
+        "dialysis_duration_minute",
+        "dialysis_duration_minute"
+      );
+      if (
+        dialysis_duration_hour.length == 0 &&
+        dialysis_duration_minute.length == 0
+      ) {
+        return "0";
+      } else {
+        var time =
+          dialysis_duration_hour + "h" + dialysis_duration_minute + "min";
+        return time.length == 0 ? "0" : time;
+      }
+    },
+    blood_flow_volume: function() {
+      var v = this.getValueStr("blood_flow_volume", "blood_flow_volume");
+      return v.length == 0 ? "0" : v;
+    },
+    replacement_way: function() {
+      return this.getValueStr("replacement_way", "replacement_way");
+    },
+    anticoagulant_weichi: function() {
+      var v = this.getValueStr("anticoagulant_weichi", "anticoagulant_weichi");
+      return v.length == 0 ? "0" : v;
+    },
+    sodium: function() {
+      var v = this.getValueStr("sodium", "sodium");
+      console.log(v);
+      v = this.getFloat(v);
+      console.log(v);
+      return v == 0 ? "0" : v;
+    },
+    glucose: function() {
+      var v = this.getValueStr("glucose", "glucose");
+      return v.length == 0 ? "0" : v;
+    },
+    dialysate_temperature: function() {
+      var v = this.getValueStr(
+        "dialysate_temperature",
+        "dialysate_temperature"
+      );
+      return v.length == 0 ? "0" : v;
+    },
+    dialyzer: function() {
+      var v = this.getValueStr("dialyzer", "hemodialysis_machine");
+      if (v.length == 0) {
+        return "";
+      }
+      if (this.device_number_map[v] != undefined) {
+        return this.device_number_map[v].name;
+      }
+      return "";
+    },
+    dialysate_formulation: function() {
+      var v = this.getValueStr(
+        "dialysate_formulation",
+        "dialysate_formulation"
+      );
+      if (v.length == 0) {
+        return "";
+      }
+      if (v in this.dialysateFormulationMap) {
+        return this.dialysateFormulationMap[v].name;
+      }
+      return "";
+    },
+    prescription_dewatering: function() {
+      var v = this.getValueStr("prescription_dewatering", "dewater");
+      return v.length == 0 ? "0" : v;
+    },
+    anticoagulant: function() {
+      var v = this.getValueStr("anticoagulant", "anticoagulant");
+      if (v.length == 0) {
+        return "";
+      }
+      if (this.$store.getters.anticoagulants_confit[v] != undefined) {
+        return this.$store.getters.anticoagulants_confit[v].name;
+      }
+      return "";
+    },
+    anticoagulant_zongliang: function() {
+      var v = this.getValueStr(
+        "anticoagulant_zongliang",
+        "anticoagulant_zongliang"
+      );
+      return v.length == 0 ? "0" : v;
+    },
+    calcium: function() {
+      var v = this.getValueStr("calcium", "calcium");
+      v = this.getFloat(v);
+      return v == 0 ? "0" : v;
     },
-    computed: {
-      target_ultrafiltration: function () {
-        var v = this.getValueStr('target_ultrafiltration', 'target_ultrafiltration')
-        v = this.getFloat(v)
-        return v.length == 0 ? '0' : v
-      },
-      dialysis_mode: function () {
-        var mode = this.getValueStr('mode_id', 'mode_id')
-        if (mode.length == 0) {
-          return ''
-        }
-        if (this.$store.getters.treatment_mode[mode] != undefined) {
-          return this.$store.getters.treatment_mode[mode].name
-        }
-        return ''
-      },
-      perfusion_apparatus: function () {
-        var v = this.getValueStr('perfusion_apparatus', 'perfusion_apparatus')
-        if (v.length == 0) {
-          return ''
-        }
-        if (this.perfusion_apparatus_map[v] != undefined) {
-          return this.perfusion_apparatus_map[v].name
-        }
-        return ''
-      },
-      displace_liqui: function () {
-        var v = this.getValueStr('displace_liqui', 'displace_liqui')
-        return v.length == 0 ? '0' : v
-      },
-      anticoagulant_shouji: function () {
-        var v = this.getValueStr('anticoagulant_shouji', 'anticoagulant_shouji')
-        return v.length == 0 ? '0' : v
-      },
-      kalium: function () {
-        var v = this.getValueStr('kalium', 'kalium')
-        v = this.getFloat(v)
-        return v == 0 ? '0' : v
-      },
-      replacement_total: function () {
-        var v = this.getValueStr('replacement_total', 'replacement_total')
-        return v.length == 0 ? '0' : v
-      },
-      bicarbonate: function () {
-        var v = this.getValueStr('bicarbonate', 'bicarbonate')
-        return v.length == 0 ? '0' : v
-      },
-      dialysate_flow: function () {
-        var v = this.getValueStr('dialysate_flow', 'dialysate_flow')
-        return v.length == 0 ? '0' : v
-      },
-      dialysis_duration: function () {
-        var dialysis_duration_hour = (this.getValueStr('dialysis_duration_hour', 'dialysis_duration_hour'))
-        var dialysis_duration_minute = (this.getValueStr('dialysis_duration_minute', 'dialysis_duration_minute'))
-        if (dialysis_duration_hour.length == 0 && dialysis_duration_minute.length == 0) {
-          return '0'
-        } else {
-          var time = dialysis_duration_hour + 'h' + dialysis_duration_minute + 'min'
-          return time.length == 0 ? '0' : time
-        }
-      },
-      blood_flow_volume: function () {
-        var v = this.getValueStr('blood_flow_volume', 'blood_flow_volume')
-        return v.length == 0 ? '0' : v
-      },
-      replacement_way: function () {
-        return this.getValueStr('replacement_way', 'replacement_way')
-      },
-      anticoagulant_weichi: function () {
-        var v = this.getValueStr('anticoagulant_weichi', 'anticoagulant_weichi')
-        return v.length == 0 ? '0' : v
-      },
-      sodium: function () {
-        var v = this.getValueStr('sodium', 'sodium')
-        console.log(v)
-        v = this.getFloat(v)
-        console.log(v)
-        return v == 0 ? '0' : v
-      },
-      glucose: function () {
-        var v = this.getValueStr('glucose', 'glucose')
-        return v.length == 0 ? '0' : v
-      },
-      dialysate_temperature: function () {
-        var v = this.getValueStr('dialysate_temperature', 'dialysate_temperature')
-        return v.length == 0 ? '0' : v
-      },
-      dialyzer: function () {
-        var v = this.getValueStr('dialyzer', 'hemodialysis_machine')
-        if (v.length == 0) {
-          return ''
-        }
-        if (this.device_number_map[v] != undefined) {
-          return this.device_number_map[v].name
-        }
-        return ''
-      },
-      dialysate_formulation: function () {
-        var v = this.getValueStr('dialysate_formulation', 'dialysate_formulation')
-        if (v.length == 0) {
-          return ''
-        }
-        if (v in this.dialysateFormulationMap) {
-          return this.dialysateFormulationMap[v].name
-        }
-        return ''
-      },
-      prescription_dewatering: function () {
-        var v = this.getValueStr('prescription_dewatering', 'dewater')
-        return v.length == 0 ? '0' : v
-      },
-      anticoagulant: function () {
-        var v = this.getValueStr('anticoagulant', 'anticoagulant')
-        if (v.length == 0) {
-          return ''
-        }
-        if (this.$store.getters.anticoagulants_confit[v] != undefined) {
-          return this.$store.getters.anticoagulants_confit[v].name
-        }
-        return ''
-      },
-      anticoagulant_zongliang: function () {
-        var v = this.getValueStr('anticoagulant_zongliang', 'anticoagulant_zongliang')
-        return v.length == 0 ? '0' : v
-      },
-      calcium: function () {
-        var v = this.getValueStr('calcium', 'calcium')
-        v = this.getFloat(v)
-        return v == 0 ? '0' : v
-      },
 
-      conductivity: function () {
-        var v = this.getValueStr('conductivity', 'conductivity')
-        return v.length == 0 ? '0' : v
-      },
-      dialyzer_perfusion_apparatus: function () {
-        return this.getValueStr('dialyzer_perfusion_apparatus', 'dialyzer_perfusion_apparatus')
-      },
-      note: function () {
-        return this.getValueStr('remark', 'remark')
-      },
-      body_fluid: function () {
-        var id = this.getValueStr('body_fluid', 'body_fluid')
-        if (id == 0) {
-          return ''
-        }
-        var bodyFluidOptions = this.$store.getters.body_fluid
-        for (let i = 0; i < bodyFluidOptions.length; i++) {
-          if (bodyFluidOptions[i].id == id) {
-            return bodyFluidOptions[i].name
-          }
-        }
-      },
-      special_medicine: function () {
-        var id = this.getValueStr('special_medicine', 'special_medicine')
-        if (id == 0) {
-          return ''
-        }
-        var special_medicine = this.$store.getters.special_medicine
-        for (let i = 0; i < special_medicine.length; i++) {
-          if (special_medicine[i].id == id) {
-            return special_medicine[i].name
-          }
-        }
-      },
-      special_medicine_other: function () {
-        return this.getValueStr('special_medicine_other', 'special_medicine_other')
-      },
-      blood_access: function () {
-        var id = this.getValueStr('blood_access', 'blood_access')
-        if (id == 0) {
-          return ''
+    conductivity: function() {
+      var v = this.getValueStr("conductivity", "conductivity");
+      return v.length == 0 ? "0" : v;
+    },
+    dialyzer_perfusion_apparatus: function() {
+      return this.getValueStr(
+        "dialyzer_perfusion_apparatus",
+        "dialyzer_perfusion_apparatus"
+      );
+    },
+    note: function() {
+      return this.getValueStr("remark", "remark");
+    },
+    body_fluid: function() {
+      var id = this.getValueStr("body_fluid", "body_fluid");
+      if (id == 0) {
+        return "";
+      }
+      var bodyFluidOptions = this.$store.getters.body_fluid;
+      for (let i = 0; i < bodyFluidOptions.length; i++) {
+        if (bodyFluidOptions[i].id == id) {
+          return bodyFluidOptions[i].name;
         }
-        var blood_access = this.$store.getters.blood_access
-        console.log('blood_access', blood_access)
-        for (let i = 0; i < blood_access.length; i++) {
-          if (blood_access[i].id == id) {
-            return blood_access[i].name
-          }
+      }
+    },
+    special_medicine: function() {
+      var id = this.getValueStr("special_medicine", "special_medicine");
+      if (id == 0) {
+        return "";
+      }
+      var special_medicine = this.$store.getters.special_medicine;
+      for (let i = 0; i < special_medicine.length; i++) {
+        if (special_medicine[i].id == id) {
+          return special_medicine[i].name;
         }
-      },
-      displace_liqui: function () {
-        var id = this.getValueStr('displace_liqui_part', 'displace_liqui_part')
-        var displace_liqui_value = this.getValueStr('displace_liqui_value', 'displace_liqui_value')
-        var displace_liqui_part = ''
-        var displace_liqui = this.$store.getters.displace_liqui
-        for (let i = 0; i < displace_liqui.length; i++) {
-          if (displace_liqui[i].id == id) {
-            displace_liqui_part = displace_liqui[i].name
-          }
+      }
+    },
+    special_medicine_other: function() {
+      return this.getValueStr(
+        "special_medicine_other",
+        "special_medicine_other"
+      );
+    },
+    blood_access: function() {
+      var id = this.getValueStr("blood_access", "blood_access");
+      if (id == 0) {
+        return "";
+      }
+      var blood_access = this.$store.getters.blood_access;
+      console.log("blood_access", blood_access);
+      for (let i = 0; i < blood_access.length; i++) {
+        if (blood_access[i].id == id) {
+          return blood_access[i].name;
         }
-        return displace_liqui_part
-      },
-      ultrafiltration: function () {
-        var v = this.getValueStr('ultrafiltration', 'ultrafiltration')
-        v = this.getFloat(v)
-        return v.length == 0 ? '0' : v
-      },
-      target_ktv: function () {
-        var v = this.getValueStr('target_ktv', 'target_ktv')
-        return v.length == 0 ? '0' : v
       }
     },
-    created () {
-      var perfusion_apparatus = this.$store.getters.perfusion_apparatus
-      var map = {}
-      for (let index = 0; index < perfusion_apparatus.length; index++) {
-        const p = perfusion_apparatus[index]
-        map[p.id] = p
+    displace_liqui: function() {
+      var id = this.getValueStr("displace_liqui_part", "displace_liqui_part");
+      var displace_liqui_value = this.getValueStr(
+        "displace_liqui_value",
+        "displace_liqui_value"
+      );
+      var displace_liqui_part = "";
+      var displace_liqui = this.$store.getters.displace_liqui;
+      for (let i = 0; i < displace_liqui.length; i++) {
+        if (displace_liqui[i].id == id) {
+          displace_liqui_part = displace_liqui[i].name;
+        }
       }
-      this.perfusion_apparatus_map = map
+      return displace_liqui_part;
+    },
+    ultrafiltration: function() {
+      var v = this.getValueStr("ultrafiltration", "ultrafiltration");
+      v = this.getFloat(v);
+      return v.length == 0 ? "0" : v;
+    },
+    target_ktv: function() {
+      var v = this.getValueStr("target_ktv", "target_ktv");
+      return v.length == 0 ? "0" : v;
+    }
+  },
+  created() {
+    var perfusion_apparatus = this.$store.getters.perfusion_apparatus;
+    var map = {};
+    for (let index = 0; index < perfusion_apparatus.length; index++) {
+      const p = perfusion_apparatus[index];
+      map[p.id] = p;
+    }
+    this.perfusion_apparatus_map = map;
 
-      var dialysateFormulationOptions = getDataConfig('hemodialysis', 'dialysate_formulation')
-      for (var index in dialysateFormulationOptions) {
-        this.dialysateFormulationMap[dialysateFormulationOptions[index].id] = dialysateFormulationOptions[index]
+    var dialysateFormulationOptions = getDataConfig(
+      "hemodialysis",
+      "dialysate_formulation"
+    );
+    for (var index in dialysateFormulationOptions) {
+      this.dialysateFormulationMap[dialysateFormulationOptions[index].id] =
+        dialysateFormulationOptions[index];
+    }
+  },
+  methods: {
+    getDisplaceLiquiValue: function() {
+      return this.getValueStr("displace_liqui_value", "displace_liqui_value");
+    },
+    isShow(name) {
+      var filedList = this.$store.getters.user.fileds;
+      for (let i = 0; i < filedList.length; i++) {
+        if (
+          filedList[i].module == 1 &&
+          filedList[i].filed_name_cn == name &&
+          filedList[i].is_show == 1
+        ) {
+          return true;
+        }
       }
+      return false;
     },
-    methods: {
-      getDisplaceLiquiValue:function(){
-        return this.getValueStr('displace_liqui_value', 'displace_liqui_value')
-      },
-      isShow (name) {
-        var filedList = this.$store.getters.user.fileds
-        for (let i = 0; i < filedList.length; i++) {
-          if (filedList[i].module == 1 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
-            return true
-          }
+    getValueStr(pkey, skey) {
+      if (
+        (this.prescription == null || this.prescription.id == "") &&
+        (this.solution == null || this.solution.id == "")
+      ) {
+        return "";
+      } else if (this.prescription != null && this.prescription.id != "") {
+        if (
+          this.prescription[pkey] == null ||
+          this.prescription[pkey] == undefined
+        ) {
+          return "";
+        }
+        return this.prescription[pkey] + "";
+      } else {
+        if (this.solution[skey] == null || this.solution[skey] == undefined) {
+          return "";
         }
-        return false
-      },
-      getValueStr (pkey, skey) {
-        if ((this.prescription == null || this.prescription.id == '') && (this.solution == null || this.solution.id == '')) {
-          return ''
-        } else if (this.prescription != null && this.prescription.id != '') {
-          if (this.prescription[pkey] == null || this.prescription[pkey] == undefined) {
-            return ''
-          }
-          return this.prescription[pkey] + ''
-        } else {
-          if (this.solution[skey] == null || this.solution[skey] == undefined) {
-            return ''
-          }
-          return this.solution[skey] + ''
+        return this.solution[skey] + "";
+      }
+    },
+    getFloat: function(x) {
+      if (x != ".") {
+        var f = Math.round(x * 100) / 100;
+        var s = f.toString();
+        var rs = s.indexOf(".");
+        if (rs <= 0) {
+          rs = s.length;
+          s += ".";
         }
-      },
-      getFloat: function (x) {
-        if (x != '.') {
-          var f = Math.round(x * 100) / 100
-          var s = f.toString()
-          var rs = s.indexOf('.')
-          if (rs <= 0) {
-            rs = s.length
-            s += '.'
-          }
-          while (s.length <= rs + 1) {
-            s += '0'
-          }
-          return s
-        } else {
-          return '0.0'
+        while (s.length <= rs + 1) {
+          s += "0";
         }
+        return s;
+      } else {
+        return "0.0";
       }
     }
   }
+};
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped></style>
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>

src/pages/my/index.vue

@@ -43,7 +43,6 @@
       </router-link>
     </div>
     <div class="myBox">
-      <router-link to="/organizationInfo">
         <div class="myBoxOne">
           <div class="myInfoLeft">
             <img src="../../assets/images/myIcon2.png" alt />
@@ -51,24 +50,15 @@
           </div>
           <van-icon class="arrow" name="arrow" />
         </div>
-      </router-link>
-      <div class="myBoxTwo">
-        <div class="myInfoLeft">
-          <img src="../../assets/images/m01.png" alt />
-          <p>我的医院/组织/团队</p>
-        </div>
-        <div class="myInfoRight">
-          <van-icon class="arrow" name="arrow" />
-        </div>
-      </div>
-      <div class="myBoxTwo noBorder">
+      <div class="myBoxTwo noBorder" v-for="(item,index) in organaziton" :key="index">
         <div class="myInfoLeft">
-          <img src="../../assets/images/m01.png" alt />
-          <p>我的医院/组织/团队</p>
+          <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" @click="toManage">
+        <div class="myInfoRight" v-if="item.is_super_admin == 1">
           <div class="myInfoRightBtn">管理</div>
-          <van-icon class="arrow" name="arrow" />
+          <van-icon class="arrow" name="arrow"  @click="toManage"/>
         </div>
       </div>
     </div>
@@ -133,13 +123,19 @@
   </div>
 </template>
 <script>
-import { getMyInformation, LoginOut } from "@/api/patient/patient";
+import {
+  getMyInformation,
+  LoginOut,
+  getMyOrganazition
+} from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 export default {
   data() {
     return {
       roleInfo: {},
-      admin_user_id: 0
+      admin_user_id: 0,
+      adminid: 0,
+      organaziton: []
     };
   },
   methods: {
@@ -161,10 +157,20 @@ export default {
         if (response.data.state === 1) {
           var roleInfo = response.data.data.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;
+          console.log("organaziton", organaziton);
+        }
+      });
+    },
     getTime(time) {
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
       return uParseTime(time, "{y}-{m}-{d}");
@@ -176,13 +182,14 @@ export default {
       this.$router.push("/myInfo?id=" + this.admin_user_id);
     },
     toManage() {
-      this.$router.push("/organizationinfo?id=" + this.admin_user_id);
+      this.$router.push("/organizationinfo?id=" + this.adminid);
     }
   },
   created() {
     var adminid = this.$store.getters.user.user.id;
     console.log("adminid", adminid);
     this.getMyInformation(adminid);
+    this.getMyOrganazition(adminid);
   }
 };
 </script>

src/pages/my/modifyingName.vue

@@ -3,15 +3,53 @@
     <div class="modifyingNameTitle">
       <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">修改姓名</span>
-      <span>保存</span>
+      <span @click="saveName">保存</span>
     </div>
     <div class="nameBox">
-      <van-field v-model="value" placeholder="请填写姓名" />
+      <van-field v-model="name" placeholder="请填写姓名" />
     </div>
   </div>
 </template>
-
-
+<script>
+import { getMyInformation, saveName } from "@/api/patient/patient";
+export default {
+  data() {
+    return {
+      name: "",
+      admin_user_id: 0
+    };
+  },
+  methods: {
+    getMyInformation(id) {
+      getMyInformation(id).then(response => {
+        if (response.data.state === 1) {
+          var roleInfo = response.data.data.roleInfo;
+          console.log("姓名", roleInfo);
+          this.message = roleInfo.message;
+          this.name = roleInfo.user_name;
+        }
+      });
+    },
+    saveName() {
+      if (this.name === "") {
+        this.$toast("姓名不能为空");
+        return false;
+      }
+      saveName(this.admin_user_id, this.name).then(response => {
+        if (response.data.state === 1) {
+          var role = response.data.data.role;
+          this.$router.push("/myInfo?id=" + this.admin_user_id);
+        }
+      });
+    }
+  },
+  created() {
+    var id = this.$route.query.id;
+    this.getMyInformation(id);
+    this.admin_user_id = id;
+  }
+};
+</script>
 <style lang="scss" scoped>
 .page_modifyingName {
   height: 100%;

src/pages/my/myInfo.vue

@@ -17,15 +17,13 @@
           <van-icon class="arrow" name="arrow" />
         </div>
       </div>
-      <router-link to="/editname">
-        <div class="infoBoxTwo">
+        <div class="infoBoxTwo" @click="editName">
           <p>姓名</p>
           <div class="infoBoxOneRight">
             <p>{{ roleInfo.user_name }}</p>
             <van-icon class="arrow" name="arrow" />
           </div>
         </div>
-      </router-link>
       <div class="infoBoxTwo" @click="show = true">
         <p>性别</p>
         <div class="infoBoxOneRight">
@@ -114,6 +112,9 @@ export default {
     toMyPersonalsign() {
       this.$router.push("/personalsign?id=" + this.admin_user_id);
     },
+    editName() {
+      this.$router.push("/editname?id=" + this.admin_user_id);
+    },
     onConfirm(value) {
       if (value === "男") {
         this.form.sex = 1;

src/pages/my/organizationInfo.vue

@@ -39,7 +39,11 @@
   </div>
 </template>
 <script>
-import { getOrgName, getRoleName } from "@/api/patient/patient";
+import {
+  getOrgName,
+  getRoleName,
+  getAllOrganization
+} from "@/api/patient/patient";
 export default {
   data() {
     return {
@@ -110,6 +114,12 @@ export default {
           this.positionName = positionName.user_type;
         }
       });
+    },
+    getAllOrganization(id) {
+      getAllOrganization(id).then(response => {
+        if (response.data.state == 1) {
+        }
+      });
     }
   },
   created() {
@@ -119,6 +129,7 @@ export default {
     console.log("id", id);
     this.getOrgName();
     this.getRoleName(id);
+    this.getAllOrganization(id);
   }
 };
 </script>

src/pages/patientCenter/editOrg/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "index"
+    }
+</script>
+
+<style scoped>
+
+</style>