修改检验检查和返回

src/pages/console/managementConsole/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="page_managementConsole">
     <div class="managementConsoleTitle">
-      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">管理控制台</span>
     </div>
     <div class="consoleBox">
-      <div class="consoleOne"  @click="toStaffManage()">
-        <img src="../../../assets/images/A1.jpg" alt="" />
+      <div class="consoleOne" @click="toStaffManage()">
+        <img src="../../../assets/images/A1.jpg" alt />
         <div class="consoleRight">
           <div>
             <p class="rightName">员工管理</p>
@@ -16,7 +16,7 @@
         </div>
       </div>
       <div class="consoleOne" @click="toPermissionManage()">
-        <img src="../../../assets/images/A2.jpg" alt="" />
+        <img src="../../../assets/images/A2.jpg" alt />
         <div class="consoleRight">
           <div>
             <p class="rightName">权限管理</p>
@@ -26,17 +26,17 @@
         </div>
       </div>
       <!--<div class="consoleOne">-->
-        <!--<img src="../../../assets/images/A3.jpg" alt="" />-->
-        <!--<div class="consoleRight">-->
-          <!--<div>-->
-            <!--<p class="rightName">应用管理</p>-->
-            <!--<p class="rightTip">管理员可以添加或者停用应用</p>-->
-          <!--</div>-->
-          <!--<van-icon name="arrow" />-->
-        <!--</div>-->
+      <!--<img src="../../../assets/images/A3.jpg" alt="" />-->
+      <!--<div class="consoleRight">-->
+      <!--<div>-->
+      <!--<p class="rightName">应用管理</p>-->
+      <!--<p class="rightTip">管理员可以添加或者停用应用</p>-->
+      <!--</div>-->
+      <!--<van-icon name="arrow" />-->
+      <!--</div>-->
       <!--</div>-->
       <div class="consoleOne" @click="toOrgSetting()">
-        <img src="../../../assets/images/A4.jpg" alt="" />
+        <img src="../../../assets/images/A4.jpg" alt />
         <div class="consoleRight">
           <div>
             <p class="rightName">机构设置</p>
@@ -46,7 +46,7 @@
         </div>
       </div>
       <div class="consoleOne" @click="toSettingManage()">
-        <img src="../../../assets/images/A4.jpg" alt="" />
+        <img src="../../../assets/images/A4.jpg" alt />
         <div class="consoleRight">
           <div>
             <p class="rightName">配置管理</p>
@@ -57,38 +57,38 @@
       </div>
     </div>
     <!--<div class="transfer">-->
-      <!--<img src="../../../assets/images/A6.jpg" alt="" />-->
-      <!--<div class="transferRight">-->
-        <!--<p class="rightName">员工管理</p>-->
-        <!--<van-icon name="arrow" />-->
-      <!--</div>-->
+    <!--<img src="../../../assets/images/A6.jpg" alt="" />-->
+    <!--<div class="transferRight">-->
+    <!--<p class="rightName">员工管理</p>-->
+    <!--<van-icon name="arrow" />-->
+    <!--</div>-->
     <!--</div>-->
   </div>
 </template>
 <script>
