Merge branch 'master' of http://git.shengws.com/csx/Pad_New

.gitignore

@@ -16,4 +16,4 @@ selenium-debug.log
 *.njsproj
 *.sln
 .svn
-.dist
+.dist

.postcssrc.js

@@ -1,10 +1,10 @@
 // https://github.com/michael-ciniawsky/postcss-load-config
 
 module.exports = {
-  "plugins": {
+  plugins: {
     "postcss-import": {},
     "postcss-url": {},
     // to edit target browsers: use "browserslist" field in package.json
-    "autoprefixer": {}
+    autoprefixer: {}
   }
-}
+};

src/api/login.js

@@ -15,53 +15,46 @@ export function loginByPwd(mobile, password) {
 export function isLogin() {
   return request({
     url: '/m/api/islogin',
-    method: 'get',
+    method: 'get'
   })
 }
 
-
-
 export function getCodeInit() {
   return request({
     url: '/m/api/code',
-    method: 'get',
+    method: 'get'
   })
 }
 
-
 export function getVerifyCode(params) {
   return request({
     url: '/m/api/getcode',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
 export function loginByCode(params) {
   return request({
     url: '/m/api/login/cs',
     method: 'post',
-    params:params,
+    params: params
   })
 }
 
-
-
 export function forgetPassWord(params) {
   return request({
     url: '/m/api/password/commit',
     method: 'post',
-    params:params,
+    params: params
   })
 }
 
-
 export function register(params) {
   return request({
     url: '/m/api/register/commit',
     method: 'post',
-    params:params,
+    params: params
   })
 }
 
@@ -69,29 +62,21 @@ export function setName(params) {
   return request({
     url: '/m/api/register/setname',
     method: 'post',
-    params:params,
+    params: params
   })
 }
 
-
-
-
 export function login() {
   return request({
     url: '/m/api/register/login',
-    method: 'post',
+    method: 'post'
   })
 }
 
-
-
-
-
-
 export function createOrg(params) {
   return request({
     url: '/m/api/org/create',
     method: 'post',
-    params:params,
+    params: params
   })
 }

src/api/patient/patient.js

@@ -723,3 +723,73 @@ export function getBloodPatient(params) {
     params: params
   })
 }
+
+export function DeletePatient(id, params) {
+  console.log('医嘱id', id)
+  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
+  })
+}
+
+export function getOrgInformation(params) {
+  return request({
+    url: '/m/api/org/getorginformation',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllOrgType(params) {
+  return request({
+    url: '/m/api/patient/getallorgtype',
+    method: 'get',
+    params: params
+  })
+}
+
+export function updateOrg(params, id) {
+  return request({
+    url: '/m/api/patient/editorg?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function getMyInforName(id, params) {
+  return request({
+    url: '/m/api/patient/getmyinforname?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

src/kya_pages/homeIndex/index.vue

@@ -258,4 +258,5 @@ export default {
   }
 }
 </style>
-<style lang="scss"></style>
+<style lang="scss">
+</style>

src/main.js

@@ -55,7 +55,9 @@ import {
   Switch,
   Uploader,
   Radio,
-  RadioGroup
+  RadioGroup,
+  Overlay,
+  Loading
   // eslint-disable-next-line no-irregular-whitespace,import/no-duplicates
 } from "vant";
 Vue.use(DropdownMenu)
@@ -90,7 +92,9 @@ Vue.use(DropdownMenu)
   .use(Switch)
   .use(Uploader)
   .use(RadioGroup)
-  .use(Radio);
+  .use(Radio)
+  .use(Overlay)
+  .use(Loading);
 // import "@/lib/flexible.js";
 
 // main.js

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,80 @@ 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.GetDoctorAdviceDetail(this.id);
+            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;
@@ -121,7 +127,7 @@ export default {
           if (response.data.state === 1) {
             var msg = response.data.data.msg;
             console.log("msg", msg);
-            this.Number.splice(index, 1);
+            this.BedNumber.splice(index, 1);
             this.newShow = false;
           }
         });
@@ -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/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(",")
@@ -89,7 +96,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 +104,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/doctorAdvice/components/DoctorManagement.vue

@@ -22,124 +22,206 @@
         </div>
       </div>
 
-      <div class="adviceBox" v-show="showOne">
+      <div class="adviceBox">
         <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>
+         v-model="loading"
+         :finished="finished"
+         @load="onLoad"
+         finished-text="没有更多了"
+         >
 
-              <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
+          <div class="adviceOne" v-for="(item,index) in this.doctorAdvice" :key="index">
+            <div class="adviceTitle">
+              <p>{{getTime(item.child[0].start_time)}}</p>
+              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+            </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 class="statOrderTitle">
+                <span v-if="i<1">长期医嘱</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
+                     }}{{ 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
+                    {{ 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>
+                     {{ i.delivery_way }}
+                    {{ i.execution_frequency }}
+                 </p>
                 </div>
-                <div
-                  class="doctorBox"
-                  v-if="
-                    it.user_name ||
-                      it.execution_staff ||
-                      (it.checker && i == item.child.length)
-                  "
-                >
+                <div class="doctorBox">
                   <p>开嘱医生：{{ it.user_name }}</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" 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
+            <div class="statOrder" v-if="it.advice_type == 3 && it.parent_id == 0">
+              <div class="longOrderTitle">
+                <span v-if="i<1">临时医嘱</span>
+                <span v-if="i<1" style="margin-left:1rem">{{getTimes(it.start_time)}}</span>
+              </div>
+              <div class="orderContent" v-if="i<4">
+                <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
+                   {{ 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>
+                     {{ i.delivery_way }}
+                    {{ i.execution_frequency }}</p>
                 </div>
-                <div
-                  class="doctorBox"
-                  v-if="
-                    it.user_name ||
-                      it.execution_staff ||
-                      (it.checker && i == item.child.length)
-                  "
-                >
+              </div>
+               <div class="doctorBox">
                   <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>
+<!--             <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>
         </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>
@@ -218,8 +300,7 @@
 import {
   getDoctorAdvices,
   getPatientDetail,
-  DeleteManagement,
-  DeleteChild
+  DeleteManagement
 } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 import { Dialog } from "vant";
@@ -230,6 +311,7 @@ export default {
   },
   data() {
     return {
+      docShow: false,
       loading: false,
       finished: false,
       newShow: false,
@@ -241,7 +323,6 @@ export default {
       columns: ["全部", "长期医嘱", "临时医嘱"],
       startTime: "请选择",
       endTime: "请选择",
-      endTimes: "",
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
@@ -249,8 +330,8 @@ export default {
       actions1: [{ name: "删除" }],
       actions2: [{ name: "删除" }],
       form: {
-        type: "",
-        limit: 10,
+        type: 0,
+        limit: 5,
         page: 1
       },
       total: "",
@@ -280,7 +361,7 @@ export default {
         this.patient_id,
         this.type,
         this.startTime,
-        this.endTimes,
+        this.endTime,
         this.form.limit,
         this.form.page
       );
@@ -355,18 +436,10 @@ export default {
       ).then(response => {
         if (response.data.state === 1) {
           var advice = response.data.data.advice;
-          // this.doctorAdvice = advice;
-          let objarr = [];
-          for (let i = 0; i < advice.length; i++) {
-            if (advice[i].parent_id != 0) {
-              objarr.push(advice[i]);
-            }
-          }
-          this.childList = objarr;
-          var total = response.data.data.total;
-          this.total = total;
+          console.log("advice", advice);
+          var one = response.data.data.one;
           let dataInfo = {};
-          advice.forEach((item, index) => {
+          one.forEach((item, index) => {
             let { groupno } = item;
             if (!dataInfo[groupno]) {
               dataInfo[groupno] = {
@@ -374,46 +447,31 @@ export default {
                 child: []
               };
             }
-            dataInfo[groupno].child.push(item);
           });
-          let list = Object.values(dataInfo); // list 转换成功的数据
-          let arr = [];
-
+          let list = Object.values(dataInfo);
           list.map(item => {
-            // console.log(item.child);
-            let arr2 = [];
-            if (item.child.length > 1) {
-              item.child.map((it, index) => {
-                // console.log(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].user_name;
-                if (
-                  JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
-                ) {
-                  arr2.push(obj);
-                } else {
-                  delete item.child[i]["checker"];
-                  delete item.child[i]["execution_staff"];
-                  delete item.child[i]["user_name"];
-                }
+            for (let i = 0; i < advice.length; i++) {
+              if (item.groupno === advice[i].groupno) {
+                item.child.push(advice[i]);
               }
             }
           });
-
-          var doctor = response.data.data.doctor;
-          this.doctor = doctor;
-          this.doctorAdvice = list.reverse();
+          let objarr = [];
+          for (let i = 0; i < advice.length; i++) {
+            if (advice[i].parent_id != 0) {
+              objarr.push(advice[i]);
+            }
+          }
+          this.childList = objarr;
+          console.log("list", list);
+          let arr = this.doctorAdvice;
+          arr.push(...list.reverse());
+          this.doctorAdvice = arr;
+          console.log("listtwo", this.doctorAdvice);
+          var total = response.data.data.total;
+          this.total = total;
+          console.log("total", total);
           this.loading = false;
-          this.finished = true;
         }
       });
     },
@@ -440,25 +498,25 @@ export default {
     getTimes(time) {
       return uParseTime(time, "{h}:{i}");
     },
-    // onLoad() {
-    //   setTimeout(() => {
-    //     this.page++;
-    //     if (this.page <= Math.ceil(this.total / 10)) {
-    //       this.getDoctorAdvices(
-    //         this.patient_id,
-    //         this.form.type,
-    //         this.startTime,
-    //         this.endTimes,
-    //         this.form.limit,
-    //         this.form.page
-    //       );
-    //     } else {
-    //       this.loading = false;
-    //       this.finished = true;
-    //     }
-    //   }, 1000);
-    // },
-    onLoad() {},
+    onLoad() {
+      setTimeout(() => {
+        this.form.page++;
+        console.log("page", this.form.page);
+        if (this.form.page <= Math.ceil(this.total / 5)) {
+          this.getDoctorAdvices(
+            this.patient_id,
+            this.form.type,
+            this.startTime,
+            this.endTime,
+            this.form.limit,
+            this.form.page
+          );
+        } else {
+          this.loading = false;
+          this.finished = true;
+        }
+      }, 1000);
+    },
     toDoctorAdviceDetail(id) {
       var patientid = this.$route.query.patientid;
       this.$router.push(
@@ -503,7 +561,6 @@ export default {
       }
     },
     toChildDelete(val) {
-      console.log(val);
       if (val.name == "删除") {
         this.DeleteChild(this.id, this.index, this.state);
       }

src/pages/doctorAdvice/index.vue

@@ -562,9 +562,7 @@ export default {
     this.patient_id = patientid;
     this.getPatientDetail(patientid);
     var seacherActive = this.$route.query.seacherActive;
-    // console.log("seacherActive是", seacherActive);
-
-    if (seacherActive === 0) {
+    if (seacherActive == 0) {
       this.getBloodDialysisPatientTwo();
     }
     if (seacherActive == 1) {

src/pages/home/index.vue

@@ -94,12 +94,12 @@
             <!--<div>服务</div>-->
           <!--</van-tabbar-item>-->
         <!--</router-link>-->
-        <router-link to="/shop" replace>
-          <van-tabbar-item>
-            <i class="iconfont icon-shangcheng iconOne"></i>
-            <div>商城</div>
-          </van-tabbar-item>
-        </router-link>
+<!--        <router-link to="/shop" replace>-->
+<!--          <van-tabbar-item>-->
+<!--            <i class="iconfont icon-shangcheng iconOne"></i>-->
+<!--            <div>商城</div>-->
+<!--          </van-tabbar-item>-->
+<!--        </router-link>-->
         <router-link to="/newMy" replace>
           <van-tabbar-item>
             <i class="iconfont icon-wode iconOne"></i>

src/pages/home/login.vue

@@ -42,6 +42,11 @@
       <span class="newColor" @click="agree()">《隐私服务协议》</span>
       <span class="newColor" @click="agree1()">《用户协议》</span>
     </div>
+    <van-overlay :show="show" @click="show = false">
+      <div class="wrapper">
+        <van-loading size="24px" vertical>正在登录...</van-loading>
+      </div>
+    </van-overlay>
   </div>
 </template>
 
@@ -64,6 +69,7 @@ export default {
       }
     };
     return {
+      show: false,
       checked: true,
       tel: "",
       psd: "",
@@ -129,43 +135,49 @@ export default {
     },
 
     submitForm() {
-      loginByPwd(this.LoginForm.tel, hex_md5(this.LoginForm.psd)).then(rs => {
-        var resp = rs.data;
-        if (this.checked != true) {
-          Toast("请同意隐私服务协议");
-          return;
-        }
+      this.show = true;
+      loginByPwd(this.LoginForm.tel, hex_md5(this.LoginForm.psd))
+        .then(rs => {
+          var resp = rs.data;
+          if (this.checked != true) {
+            Toast("请同意隐私服务协议");
+            return;
+          }
 
-        if (resp.state == 1 && this.checked == true) {
-          var user = resp.data.user;
-          var admin = resp.data.admin;
-          var org = resp.data.org;
-          var subscibe = resp.data.subscibe;
-          var config_list = resp.data.config_list;
-          var template_info = resp.data.template_info;
-          var filed_list = resp.data.filed_list;
+          if (resp.state == 1 && this.checked == true) {
+            this.show = false;
+            var user = resp.data.user;
+            var admin = resp.data.admin;
+            var org = resp.data.org;
+            var subscibe = resp.data.subscibe;
+            var config_list = resp.data.config_list;
+            var template_info = resp.data.template_info;
+            var filed_list = resp.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.$router.replace({ path: "/homeIndex" });
-        } else {
-          if (this.errorNum >= 2) {
-            this.showForgetPwdDialog();
-          } else {
-            this.errorNum = this.errorNum + 1;
-            this.$toast({
-              message: resp.msg
+            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.$router.replace({ path: "/homeIndex" });
+          } else {
+            if (this.errorNum >= 2) {
+              this.showForgetPwdDialog();
+            } else {
+              this.errorNum = this.errorNum + 1;
+              this.$toast({
+                message: resp.msg
+              });
+            }
           }
-        }
-      });
+        })
+        .catch(error => {
+          console.log(error);
+        });
     },
     showForgetPwdDialog() {
       Dialog.confirm({
@@ -259,6 +271,12 @@ export default {
     color: #fff;
     text-align: center;
   }
+  .wrapper {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
 }
 
 .el-form-item__error {

src/pages/homeIndex/index.vue

@@ -4,18 +4,18 @@
       <div class="homeTitle">
         <div class="homeTitleLeft" style="visibility: hidden" v-if="isCreateOrg == false">
           <van-dropdown-menu>
-            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr"/>
+            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr" />
           </van-dropdown-menu>
         </div>
-        <div class="homeTitleLeft"  v-if="isCreateOrg == true">
+        <div class="homeTitleLeft" v-if="isCreateOrg == true">
           <van-dropdown-menu>
-            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr"/>
+            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr" />
           </van-dropdown-menu>
         </div>
         <div class="homeTitleRight">
           <i class="iconfont icon-sousuo search1" @click="toSearch"></i>
           <!--<van-icon class="iconOne" name="comment-o"/>-->
-          <van-icon class="iconOne" name="add-o" @click="toCreateOrg"/>
+          <van-icon name="plus" class="iconOne" @click="toCreateOrg" />
         </div>
       </div>
     </van-sticky>
@@ -26,6 +26,7 @@
         </van-swipe-item>
       </van-swipe>
     </div>
+    <van-overlay :show="show" @click="show = false" />
     <!--<div class="noticeBox">-->
     <!--<i class="iconfont icon-public-notice notice"></i>-->
     <!--<div class="noticeNews">-->
@@ -96,10 +97,6 @@
       </div>
     </div>
 
-
-
-
-
     <div class="application">
       <div class="applicationTitle">
         <div class="applicationName">应用工作台</div>
@@ -125,6 +122,7 @@
   export default {
     data() {
       return {
+        show: false,
         value1: 0,
         isCreateOrg: false,
         isSubSuperAdmin:false,
@@ -242,6 +240,7 @@
             this.$router.push({ path: "/main" });
             break
           case 8:
+            this.$router.push({ path: "/shop" });
 
             break
           case 9:
@@ -475,6 +474,11 @@
     opacity: 0.5;
     filter: alpha(opacity=40);
   }
+  .van-overlay {
+    top: 3.125rem;
+    z-index: 9;
+  }
 }
 </style>
-<style lang="scss"></style>
+<style lang="scss">
+</style>

src/pages/main/RecordPage.vue

@@ -14,7 +14,10 @@
           </router-link>-->
           <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
           <span class="titleName">透析记录</span>
-          <van-icon class="icons" name="ellipsis" @click="show = true" />
+          <router-link to="/add_urgent_schedule">
+            <p class="order">临时排班</p>
+          </router-link>
+          <!-- <van-icon class="icons" name="ellipsis" @click="show = true" /> -->
         </div>
         <van-popup v-model="show" closeable position="top" :style="{ height: '200px' }">
           <div class="popupContent">

src/pages/main/add_urgent_schedule.vue

@@ -113,7 +113,7 @@
         </van-row>
       </div>
     </div>
-    <side-bar :active_index="0"></side-bar>
+    <!-- <side-bar :active_index="0"></side-bar> -->
     <van-popup v-model="show_patient_picker" position="bottom" class="popup">
       <van-picker :columns="patients" value-key="name" @change="didChangePatient"></van-picker>
     </van-popup>

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

@@ -2,25 +2,24 @@
   <div class="page_my">
     <div class="myTop">
       <img src="../../assets/images/myBanner.png" alt />
-      <router-link to="/myInfo">
         <div class="avatar">
           <img v-if="roleInfo.avatar != ''" :src="roleInfo.avatar" alt />
           <img
             v-if="roleInfo.avatar == ''"
-            src="../../assets/images/default_avatar.jpg"
+            src="../../assets/images/mydefault.png"
             alt
           />
         </div>
-        <div class="userMain">
+        <div class="userMain" @click="toMyIndex">
           <div class="userBox">
             <div class="userTxt">
-              <p class="userName">{{ roleInfo.user_name }}</p>
+              <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>
       <div class="invitebox">
         <img src="../../assets/images/invite.png" alt />
       </div>
@@ -35,15 +34,15 @@
       <router-link to="/ElectronicSignature">
         <div class="myInfo1">
           <div class="myInfoLeft">
-            <img src="../../assets/images/myIcon1.png" alt />
+            <img src="../../assets/images/myIcon9.png" alt />
             <p>电子签名</p>
           </div>
           <van-icon class="arrow" name="arrow" />
         </div>
       </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="myInfoRightBtn">管理</div>
-          <van-icon class="arrow" name="arrow" />
+        <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>
       </div>
     </div>
@@ -133,13 +123,21 @@
   </div>
 </template>
 <script>
-import { getMyInformation, LoginOut } from "@/api/patient/patient";
+import {
+  getMyInformation,
+  LoginOut,
+  getMyOrganazition,
+  getMyInforName
+} 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: [],
+      userName: {}
     };
   },
   methods: {
@@ -160,11 +158,30 @@ export default {
       getMyInformation(id).then(response => {
         if (response.data.state === 1) {
           var roleInfo = response.data.data.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;
+        }
+      });
+    },
+    getMyInforName(id) {
+      getMyInforName(id).then(response => {
+        if (response.data.state === 1) {
+          var Rolename = response.data.data.Rolename;
+          var username = response.data.data.Username;
+          this.userName = username;
+        }
+      });
+    },
     getTime(time) {
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
       return uParseTime(time, "{y}-{m}-{d}");
@@ -176,13 +193,20 @@ 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);
+    },
+    toEditOrg() {
+      this.$router.push("/newMy");
+    },
+    toMyIndex() {
+      this.$router.push("/myInfo?id=" + this.admin_user_id);
     }
   },
   created() {
     var adminid = this.$store.getters.user.user.id;
-    console.log("adminid", adminid);
     this.getMyInformation(adminid);
+    this.getMyOrganazition(adminid);
+    this.getMyInforName(adminid);
   }
 };
 </script>
@@ -206,7 +230,7 @@ export default {
       width: 4.375rem;
       height: 4.375rem;
       background: rgba(50, 50, 50, 1);
-      border: 2px solid rgba(255, 255, 255, 1);
+      // border: 2px solid rgba(255, 255, 255, 1);
       border-radius: 50%;
       img {
         border-radius: 50%;

src/pages/my/modifyingName.vue

@@ -3,15 +3,57 @@
     <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 { saveName, getMyInforName } from "@/api/patient/patient";
+export default {
+  data() {
+    return {
+      name: "",
+      admin_user_id: 0
+    };
+  },
+  methods: {
+    getMyInforName(id) {
+      getMyInforName(id).then(response => {
+        if (response.data.state === 1) {
+          var Rolename = response.data.data.Rolename;
+          var username = response.data.data.Username;
+          if (Rolename.user_name != "") {
+            this.name = Rolename.user_name;
+          }
+          if (Rolename.user_name == "") {
+            this.name = username.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.getMyInforName(id);
+    this.admin_user_id = id;
+  }
+};
+</script>
 <style lang="scss" scoped>
 .page_modifyingName {
   height: 100%;

src/pages/my/myInfo.vue

@@ -11,21 +11,19 @@
           <img v-if="roleInfo.avatar != ''" :src="roleInfo.avatar" alt />
           <img
             v-if="roleInfo.avatar == ''"
-            src="../../assets/images/default_avatar.jpg"
+            src="../../assets/images/mydefault.png"
             alt
           />
           <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">
@@ -73,7 +71,7 @@
 </template>
 
 <script>
-import { getMyInformation, SaveSex, SaveBirthday } from "@/api/patient/patient";
+import { getMyInforName, SaveSex, SaveBirthday } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 export default {
   data() {
@@ -86,7 +84,11 @@ export default {
       minDate: new Date(1900, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
-      roleInfo: {},
+      roleInfo: {
+        avatar: "",
+        user_name: "",
+        message: ""
+      },
       admin_user_id: "",
       form: {
         sex: ""
@@ -94,11 +96,11 @@ export default {
     };
   },
   methods: {
-    getMyInformation(id) {
-      getMyInformation(id).then(response => {
+    getMyInforName(id) {
+      getMyInforName(id).then(response => {
         if (response.data.state === 1) {
-          var roleInfo = response.data.data.roleInfo;
-          console.log("roleInfo", roleInfo);
+          var roleInfo = response.data.data.Rolename;
+          var username = response.data.data.Username;
           if (roleInfo.sex === 1) {
             this.sex = "男";
           }
@@ -106,14 +108,22 @@ export default {
             this.sex = "女";
           }
           this.birthday = this.getTime(roleInfo.birthday);
-
-          this.roleInfo = roleInfo;
+          this.roleInfo.user_name = roleInfo.user_name;
+          this.roleInfo.avatar = roleInfo.avatar;
+          this.roleInfo.message = roleInfo.message;
+          if (roleInfo.user_name == "") {
+            this.roleInfo.user_name = username.name;
+          }
+          this.userName = username;
         }
       });
     },
     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;
@@ -172,8 +182,8 @@ export default {
   },
   created() {
     var id = this.$route.query.id;
-    this.getMyInformation(id);
     this.admin_user_id = id;
+    this.getMyInforName(id);
   }
 };
 </script>

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/router/index.js

@@ -1,143 +1,140 @@
-import Vue from "vue";
-import Router from "vue-router";
+import Vue from 'vue'
+import Router from 'vue-router'
 
-Vue.use(Router);
+Vue.use(Router)
 
 export default new Router({
-  routes: [
-    {
-      path: "/",
-      name: "Home",
-      component: () => import("@/pages/home/verifyToken")
+  routes: [{
+      path: '/',
+      name: 'Home',
+      component: () => import('@/pages/home/verifyToken')
     },
     {
-      path: "/login",
-      name: "Home",
-      component: () => import("@/pages/home/login")
+      path: '/login',
+      name: 'Home',
+      component: () => import('@/pages/home/login')
     },
     {
-      path: "/nopassword",
-      name: "Home",
-      component: () => import("@/pages/home/noPassword")
+      path: '/nopassword',
+      name: 'Home',
+      component: () => import('@/pages/home/noPassword')
     },
     {
-      path: "/setname",
-      name: "Home",
-      component: () => import("@/pages/home/register/name")
+      path: '/setname',
+      name: 'Home',
+      component: () => import('@/pages/home/register/name')
     },
     {
-      path: "/register",
-      name: "Home",
-      component: () => import("@/pages/home/register/register")
+      path: '/register',
+      name: 'Home',
+      component: () => import('@/pages/home/register/register')
     },
     {
-      path: "/join",
-      name: "Home",
-      component: () => import("@/pages/home/noJoinedGroup")
+      path: '/join',
+      name: 'Home',
+      component: () => import('@/pages/home/noJoinedGroup')
     },
     {
-      path: "/forget",
-      name: "Home",
-      component: () => import("@/pages/home/forgetPassword")
+      path: '/forget',
+      name: 'Home',
+      component: () => import('@/pages/home/forgetPassword')
     },
     {
-      path: "/createorg",
-      name: "Home",
-      component: () => import("@/pages/home/createOrg")
+      path: '/createorg',
+      name: 'Home',
+      component: () => import('@/pages/home/createOrg')
     },
     // 首页
     {
-      path: "/myIndex",
-      name: "myIndex",
-      component: () => import("@/pages/home/index"),
-      children: [
-        {
-          path: "/homeIndex",
-          component: () => import("@/pages/homeIndex/index.vue"),
+      path: '/myIndex',
+      name: 'myIndex',
+      component: () => import('@/pages/home/index'),
+      children: [{
+          path: '/homeIndex',
+          component: () => import('@/pages/homeIndex/index.vue'),
           meta: {
             noCache: true // 不会被 <keep-alive> 缓存
           }
         },
         // 我的
         {
-          path: "/newMy",
-          name: "newMy",
-          component: () => import("@/pages/my/index")
+          path: '/newMy',
+          name: 'newMy',
+          component: () => import('@/pages/my/index')
         },
         // 商城
         {
-          path: "/shop",
-          name: "shop",
-          component: () => import("@/pages/shop/index")
+          path: '/shop',
+          name: 'shop',
+          component: () => import('@/pages/shop/index')
         }
       ]
     },
 
     {
-      path: "/perfectOrg",
-      component: () => import("@/pages/org"),
+      path: '/perfectOrg',
+      component: () => import('@/pages/org'),
       meta: {
         noCache: true // 不会被 <keep-alive> 缓存
       }
     },
     {
-      path: "/manageconsole",
-      name: "console",
-      component: () => import("@/pages/console/managementConsole")
+      path: '/manageconsole',
+      name: 'console',
+      component: () => import('@/pages/console/managementConsole')
     },
     {
-      path: "/manageconsole/staff",
-      name: "staff",
+      path: '/manageconsole/staff',
+      name: 'staff',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/staffManagement")
+        import('@/pages/console/managementConsole/staff_role/staffManagement')
     },
     {
-      path: "/staff/editstaff",
-      name: "editstaff",
+      path: '/staff/editstaff',
+      name: 'editstaff',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/editStaff")
+        import('@/pages/console/managementConsole/staff_role/editStaff')
     }, {
-      path: "/staff/addstaff",
-      name: "addstaff",
+      path: '/staff/addstaff',
+      name: 'addstaff',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/addStaff")
+        import('@/pages/console/managementConsole/staff_role/addStaff')
     },
 
     {
-      path: "/manageconsole/role",
-      name: "role",
+      path: '/manageconsole/role',
+      name: 'role',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/privilegeManagement")
+        import('@/pages/console/managementConsole/staff_role/privilegeManagement')
     },
 
-
     {
-      path: "/role/user",
-      name: "user",
+      path: '/role/user',
+      name: 'user',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/newUser")
+        import('@/pages/console/managementConsole/staff_role/newUser')
     },
 
     {
-      path: "/role/addnewuser",
-      name: "user",
+      path: '/role/addnewuser',
+      name: 'user',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/newAddStaff")
+        import('@/pages/console/managementConsole/staff_role/newAddStaff')
     }, {
-      path: "/role/stafflist",
-      name: "user",
+      path: '/role/stafflist',
+      name: 'user',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/employeeList")
-    },{
-      path: "/role/usermanage",
-      name: "user",
+        import('@/pages/console/managementConsole/staff_role/employeeList')
+    }, {
+      path: '/role/usermanage',
+      name: 'user',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/userManage")
-    },{
-      path: "/role/addrole",
-      name: "add_role",
+        import('@/pages/console/managementConsole/staff_role/userManage')
+    }, {
+      path: '/role/addrole',
+      name: 'add_role',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/newAddRole")
+        import('@/pages/console/managementConsole/staff_role/newAddRole')
     },
 
     //
@@ -148,134 +145,132 @@ export default new Router({
     //     import("@/pages/console/managementConsole/staff_role/privilegeManagement")
     // },
 
-
-
     {
-      path: "/role/editrole",
-      name: "editrole",
+      path: '/role/editrole',
+      name: 'editrole',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/editRole")
+        import('@/pages/console/managementConsole/staff_role/editRole')
     },
     {
-      path: "/role/subpurview",
-      name: "purview",
+      path: '/role/subpurview',
+      name: 'purview',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/subPurview")
+        import('@/pages/console/managementConsole/staff_role/subPurview')
     },
     {
-      path: "/role/otherpurview",
-      name: "purview",
+      path: '/role/otherpurview',
+      name: 'purview',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/otherPurview")
+        import('@/pages/console/managementConsole/staff_role/otherPurview')
     }, {
-      path: "/role/functionpurview",
-      name: "purview",
+      path: '/role/functionpurview',
+      name: 'purview',
       component: () =>
-        import("@/pages/console/managementConsole/staff_role/functionPurview")
+        import('@/pages/console/managementConsole/staff_role/functionPurview')
     },
     // 患者中心
     {
-      path: "/patients",
-      name: "patients",
-      component: () => import("@/pages/patientManagement/patientManagement")
+      path: '/patients',
+      name: 'patients',
+      component: () => import('@/pages/patientManagement/patientManagement')
     },
     // 新增病人
     {
-      path: "/addPatints",
-      name: "addpatients",
-      component: () => import("@/pages/patients/addPatient")
+      path: '/addPatints',
+      name: 'addpatients',
+      component: () => import('@/pages/patients/addPatient')
     },
     // 全部病程
     {
-      path: "/coursedetail",
-      name: "coursedetail",
-      component: () => import("@/pages/allCourseManagement/index")
+      path: '/coursedetail',
+      name: 'coursedetail',
+      component: () => import('@/pages/allCourseManagement/index')
     },
     // 全部干体重
     {
-      path: "/dryweight",
-      name: "dryweight",
-      component: () => import("@/pages/allDryWeight/index")
+      path: '/dryweight',
+      name: 'dryweight',
+      component: () => import('@/pages/allDryWeight/index')
     },
     // 基本信息
     {
-      path: "/editPatient",
-      name: "editPatient",
-      component: () => import("@/pages/patients/editPatient")
+      path: '/editPatient',
+      name: 'editPatient',
+      component: () => import('@/pages/patients/editPatient')
     },
     // 全部排班
     {
-      path: "/editScheduling",
-      name: "editscheduling",
-      component: () => import("@/pages/allScheduling/index")
+      path: '/editScheduling',
+      name: 'editscheduling',
+      component: () => import('@/pages/allScheduling/index')
     },
     // 全部透后宣教
     {
-      path: "/editEducation",
-      name: "editeducation",
-      component: () => import("@/pages/allEducation/index")
+      path: '/editEducation',
+      name: 'editeducation',
+      component: () => import('@/pages/allEducation/index')
     },
     // 全部抢救记录
     {
-      path: "/rescuerecord",
-      name: "rescuerecord",
-      component: () => import("@/pages/allRescue/index")
+      path: '/rescuerecord',
+      name: 'rescuerecord',
+      component: () => import('@/pages/allRescue/index')
     },
     //
     {
-      path: "/patientdetail",
-      name: "patientdetail",
-      component: () => import("@/pages/doctorAdvice/index")
+      path: '/patientdetail',
+      name: 'patientdetail',
+      component: () => import('@/pages/doctorAdvice/index')
     },
     // 搜索
     {
-      path: "/search",
-      name: "search",
-      component: () => import("@/pages/search/index")
+      path: '/search',
+      name: 'search',
+      component: () => import('@/pages/search/index')
     },
     // 我的信息
     {
-      path: "/myInfo",
-      name: "myInfo",
-      component: () => import("@/pages/my/myInfo")
+      path: '/myInfo',
+      name: 'myInfo',
+      component: () => import('@/pages/my/myInfo')
     },
     // 意见反馈
     {
-      path: "/feedBack",
-      name: "feedBack",
-      component: () => import("@/pages/my/feedBack")
+      path: '/feedBack',
+      name: 'feedBack',
+      component: () => import('@/pages/my/feedBack')
     },
     // 关于我们
     {
-      path: "/about",
-      name: "about",
-      component: () => import("@/pages/my/aboutUs")
+      path: '/about',
+      name: 'about',
+      component: () => import('@/pages/my/aboutUs')
     },
     // 公司介绍
     {
-      path: "/introduce",
-      name: "introduce",
-      component: () => import("@/pages/my/companyIntroduction")
+      path: '/introduce',
+      name: 'introduce',
+      component: () => import('@/pages/my/companyIntroduction')
     },
     // 更改名字
     {
-      path: "/editname",
-      name: "editname",
-      component: () => import("@/pages/my/modifyingName")
+      path: '/editname',
+      name: 'editname',
+      component: () => import('@/pages/my/modifyingName')
     },
     // 更改名字
     {
-      path: "/personalsign",
-      name: "personalsign",
-      component: () => import("@/pages/my/personalSign")
+      path: '/personalsign',
+      name: 'personalsign',
+      component: () => import('@/pages/my/personalSign')
     },
 
     // 全部长期透析记录
 
     {
-      path: "/alllongdialysis",
-      name: "longdialysis",
-      component: () => import("@/pages/allLongDialysis/index")
+      path: '/alllongdialysis',
+      name: 'longdialysis',
+      component: () => import('@/pages/allLongDialysis/index')
     },
     //,
     {
@@ -301,21 +296,27 @@ export default new Router({
       name: '/addgroup',
       component: () => import('@/pages/configureCenter/newGrouping')
     },
-    // 新增传位号
+    // 新增床位号
     {
       path: '/addbed',
       name: '/addbed',
       component: () => import('@/pages/configureCenter/newBed')
     },
+    // 我的页面管理
+    {
+      path: '/editorg',
+      name: '/editorg',
+      component: () => import('@/pages/patientCenter/editOrg/index')
+    },
     {
       path: '/organizationinfo',
       name: '/organizationinfo',
       component: () => import('@/pages/my/organizationInfo')
     },
     {
-      path: "/main",
-      name: "main",
-      component: () => import("@/pages/main/index"),
+      path: '/main',
+      name: 'main',
+      component: () => import('@/pages/main/index'),
       meta: {
         noCache: true // 不会被 <keep-alive> 缓存
       }
@@ -326,9 +327,9 @@ export default new Router({
       component: () => import('@/pages/product/index')
     },
     {
-      path: "/monitoring",
-      name: "monitorPage",
-      component: () => import("@/pages/monitoring/index")
+      path: '/monitoring',
+      name: 'monitorPage',
+      component: () => import('@/pages/monitoring/index')
     },
     {
       path: '/details',
@@ -398,6 +399,6 @@ export default new Router({
       path: '/modifypsw',
       name: 'modifyPassword',
       component: () => import('@/pages/my/modifyPassword')
-    },
+    }
   ]
 })

src/utils/request.js

@@ -1,4 +1,4 @@
-import axios from 'axios'
+import axios from "axios";
 // import { Toast } from 'mint-ui'
 import { Toast } from "vant";
 
@@ -6,16 +6,14 @@ import { Toast } from "vant";
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
   timeout: 30000, // request timeout
-  withCredentials: true,
-
-
-})
+  withCredentials: true
+});
 
 // respone interceptor
 service.interceptors.response.use(
   // response => response,
   response => {
-    const res = response.data
+    const res = response.data;
     if (res.state !== 1) {
       if (res.code === 6002) {
         // MessageBox.confirm('你已被登出，可以取消继续留在该页面，或者重新登录', '确定登出', {
@@ -27,21 +25,25 @@ service.interceptors.response.use(
         //     location.reload() // 为了重新实例化vue-router对象 避免bug
         //   })
         // })
-        Toast("登录超时")
-        location.reload()
-        return Promise.reject('error')
+        Toast("登录超时");
+        location.reload();
+        return Promise.reject("error");
       } else {
-        return response
+        return response;
       }
     } else {
-      return response
+      return response;
     }
   },
   error => {
-    if(error.message.includes('timeout')){   // 判断请求异常信息中是否含有超时timeout字符串
-      return Promise.reject(error);          // reject这个错误信息
+    console.log(error);
+    Toast(error);
+    if (error.message.includes("timeout")) {
+      // 判断请求异常信息中是否含有超时timeout字符串
+      return Promise.reject(error); // reject这个错误信息
     }
     return Promise.reject(error);
-  })
+  }
+);
 
-export default service
+export default service;