-  // import "../libs/rem.js";
-  import { setRem } from "@/libs/functionRem";
-
-  export default {
-    methods: {
-      toStaffManage(){
-        console.log("11111")
-        this.$router.push({path: "/manageconsole/staff"});
-      },
-      toPermissionManage() {
-        this.$router.push({path: "/patients"});
-      },
-      toOrgSetting() {
-        this.$router.push({path: "/search"});
-      },
-      toSettingManage(){
-        this.$router.push({path: "/manageconsole"});
+// import "../libs/rem.js";
+import { setRem } from "@/libs/functionRem";
 
-      },
-    },create(){
-      setRem()
+export default {
+  methods: {
+    toStaffManage() {
+      console.log("11111");
+      this.$router.push({ path: "/manageconsole/staff" });
+    },
+    toPermissionManage() {
+      this.$router.push({ path: "/patients" });
+    },
+    toOrgSetting() {
+      this.$router.push({ path: "/search" });
+    },
+    toSettingManage() {
+      this.$router.push({ path: "/manageconsole" });
     }
-  };
+  },
+  create() {
+    setRem();
+  }
+};
 </script>
 
 

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

@@ -1,49 +1,26 @@
 <template>
   <div class="page_addStaff">
     <div class="editStaffTitle">
-      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">新增员工</span>
       <p>保存</p>
     </div>
     <div class="editStaffTip">必填</div>
     <div class="staffBox">
-      <van-field
-        v-model="text"
-        label="姓名"
-        clearable
-        placeholder="请输入姓名"
-      />
-      <van-field
-        v-model="tel"
-        type="tel"
-        label="手机号"
-        placeholder="请输入手机号"
-        clearable
-      />
+      <van-field v-model="text" label="姓名" clearable placeholder="请输入姓名" />
+      <van-field v-model="tel" type="tel" label="手机号" placeholder="请输入手机号" clearable />
       <van-cell class="newCell">
         <!-- 使用 title 插槽来自定义标题 -->
         <template slot="title">
           <span class="custom-title">角色</span>
           <div style="width:76%;margin-left:3.3rem">
             <van-checkbox-group v-model="result">
-              <van-checkbox style="width: 30%;" name="a" shape="square"
-                >医生</van-checkbox
-              >
-              <van-checkbox style="width: 30%;" name="b" shape="square"
-                >护士</van-checkbox
-              >
-              <van-checkbox style="width: 30%;" name="c" shape="square"
-                >运营</van-checkbox
-              >
-              <van-checkbox style="width: 30%;" name="d" shape="square"
-                >库存</van-checkbox
-              >
-              <van-checkbox style="width: 30%;" name="e" shape="square"
-                >院长</van-checkbox
-              >
-              <van-checkbox style="width: 40%;" name="f" shape="square"
-                >子管理员</van-checkbox
-              >
+              <van-checkbox style="width: 30%;" name="a" shape="square">医生</van-checkbox>
+              <van-checkbox style="width: 30%;" name="b" shape="square">护士</van-checkbox>
+              <van-checkbox style="width: 30%;" name="c" shape="square">运营</van-checkbox>
+              <van-checkbox style="width: 30%;" name="d" shape="square">库存</van-checkbox>
+              <van-checkbox style="width: 30%;" name="e" shape="square">院长</van-checkbox>
+              <van-checkbox style="width: 40%;" name="f" shape="square">子管理员</van-checkbox>
             </van-checkbox-group>
           </div>
         </template>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="page_editRole">
     <div class="editRoleTitle">
-      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">新增角色</span>
       <span>保存</span>
     </div>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="page_editStaff">
     <div class="editStaffTitle">
-      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">编辑员工</span>
       <p>保存</p>
     </div>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="page_newUser">
     <div class="newUserTitle">
-      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">新增角色</span>
     </div>
     <div class="newBox">

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

@@ -2,7 +2,7 @@
   <div class="page_privilegeManagement">
     <van-sticky>
       <div class="privilegeManagementTitle">
-        <i class="iconfont icon-zuojiantou jiantou"></i>
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
         <span class="titleName">权限管理</span>
         <div class="iconBox">
           <van-icon class="iconOne add" name="add-o" />
@@ -14,7 +14,7 @@
         <div>
           <div class="peopleTop">
             <div class="peopleImg">
-              <img src="../../assets/images/people1.jpg" alt="" />
+              <img src="../../assets/images/people1.jpg" alt />
             </div>
             <div class="peopleTitle">
               <p>医生</p>
@@ -30,7 +30,8 @@
               析治疗方案，定期评价病人的透析质量等...
             </p>
             <p class="hasUser">
-              该角色目前已配置<span style="color:#338AFB">0</span>个员工
+              该角色目前已配置
+              <span style="color:#338AFB">0</span>个员工
             </p>
           </div>
         </div>
@@ -43,7 +44,7 @@
         <div>
           <div class="peopleTop">
             <div class="peopleImg">
-              <img src="../../assets/images/people2.jpg" alt="" />
+              <img src="../../assets/images/people2.jpg" alt />
             </div>
             <div class="peopleTitle">
               <p>护士</p>
@@ -54,11 +55,10 @@
             </div>
           </div>
           <div class="peopleContent">
-            <p>
-              护士角色能够进行病人透析管理，以及医院的感染控 制与消毒记录等...
-            </p>
+            <p>护士角色能够进行病人透析管理，以及医院的感染控 制与消毒记录等...</p>
             <p class="hasUser">
-              该角色目前已配置<span style="color:#338AFB">0</span>个员工
+              该角色目前已配置
+              <span style="color:#338AFB">0</span>个员工
             </p>
           </div>
         </div>
@@ -71,7 +71,7 @@
         <div>
           <div class="peopleTop">
             <div class="peopleImg">
-              <img src="../../assets/images/people3.jpg" alt="" />
+              <img src="../../assets/images/people3.jpg" alt />
             </div>
             <div class="peopleTitle">
               <p>库存</p>
@@ -87,7 +87,8 @@
               退库的登记操作
             </p>
             <p class="hasUser">
-              该角色目前已配置<span style="color:#338AFB">0</span>个员工
+              该角色目前已配置
+              <span style="color:#338AFB">0</span>个员工
             </p>
           </div>
         </div>
@@ -100,7 +101,7 @@
         <div>
           <div class="peopleTop">
             <div class="peopleImg">
-              <img src="../../assets/images/people4.jpg" alt="" />
+              <img src="../../assets/images/people4.jpg" alt />
             </div>
             <div class="peopleTitle">
               <p>院长</p>
@@ -111,11 +112,10 @@
             </div>
           </div>
           <div class="peopleContent">
-            <p>
-              院长角色了解血透患者血液透析质量和相关的大数据，以及掌握透析中心整体运营情况
-            </p>
+            <p>院长角色了解血透患者血液透析质量和相关的大数据，以及掌握透析中心整体运营情况</p>
             <p class="hasUser">
-              该角色目前已配置<span style="color:#338AFB">0</span>个员工
+              该角色目前已配置
+              <span style="color:#338AFB">0</span>个员工
             </p>
           </div>
         </div>
@@ -128,7 +128,7 @@
         <div>
           <div class="peopleTop">
             <div class="peopleImg">
-              <img src="../../assets/images/people5.jpg" alt="" />
+              <img src="../../assets/images/people5.jpg" alt />
             </div>
             <div class="peopleTitle">
               <p>子管理员</p>
@@ -139,11 +139,10 @@
             </div>
           </div>
           <div class="peopleContent">
-            <p>
-              子管理员具备平台全部功能的使用权限 请谨慎配置
-            </p>
+            <p>子管理员具备平台全部功能的使用权限 请谨慎配置</p>
             <p class="hasUser">
-              该角色目前已配置<span style="color:#338AFB">0</span>个员工
+              该角色目前已配置
+              <span style="color:#338AFB">0</span>个员工
             </p>
           </div>
         </div>

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

@@ -2,7 +2,7 @@
   <div class="page_staffManagement">
     <van-sticky>
       <div class="staffManagementTitle">
-        <i class="iconfont icon-zuojiantou jiantou"></i>
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
         <span class="titleName">员工管理</span>
         <div class="iconBox" @click="goAddStaff()">
           <van-icon class="iconOne add" name="add-o" />

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -357,7 +357,7 @@ export default {
           this.doctor = doctor;
           console.log("医生", doctor);
           console.log("list", list);
-          this.doctorAdvice = list;
+          this.doctorAdvice = list.reverse();
           this.loading = false;
         }
       });

src/pages/doctorAdvice/components/Inspection.vue

@@ -23,23 +23,11 @@
       </div>
 
       <div class="adviceBox" v-show="showOne">
-        <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-        >
-          <div
-            class="adviceOne"
-            v-for="(item, index) in Inspection"
-            :key="index"
-          >
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了">
+          <div class="adviceOne" v-for="(item, index) in Inspection" :key="index">
             <div class="adviceTitle">
               <p>{{ getTime(item.inspect_date) }}</p>
-              <van-icon
-                class="ellipsis"
-                name="ellipsis"
-                @click="newShow = true"
-              />
+              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
             </div>
             <div class="orderContent">
               <p v-for="(it, i) in item.child" :key="i">{{ it }}</p>
@@ -61,23 +49,10 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup
-        v-model="typeShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
-        <van-picker
-          show-toolbar
-          :columns="columns"
-          @cancel="onCancel"
-          @confirm="onConfirm"
-        />
+      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
+        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
       </van-popup>
-      <van-popup
-        v-model="startShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
+      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -97,12 +72,7 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet
-        v-model="newShow"
-        :actions="actions"
-        cancel-text="取消"
-        @cancel="onCancel"
-      />
+      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
     </div>
   </div>
 </template>
@@ -248,7 +218,7 @@ export default {
             });
             item.child = arr;
           });
-          this.Inspection = list;
+          this.Inspection = list.reverse();
         }
       });
       this.finished = true;

src/pages/main/DetailsPage.vue

@@ -42,7 +42,7 @@
     <div class="add" @click="print">
       <p>打印预览</p>
     </div>
-    <side-bar :active_index="0"></side-bar>
+    <!-- <side-bar :active_index="0"></side-bar> -->
     <!-- <mt-datetime-picker
             v-model="pickerVisible"
             type="date"

src/pages/my/personalSign.vue

@@ -2,7 +2,7 @@
   <div class="page_personalSign">
     <div class="personalSignTitle">
       <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
-      <span class="titleName">修改姓名</span>
+      <span class="titleName">个性签名</span>
       <span>保存</span>
     </div>
     <div class="nameBox">

src/pages/patientCenter/allCheck/index.vue

@@ -168,10 +168,11 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .page_allCheck {
   overflow: hidden;
   height: 100%;
+  overflow-y: auto;
   .allCheckTitle {
     background: #fff;
     padding: 0 1.125rem;

src/pages/patientManagement/patientManagement.vue

@@ -2,7 +2,7 @@
   <div class="page_patientManagement">
     <van-sticky>
       <div class="patientManagementTitle">
-        <i class="iconfont icon-zuojiantou jiantou" @click="toback"></i>
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
         <span class="titleName">患者管理</span>
         <div class="iconBox" @click="addPatient">
           <van-icon class="iconOne add" name="add-o" />
@@ -10,23 +10,14 @@
       </div>
 
       <div class="searchBox">
-        <van-search
-          v-model="value"
-          placeholder="搜索患者透析号/姓名"
-          @search="SearchAllPatient"
-        />
+        <van-search v-model="value" placeholder="搜索患者透析号/姓名" @search="SearchAllPatient" />
       </div>
     </van-sticky>
     <div class="chooseBox">
       <van-tabs v-model="active">
         <van-tab title="全部患者">
           <div class="patientBox">
-            <van-list
-              v-model="loading"
-              finished-text="没有更多了"
-              @load="onLoad"
-              :finished="finished"
-            >
+            <van-list v-model="loading" finished-text="没有更多了" @load="onLoad" :finished="finished">
               <div
                 class="patientOne"
                 v-for="(item, index) in patients"
@@ -52,17 +43,8 @@
     </div>
     <!-- 弹出层 -->
     <div>
-      <van-popup
-        v-model="typeShow"
-        position="bottom"
-        :style="{ height: '40%' }"
-      >
-        <van-picker
-          show-toolbar
-          :columns="columns"
-          @cancel="onCancel"
-          @confirm="onConfirm"
-        />
+      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
+        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
       </van-popup>
     </div>
   </div>
@@ -158,9 +140,6 @@ export default {
     toPatientDetail(id) {
       this.$router.push("/patientdetail?patientid=" + id);
     },
-    toback() {
-      this.$router.push("/homeIndex");
-    },
     SearchAllPatient(val) {
       SearchAllPatient(val).then(response => {
         if (response.data.state === 1) {