修改样式

src/pages/advice/DialysisAdviceTable.vue

@@ -71,97 +71,98 @@
 
     <div style="width:100%;overflow:hildden;overflow-x:auto;" class="DialysisAdvice">
       <div class="blueBorder"></div>
-      <!--
+
       <table class="table">
-      <tr>
-        <th width="50px">姓名</th>
-        <th width="50px">透析号</th>
-        <th width="50px">期效</th>
-        <th width="100px">开始时间</th>
-        <th width="200px">医嘱内容</th>
-        <th width="50px">执行时间</th>
-        <th width="50px">执行护士</th>
-        <th width="50px">校对护士</th>
-        <th width="100px">校对时间</th>
-        <th width="50px">开嘱医生</th>
-        <th width="100px">开嘱时间</th>
-      </tr>
-      <template v-for="(schedules, zone_name, index) in filtedScheduals">
-        <tr :key="index">
-          <td>{{ zone_name }}</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+        <tr>
+          <th width="50px">姓名</th>
+          <th width="50px">透析号</th>
+          <th width="50px">期效</th>
+          <th width="100px">开始时间</th>
+          <th width="200px">医嘱内容</th>
+          <th width="50px">执行时间</th>
+          <th width="50px">执行护士</th>
+          <th width="50px">校对护士</th>
+          <th width="100px">校对时间</th>
+          <th width="50px">开嘱医生</th>
+          <th width="100px">开嘱时间</th>
         </tr>
-        <template v-for="schedule in schedules">
-          <template v-for="(group, group_index) in schedule.new_advice">
-            <tr v-for="(advice, advice_index) in group.advices" @click="clickfunction(schedule)">
-
-              <td
-                v-if="advice_index == 0"
-                :rowspan="group.advices.length"
-                style="color:#409eff;"
-              >{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
-              <td v-if="advice_index == 0" :rowspan="group.advices.length">
-                {{
-                advice.parent_id == 0 ? schedule.patient.dialysis_no : ""
-                }}
-              </td>
-              <td
-                v-if="advice_index == 0"
-                :rowspan="group.advices.length"
-              >{{ getAdaviceType(advice.advice_type, advice.parent_id) }}</td>
-              <td v-if="advice_index == 0" :rowspan="group.advices.length">
-                {{
-                advice.parent_id == 0
-                ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
-                : ""
-                }}
-              </td>
-              <td
-                :class="
+        <template v-for="(schedules, zone_name, index) in filtedScheduals">
+          <tr :key="index">
+            <td>{{ zone_name }}</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <template v-for="schedule in schedules">
+            <template v-for="(group, group_index) in schedule.new_advice">
+              <tr v-for="(advice, advice_index) in group.advices" @click="clickfunction(schedule)">
+                <td
+                  v-if="advice_index == 0"
+                  :rowspan="group.advices.length"
+                  style="color:#409eff;"
+                >{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
+                <td v-if="advice_index == 0" :rowspan="group.advices.length">
+                  {{
+                  advice.parent_id == 0 ? schedule.patient.dialysis_no : ""
+                  }}
+                </td>
+                <td
+                  v-if="advice_index == 0"
+                  :rowspan="group.advices.length"
+                >{{ getAdaviceType(advice.advice_type, advice.parent_id) }}</td>
+                <td v-if="advice_index == 0" :rowspan="group.advices.length">
+                  {{
+                  advice.parent_id == 0
+                  ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
+                  : ""
+                  }}
+                </td>
+                <td
+                  :class="
                     advice.parent_id == 0
                       ? 'advice_content'
                       : 'subadvice_content'
                   "
-              >
-                <span>{{ advice.advice_name }}</span>
-                <span>{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span>
-                <span v-if="advice.prescribing_number">
-                  {{ advice.prescribing_number
-                  }}{{ advice.prescribing_number_unit }}
-                </span>
-                <span v-if="advice.single_dose">
-                  单次用量 {{ advice.single_dose
-                  }}{{ advice.single_dose_unit }}
-                </span>
-                <span>{{ advice.delivery_way }}</span>
-                <span>{{ advice.execution_frequency }}</span>
-                <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
-              </td>
-              <td>{{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>
-              <td>{{ getName(advice.execution_staff) }}</td>
-              <td>{{ getName(advice.checker) }}</td>
-              <td>{{ parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
-              <td>{{ getName(advice.advice_doctor) }}</td>
-              <td>{{ parseTime(advice.created_time, "{m}-{d} {h}:{i}") }}</td>
-            </tr>
+                >
+                  <span>{{ advice.advice_name }}</span>
+                  <span>{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span>
+                  <span v-if="advice.prescribing_number">
+                    {{ advice.prescribing_number
+                    }}{{ advice.prescribing_number_unit }}
+                  </span>
+                  <span v-if="advice.single_dose">
+                    单次用量 {{ advice.single_dose
+                    }}{{ advice.single_dose_unit }}
+                  </span>
+                  <span>{{ advice.delivery_way }}</span>
+                  <span>{{ advice.execution_frequency }}</span>
+                  <span
+                    v-if="advice.parent_id == 0 && advice.remark.length > 0"
+                  >({{ advice.remark }})</span>
+                </td>
+                <td>{{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>
+                <td>{{ getName(advice.execution_staff) }}</td>
+                <td>{{ getName(advice.checker) }}</td>
+                <td>{{ parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
+                <td>{{ getName(advice.advice_doctor) }}</td>
+                <td>{{ parseTime(advice.created_time, "{m}-{d} {h}:{i}") }}</td>
+              </tr>
+            </template>
           </template>
         </template>
-      </template>
-      </table>-->
+      </table>
 
-      <!-- <div class="NoData" v-show="zones.length <= 1">
+      <div class="NoData" v-show="zones.length <= 1">
         <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
-      </div>-->
-      <el-table :data="date" border style="width: 100%">
+      </div>
+      <!-- <el-table :data="date" border style="width: 100%">
         <el-table-column fixed prop="date" label="姓名" width="100" align="center">
             <template slot-scope="scope">
                {{ scope.row.advice_name }}
@@ -177,7 +178,7 @@
         <el-table-column prop="zip" label="校对时间" width="200" align="center"></el-table-column>
         <el-table-column prop="zip" label="开嘱医生" width="200" align="center"></el-table-column>
         <el-table-column prop="zip" label="开嘱时间" width="200" align="center"></el-table-column>
-      </el-table>
+      </el-table>-->
     </div>
 
     <mt-datetime-picker
@@ -193,16 +194,16 @@
 </template>
 
 <script>
-import SideBar from '@/pages/layout/SideBar'
-import { parseTime } from '@/utils'
-import { getSchedualDoctors } from '@/api/advice'
+import SideBar from "@/pages/layout/SideBar";
+import { parseTime } from "@/utils";
+import { getSchedualDoctors } from "@/api/advice";
 
 export default {
-  name: 'DialysisAdviceTable',
+  name: "DialysisAdviceTable",
   components: {
     SideBar
   },
-  data () {
+  data() {
     return {
       selected_date: new Date(),
       admin_user: [],
@@ -210,153 +211,153 @@ export default {
       show_sch_type_selector: false,
       schedule_type_selected: 0,
       schedule_types: [
-        { value: 0, text: '全部班次' },
-        { value: 1, text: '上午' },
-        { value: 2, text: '下午' },
-        { value: 3, text: '晚上' }
+        { value: 0, text: "全部班次" },
+        { value: 1, text: "上午" },
+        { value: 2, text: "下午" },
+        { value: 3, text: "晚上" }
       ],
 
       show_zone_selector: false,
       zone_selected: 0,
       show_patient_type_selector: false,
-      zones: [{ value: 0, text: '全部分区', select: true }],
+      zones: [{ value: 0, text: "全部分区", select: true }],
 
       show_advice_type_selector: false,
       advice_type_selected: 0,
       advice_types: [
-        { value: 0, text: '全部医嘱' },
-        { value: 1, text: '长期医嘱' },
-        { value: 3, text: '临时医嘱' }
+        { value: 0, text: "全部医嘱" },
+        { value: 1, text: "长期医嘱" },
+        { value: 3, text: "临时医嘱" }
       ],
 
       patient_types: [
-        { value: 0, text: '全部病人' },
-        { value: 1, text: '我的病人' },
-        { value: 2, text: '未执行病人' }
+        { value: 0, text: "全部病人" },
+        { value: 1, text: "我的病人" },
+        { value: 2, text: "未执行病人" }
       ],
       patient_selected: 0,
 
       scheduleMap: {},
       tableData: []
-    }
+    };
   },
   computed: {
-    selected_date_str: function () {
-      return parseTime(this.selected_date, '{y}-{m}-{d}')
+    selected_date_str: function() {
+      return parseTime(this.selected_date, "{y}-{m}-{d}");
     },
-    filtedScheduals: function () {
-      var scheduleMap = new Object()
+    filtedScheduals: function() {
+      var scheduleMap = new Object();
       if (this.zone_selected == 0) {
         for (const key in this.scheduleMap) {
-          scheduleMap[key] = this.scheduleMap[key]
+          scheduleMap[key] = this.scheduleMap[key];
         }
       } else {
-        var zone_name = this.zones[this.zone_selected].text
-        scheduleMap[zone_name] = this.scheduleMap[zone_name]
+        var zone_name = this.zones[this.zone_selected].text;
+        scheduleMap[zone_name] = this.scheduleMap[zone_name];
       }
 
       if (this.schedule_type_selected != 0) {
-        var _scheduleMap = {}
+        var _scheduleMap = {};
         for (const key in scheduleMap) {
-          var origin_schedules = scheduleMap[key]
-          var schedules = []
+          var origin_schedules = scheduleMap[key];
+          var schedules = [];
           for (let index = 0; index < origin_schedules.length; index++) {
-            const schedule = origin_schedules[index]
+            const schedule = origin_schedules[index];
             if (schedule.schedule_type == this.schedule_type_selected) {
-              schedules.push(schedule)
+              schedules.push(schedule);
             }
           }
           if (schedules.length > 0) {
-            _scheduleMap[key] = schedules
+            _scheduleMap[key] = schedules;
           }
         }
 
-        scheduleMap = _scheduleMap
+        scheduleMap = _scheduleMap;
       }
       for (var key in scheduleMap) {
-        let mapArr = scheduleMap[key]
+        let mapArr = scheduleMap[key];
         for (let i = 0; i < mapArr.length; i++) {
-          mapArr[i]['new_advice'] = []
+          mapArr[i]["new_advice"] = [];
         }
       }
 
       for (var key in scheduleMap) {
-        let mapArr = scheduleMap[key]
+        let mapArr = scheduleMap[key];
         for (let i = 0; i < mapArr.length; i++) {
-          var maps = mapArr[i]
-          var resp_advices = maps.doctor_advice
+          var maps = mapArr[i];
+          var resp_advices = maps.doctor_advice;
           if (resp_advices.length > 0) {
-            var newGroupObject = function () {
+            var newGroupObject = function() {
               return Object.assign(
                 {},
                 {
                   group_no: 0,
                   advices: []
                 }
-              )
-            }
-            var initGroupBlock = function (group, advice) {
-              group.group_no = advice.groupno
-            }
+              );
+            };
+            var initGroupBlock = function(group, advice) {
+              group.group_no = advice.groupno;
+            };
 
-            var advice_groups = []
-            var group = newGroupObject()
+            var advice_groups = [];
+            var group = newGroupObject();
             for (let index = 0; index < resp_advices.length; index++) {
-              const advice = resp_advices[index]
+              const advice = resp_advices[index];
               if (advice.groupno == 0) {
                 // 老版本的医嘱
                 if (advice.parent_id > 0) {
                   if (advice_groups.length > 0) {
-                    var parent_group = advice_groups[advice_groups.length - 1]
+                    var parent_group = advice_groups[advice_groups.length - 1];
                     if (parent_group.advices.length > 0) {
                       if (parent_group.advices[0].id == advice.parent_id) {
-                        parent_group.advices.push(advice)
+                        parent_group.advices.push(advice);
                       }
                     }
                   }
-                  continue
+                  continue;
                 } else {
                   if (group.group_no > 0) {
-                    advice_groups.push(group)
-                    group = newGroupObject()
+                    advice_groups.push(group);
+                    group = newGroupObject();
                   }
 
-                  initGroupBlock(group, advice)
-                  group.advices.push(advice)
-                  advice_groups.push(group)
-                  group = newGroupObject()
-                  continue
+                  initGroupBlock(group, advice);
+                  group.advices.push(advice);
+                  advice_groups.push(group);
+                  group = newGroupObject();
+                  continue;
                 }
               } else {
                 if (group.group_no > 0 && group.group_no != advice.groupno) {
-                  advice_groups.push(group)
-                  group = newGroupObject()
+                  advice_groups.push(group);
+                  group = newGroupObject();
                 }
                 if (group.group_no == 0) {
-                  initGroupBlock(group, advice)
+                  initGroupBlock(group, advice);
                 }
                 if (group.group_no == advice.groupno) {
-                  group.advices.push(advice)
+                  group.advices.push(advice);
                 }
               }
             }
             if (group.group_no > 0) {
               // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-              advice_groups.push(group)
+              advice_groups.push(group);
             }
-            advice_groups = advice_groups
+            advice_groups = advice_groups;
           } else {
-            advice_groups = []
+            advice_groups = [];
           }
-          maps.new_advice = advice_groups
+          maps.new_advice = advice_groups;
         }
       }
 
-      return scheduleMap
+      return scheduleMap;
     }
   },
-  created () {
-    this.requestSchedualDoctors()
+  created() {
+    this.requestSchedualDoctors();
   },
   methods: {
     // getNumber: function (advice,schedule) {
@@ -370,115 +371,115 @@ export default {
     //   }
     //
     // },
-    clickfunction: function (val) {
+    clickfunction: function(val) {
       // console.log(val);
       this.$router.push({
-        path: '/details',
+        path: "/details",
         query: {
           patient_id: val.patient.id,
           date: this.selected_date.getTime() / 1000,
           patient_name: val.patient.name
         }
-      })
+      });
     },
-    handlePaitentType: function (index) {
-      this.patient_selected = index
-      this.show_patient_type_selector = false
-      this.requestSchedualDoctors()
+    handlePaitentType: function(index) {
+      this.patient_selected = index;
+      this.show_patient_type_selector = false;
+      this.requestSchedualDoctors();
     },
-    openPicker () {
-      this.$refs.picker.open()
+    openPicker() {
+      this.$refs.picker.open();
     },
-    getAdaviceType (type, parent_id) {
+    getAdaviceType(type, parent_id) {
       if (parent_id == 0) {
         if (type == 1) {
-          return '长嘱'
+          return "长嘱";
         } else if (type == 2) {
-          return '临嘱'
+          return "临嘱";
         } else if (type == 3) {
-          return '临嘱'
+          return "临嘱";
         }
       }
     },
-    getName (val) {
-      console.log(this.admin_user)
+    getName(val) {
+      console.log(this.admin_user);
 
       for (let i = 0; i < this.admin_user.length; i++) {
         if (this.admin_user[i].id == val) {
-          return this.admin_user[i].name
+          return this.admin_user[i].name;
         }
       }
     },
-    handletimeType: function (index) {
-      this.schedule_type_selected = index
-      this.show_sch_type_selector = false
+    handletimeType: function(index) {
+      this.schedule_type_selected = index;
+      this.show_sch_type_selector = false;
     },
-    handleAdviceType: function (index) {
-      this.advice_type_selected = index
-      this.show_advice_type_selector = false
-      this.requestSchedualDoctors()
+    handleAdviceType: function(index) {
+      this.advice_type_selected = index;
+      this.show_advice_type_selector = false;
+      this.requestSchedualDoctors();
     },
-    handleZoneChange: function (index) {
-      this.zone_selected = index
-      this.show_zone_selector = false
+    handleZoneChange: function(index) {
+      this.zone_selected = index;
+      this.show_zone_selector = false;
     },
-    parseTime: function (time, layout) {
+    parseTime: function(time, layout) {
       // console.log(time);
       if (time == 0) {
-        return ''
+        return "";
       }
-      return parseTime(time, layout)
+      return parseTime(time, layout);
     },
-    requestSchedualDoctors () {
+    requestSchedualDoctors() {
       getSchedualDoctors({
         date: this.selected_date_str,
         patient_type: this.patient_selected,
         advice_type: 2
       }).then(rs => {
-        var resp = rs.data
+        var resp = rs.data;
         if (resp.state == 1) {
-          this.admin_user = resp.data.adminUser
-          var schedules = resp.data.scheduals
-          console.log('schedules', schedules)
-          var zoneMap = {}
-          var scheduleMap = {}
+          this.admin_user = resp.data.adminUser;
+          var schedules = resp.data.scheduals;
+          console.log("schedules", schedules);
+          var zoneMap = {};
+          var scheduleMap = {};
           for (let index = 0; index < schedules.length; index++) {
-            const schedule = schedules[index]
+            const schedule = schedules[index];
             if (schedule.doctor_advice.length == 0) {
-              continue
+              continue;
             }
             if (scheduleMap[schedule.device_number.zone.name] == null) {
-              scheduleMap[schedule.device_number.zone.name] = []
+              scheduleMap[schedule.device_number.zone.name] = [];
             }
-            scheduleMap[schedule.device_number.zone.name].push(schedule)
+            scheduleMap[schedule.device_number.zone.name].push(schedule);
             if (zoneMap[schedule.device_number.zone.name] == null) {
               zoneMap[schedule.device_number.zone.name] =
-                schedule.device_number.zone
+                schedule.device_number.zone;
             }
           }
 
-          var zones = []
-          zones.push({ value: 0, text: '全部分区' })
+          var zones = [];
+          zones.push({ value: 0, text: "全部分区" });
           for (var zoneName in zoneMap) {
-            zones.push({ value: zoneMap[zoneName].id, text: zoneName })
+            zones.push({ value: zoneMap[zoneName].id, text: zoneName });
           }
 
-          zones = zones.sort(function (a, b) {
-            return a.value > b.value
-          })
-          this.zones = zones
+          zones = zones.sort(function(a, b) {
+            return a.value > b.value;
+          });
+          this.zones = zones;
 
-          this.scheduleMap = scheduleMap
+          this.scheduleMap = scheduleMap;
         } else {
           this.$toast({
             message: resp.msg
-          })
+          });
         }
-      })
+      });
     },
-    adviceDesc (advice) {}
+    adviceDesc(advice) {}
   }
-}
+};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>

src/pages/main/RecordPage.vue

@@ -240,7 +240,7 @@ export default {
       font-size: 0.45rem;
       margin: 0 0.2rem;
       height: 0.8rem;
-      line-height: 0.75rem;
+      line-height: 0.8rem;
       padding: 0 0.4rem;
       // color: $title-color;
       color: #fff;

src/pages/main/dialog/new_order/AddNewOrders.vue

@@ -34,7 +34,7 @@
               <label>开嘱时间 {{record_date_str}}</label>
             </div>
           </div>
-          <!-- <table class="table">
+          <table class="table">
             <tr>
               <th width="26%">医嘱内容</th>
               <th width="20%">药品规格</th>
@@ -91,8 +91,8 @@
                 <td></td>
               </tr>
             </template>
-          </table>-->
-          <el-table :data="advices" border style="width: 100%" :row-class-name="tableRowClassName" @row-click="clickAdviceAction">
+          </table>
+          <!-- <el-table :data="advices" border style="width: 100%" :row-class-name="tableRowClassName" @row-click="clickAdviceAction">
             <el-table-column fixed prop="date" label="医嘱内容" width="150">
               <template slot-scope="scope">
                    {{ scope.row.title }}
@@ -123,7 +123,7 @@
                   {{ scope.row.execution_frequency }}
               </template>
             </el-table-column>
-          </el-table>
+          </el-table>-->
         </div>
       </div>
     </div>
@@ -167,16 +167,16 @@
 </template>
 
 <script>
-import SingleOptionDialog from './single_option_dialog'
-import OrderFormDialog from './order_form'
-import AdviceTemplate from './select_advice_template_dialog'
-import { Toast } from 'vant'
-import { parseTime } from '@/utils'
-import { batchCreateAdvices } from '@/api/advice'
-import { setTimeout } from 'timers'
+import SingleOptionDialog from "./single_option_dialog";
+import OrderFormDialog from "./order_form";
+import AdviceTemplate from "./select_advice_template_dialog";
+import { Toast } from "vant";
+import { parseTime } from "@/utils";
+import { batchCreateAdvices } from "@/api/advice";
+import { setTimeout } from "timers";
 
 export default {
-  name: 'AddNewOrdersDialogContent',
+  name: "AddNewOrdersDialogContent",
   components: {
     SingleOptionDialog,
     OrderFormDialog,
@@ -194,147 +194,147 @@ export default {
     },
     advice_templates: {
       type: Array,
-      default: function () {
-        return []
+      default: function() {
+        return [];
       }
     },
     drug_spec_unit_options: {
       type: Array,
-      default: function () {
-        return []
+      default: function() {
+        return [];
       }
     },
     delivery_way_options: {
       type: Array,
-      default: function () {
-        return []
+      default: function() {
+        return [];
       }
     },
     execution_frequency_options: {
       type: Array,
-      default: function () {
-        return []
+      default: function() {
+        return [];
       }
     },
     single_dose_unit_options: {
       type: Array,
-      default: function () {
-        return []
+      default: function() {
+        return [];
       }
     },
     prescribing_number_unit_options: {
       type: Array,
-      default: function () {
-        return []
+      default: function() {
+        return [];
       }
     }
   },
-  data () {
+  data() {
     return {
       show_dialog_key: 0,
       loading: false,
 
-      record_date_str: '',
+      record_date_str: "",
       start_time: new Date(),
-      start_time_str: '',
+      start_time_str: "",
 
       selecting_advice_index: -1,
       selecting_subdrug_index: -1,
       advices: [],
       tableData: []
-    }
+    };
   },
-  mounted () {
-    this.record_date_str = parseTime(new Date(), '{y}-{m}-{d}')
+  mounted() {
+    this.record_date_str = parseTime(new Date(), "{y}-{m}-{d}");
     this.start_time_str =
-      parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
+      parseTime(this.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
   },
   methods: {
-    click (row, column, event) {
-      alert('aaa')
+    click(row, column, event) {
+      alert("aaa");
       // console.log(row)
       // console.log(column)
       // console.log(event)
     },
-    backAction: function () {
-      this.$emit('back-action')
+    backAction: function() {
+      this.$emit("back-action");
     },
-    addOrderByTemplateAction: function () {
-      this.show_dialog_key = 1
-      this.selecting_advice_index = -1
+    addOrderByTemplateAction: function() {
+      this.show_dialog_key = 1;
+      this.selecting_advice_index = -1;
     },
-    addNewOrderAction: function () {
-      this.show_dialog_key = 2
-      this.$refs.order_form.showWithNew()
-      this.selecting_advice_index = -1
+    addNewOrderAction: function() {
+      this.show_dialog_key = 2;
+      this.$refs.order_form.showWithNew();
+      this.selecting_advice_index = -1;
     },
     // clickAdviceAction: function (advice_index) {
     //   this.selecting_advice_index = advice_index
     //   this.selecting_subdrug_index = -1
     // },
 
-    tableRowClassName (row, rowIndex) {
-      row.index = rowIndex
+    tableRowClassName(row, rowIndex) {
+      row.index = rowIndex;
     },
-    clickAdviceAction (row, event, column) {
-      console.log(row.index)
-      this.selecting_advice_index = row.index
-      this.selecting_subdrug_index = -1
+    clickAdviceAction(row, event, column) {
+      console.log(row.index);
+      this.selecting_advice_index = row.index;
+      this.selecting_subdrug_index = -1;
     },
-    clickSubdrugAction: function (advice_index, subdrug_index) {
-      this.selecting_advice_index = advice_index
-      this.selecting_subdrug_index = subdrug_index
+    clickSubdrugAction: function(advice_index, subdrug_index) {
+      this.selecting_advice_index = advice_index;
+      this.selecting_subdrug_index = subdrug_index;
     },
-    modifyOrderAction: function () {
+    modifyOrderAction: function() {
       if (this.selecting_advice_index >= 0) {
         if (this.selecting_subdrug_index < 0) {
-          this.show_dialog_key = 2
+          this.show_dialog_key = 2;
           this.$refs.order_form.showWithEdit(
             this.advices[this.selecting_advice_index]
-          )
+          );
         } else {
-          this.show_dialog_key = 2
+          this.show_dialog_key = 2;
           this.$refs.order_form.showWithEdit(
             this.advices[this.selecting_advice_index].subdrugs[
               this.selecting_subdrug_index
             ]
-          )
+          );
         }
       } else {
-        Toast.fail('请先选择医嘱内容')
+        Toast.fail("请先选择医嘱内容");
       }
     },
-    deleteOrderAction: function () {
+    deleteOrderAction: function() {
       if (this.selecting_advice_index >= 0) {
         if (this.selecting_subdrug_index < 0) {
-          this.advices.splice(this.selecting_advice_index, 1)
-          this.selecting_advice_index = -1
+          this.advices.splice(this.selecting_advice_index, 1);
+          this.selecting_advice_index = -1;
         } else {
-          var advice = this.advices[this.selecting_advice_index]
-          advice.subdrugs.splice(this.selecting_subdrug_index, 1)
-          this.selecting_advice_index = -1
-          this.selecting_subdrug_index = -1
+          var advice = this.advices[this.selecting_advice_index];
+          advice.subdrugs.splice(this.selecting_subdrug_index, 1);
+          this.selecting_advice_index = -1;
+          this.selecting_subdrug_index = -1;
         }
       } else {
-        Toast.fail('请先选择医嘱内容')
+        Toast.fail("请先选择医嘱内容");
       }
     },
-    selectStartTimeAction: function () {
-      this.$refs.start_time_picker.open()
+    selectStartTimeAction: function() {
+      this.$refs.start_time_picker.open();
     },
-    comfirmAction: function () {
+    comfirmAction: function() {
       if (this.advices.length == 0) {
-        Toast.fail('请创建医嘱')
-        return
+        Toast.fail("请创建医嘱");
+        return;
       }
 
-      var data = {}
-      data.advice_type = 2
-      data.advice_date = this.record_date_str
-      data.start_time = this.start_time_str
-      var adviceJSONs = []
+      var data = {};
+      data.advice_type = 2;
+      data.advice_date = this.record_date_str;
+      data.start_time = this.start_time_str;
+      var adviceJSONs = [];
       for (let index = 0; index < this.advices.length; index++) {
-        const advice = this.advices[index]
+        const advice = this.advices[index];
         var json = {
           advice_name: advice.title,
           advice_desc: advice.advice_desc,
@@ -348,9 +348,9 @@ export default {
           execution_frequency: advice.execution_frequency,
           remark: advice.remark,
           subdrugs: []
-        }
+        };
         for (let s_i = 0; s_i < advice.subdrugs.length; s_i++) {
-          const subdrug = advice.subdrugs[s_i]
+          const subdrug = advice.subdrugs[s_i];
           json.subdrugs.push({
             advice_name: subdrug.title,
             advice_desc: subdrug.advice_desc,
@@ -360,49 +360,49 @@ export default {
             single_dose_unit: subdrug.single_dose_unit,
             prescribing_number: String(subdrug.prescribing_number),
             prescribing_number_unit: subdrug.prescribing_number_unit
-          })
+          });
         }
-        adviceJSONs.push(json)
+        adviceJSONs.push(json);
       }
 
-      data.adviceNames = adviceJSONs
+      data.adviceNames = adviceJSONs;
       // console.log(adviceJSONs)
 
-      this.loading = true
+      this.loading = true;
       batchCreateAdvices(this.patient_id, this.group_no, data)
         .then(rs => {
-          this.loading = false
-          var resp = rs.data
+          this.loading = false;
+          var resp = rs.data;
 
           if (resp.state == 1) {
             // 返回数组，清空数据，隐藏弹框
-            this.$emit('did-create-advices', resp.data.advices)
-            console.log('resp.data.advices', resp.data.advices)
-            var t = this
-            setTimeout(function () {
-              t.advices.splice(0, t.advices.length)
-              t.show_dialog_key = 0
-              t.selecting_advice_index = -1
-            }, 500)
+            this.$emit("did-create-advices", resp.data.advices);
+            console.log("resp.data.advices", resp.data.advices);
+            var t = this;
+            setTimeout(function() {
+              t.advices.splice(0, t.advices.length);
+              t.show_dialog_key = 0;
+              t.selecting_advice_index = -1;
+            }, 500);
           } else {
-            Toast.fail(resp.msg)
+            Toast.fail(resp.msg);
           }
         })
         .catch(err => {
-          this.loading = false
-          Toast.fail(err)
-        })
+          this.loading = false;
+          Toast.fail(err);
+        });
       // batchCreateAdvices()
     },
 
-    didSelectStartTime: function (time) {
-      this.start_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}') + ':00'
+    didSelectStartTime: function(time) {
+      this.start_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
     },
-    didSelectTemplateAdvice: function (resp_advices) {
-      this.show_dialog_key = 0
-      var advices = []
+    didSelectTemplateAdvice: function(resp_advices) {
+      this.show_dialog_key = 0;
+      var advices = [];
       for (let index = 0; index < resp_advices.length; index++) {
-        const adv = resp_advices[index]
+        const adv = resp_advices[index];
         if (adv.parent_id == 0) {
           advices.push({
             id: adv.id,
@@ -417,14 +417,14 @@ export default {
             prescribing_number: adv.prescribing_number,
             prescribing_number_unit: adv.prescribing_number_unit,
             subdrugs: []
-          })
+          });
         }
       }
       for (let r_a_i = 0; r_a_i < resp_advices.length; r_a_i++) {
-        const resp_adv = resp_advices[r_a_i]
+        const resp_adv = resp_advices[r_a_i];
         if (resp_adv.parent_id > 0) {
           for (let p_i = 0; p_i < advices.length; p_i++) {
-            const p_adv = advices[p_i]
+            const p_adv = advices[p_i];
             if (p_adv.id == resp_adv.parent_id) {
               var subdrug = {
                 id: resp_adv.id,
@@ -438,14 +438,14 @@ export default {
                 single_dose_unit: resp_adv.single_dose_unit,
                 prescribing_number: resp_adv.prescribing_number,
                 prescribing_number_unit: resp_adv.prescribing_number_unit
-              }
-              p_adv.subdrugs.push(subdrug)
-              break
+              };
+              p_adv.subdrugs.push(subdrug);
+              break;
             }
           }
         }
       }
-      this.advices.push(...advices)
+      this.advices.push(...advices);
     },
     // didSelectOrderTemplate: function(index) {
     //   this.show_dialog_key = 0;
@@ -506,45 +506,45 @@ export default {
     //   }
     //   this.advices.push(...advices);
     // },
-    didAddNewOrder: function (order) {
-      this.$refs.order_form.dismiss()
-      this.show_dialog_key = 0
-      order.id = 0
-      order.subdrugs = []
-      this.advices.push(order)
+    didAddNewOrder: function(order) {
+      this.$refs.order_form.dismiss();
+      this.show_dialog_key = 0;
+      order.id = 0;
+      order.subdrugs = [];
+      this.advices.push(order);
     },
-    didModifyOrder: function (order) {
-      this.$refs.order_form.dismiss()
-      this.show_dialog_key = 0
+    didModifyOrder: function(order) {
+      this.$refs.order_form.dismiss();
+      this.show_dialog_key = 0;
       if (this.selecting_advice_index >= 0) {
-        var advice = this.advices[this.selecting_advice_index]
+        var advice = this.advices[this.selecting_advice_index];
         if (this.selecting_subdrug_index < 0) {
-          advice.title = order.title
-          advice.advice_desc = order.advice_desc
+          advice.title = order.title;
+          advice.advice_desc = order.advice_desc;
           // advice.drug_spec = order.drug_spec;
-          advice.drug_spec_unit = order.drug_spec_unit
-          advice.delivery_way = order.delivery_way
-          advice.execution_frequency = order.execution_frequency
-          advice.single_dose = order.single_dose
-          advice.single_dose_unit = order.single_dose_unit
-          advice.prescribing_number = order.prescribing_number
-          advice.prescribing_number_unit = order.prescribing_number_unit
-          advice.remark = order.remark
+          advice.drug_spec_unit = order.drug_spec_unit;
+          advice.delivery_way = order.delivery_way;
+          advice.execution_frequency = order.execution_frequency;
+          advice.single_dose = order.single_dose;
+          advice.single_dose_unit = order.single_dose_unit;
+          advice.prescribing_number = order.prescribing_number;
+          advice.prescribing_number_unit = order.prescribing_number_unit;
+          advice.remark = order.remark;
         } else {
-          var subdrug = advice.subdrugs[this.selecting_subdrug_index]
-          subdrug.title = order.title
-          subdrug.advice_desc = order.advice_desc
+          var subdrug = advice.subdrugs[this.selecting_subdrug_index];
+          subdrug.title = order.title;
+          subdrug.advice_desc = order.advice_desc;
           // subdrug.drug_spec = order.drug_spec;
-          subdrug.drug_spec_unit = order.drug_spec_unit
-          subdrug.single_dose = order.single_dose
-          subdrug.single_dose_unit = order.single_dose_unit
-          subdrug.prescribing_number = order.prescribing_number
-          subdrug.prescribing_number_unit = order.prescribing_number_unit
+          subdrug.drug_spec_unit = order.drug_spec_unit;
+          subdrug.single_dose = order.single_dose;
+          subdrug.single_dose_unit = order.single_dose_unit;
+          subdrug.prescribing_number = order.prescribing_number;
+          subdrug.prescribing_number_unit = order.prescribing_number_unit;
         }
       }
     }
   }
-}
+};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>

src/pages/main/dialysis/AdviceTable.vue

@@ -65,7 +65,7 @@
         </li>
       </ul>
     </div>
-    <!-- <div style="width:100%;overflow:hildden;overflow-x:auto;" class="AdviceTable">
+    <div style="width:100%;overflow:hildden;overflow-x:auto;" class="AdviceTable">
       <table class="table" style>
         <tr>
           <th width="177px">期效</th>
@@ -92,7 +92,6 @@
         </tr>
         <template v-for="(group, group_index) in advice_groups">
           <tr v-for="(advice, advice_index) in group.advices" :key="advice.id">
-
             <td v-if="advice_index == 0" :rowspan="group.advices.length">
               <span v-if="advice.advice_type == 1">长嘱</span>
               <span v-if="advice.advice_type == 2">临嘱</span>
@@ -188,13 +187,12 @@
             </td>
           </tr>
         </template>
-
       </table>
       <div class="NoData" v-show="advice_groups.length == 0">
         <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
       </div>
-    </div>-->
-    <el-table :data="tableData" border style="width: 100%">
+    </div>
+    <!-- <el-table :data="tableData" border style="width: 100%">
       <el-table-column fixed prop="date" label="期效" width="100" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.advice_type == 1">长嘱</span>
@@ -299,7 +297,7 @@
           </span>
         </template>
       </el-table-column>
-    </el-table>
+    </el-table>-->
     <mt-datetime-picker
       ref="start_date_picker"
       type="date"
@@ -1529,11 +1527,11 @@ export default {
   // @media only screen and (min-width: 376px) and (max-width: 668px) {
   //   padding-top: 50px !important;
   // }
-  @media only screen and (min-width: 813px) and (max-width: 1024px) {
-    padding-top: 54px !important;
-  }
-  @media only screen and (min-width: 737px) and (max-width: 768px) {
-    padding-top: 76px !important;
+  // @media only screen and (min-width: 813px) and (max-width: 1024px) {
+  //   padding-top: 54px !important;
+  // }
+  @media only screen and (min-width: 768px) {
+    padding-top: 82px !important;
   }
   // @media only screen and (min-width: 415px) and (max-width: 736px) {
   //   padding-top: 48px !important;
@@ -1551,7 +1549,8 @@ export default {
       font-size: 0.32rem;
       color: $pgh-color;
       @media only screen and (min-width: 768px) {
-        width: 76%;
+        width: 98%;
+        font-size: 0.45rem;
       }
       li {
         @include display-flex;

src/pages/main/dialysis/CheckTab.vue

@@ -109,7 +109,7 @@ export default {
   //   top: 76px !important;
   // }
   @media only screen and (min-width: 768px) {
-    top: 116px !important;
+    top: 124px !important;
   }
   // @media only screen and (min-width: 813px) and (max-width: 1024px) {
   //   top: 117px !important;

src/pages/main/dialysis/DialysisTab.vue

@@ -63,11 +63,11 @@ export default {
   //   padding-top: 46px;
   // }
   @media only screen and (min-width: 768px) {
-    padding-top: 75px;
-  }
-  @media only screen and (min-width: 813px) and (max-width: 1024px) {
-    padding-top: 74px;
+    padding-top: 82px;
   }
+  // @media only screen and (min-width: 813px) and (max-width: 1024px) {
+  //   padding-top: 74px;
+  // }
   .nav {
     border-bottom: 1px #e5e5e5 solid;
     position: fixed;

src/pages/main/dialysis/InspectionItemTable.vue

@@ -264,7 +264,7 @@ export default {
 .table {
   width: 100%;
   overflow: hidden;
-  font-size: 0.3rem;
+  font-size: 0.45rem;
   text-align: center;
   border: $border-color;
   tr {
@@ -277,8 +277,8 @@ export default {
       color: #fff;
       padding: 0;
       margin: 0;
-      height: 0.88rem;
-      line-height: 0.88rem;
+      height: 1.2rem;
+      line-height: 1.2rem;
       font-weight: normal;
     }
     td {
@@ -311,7 +311,7 @@ export default {
   //   margin-top: 80px !important;
   // }
   @media only screen and (min-width: 768px) {
-    margin-top: 126px !important;
+    margin-top: 140px !important;
   }
   // @media only screen and (min-width: 813px) and (max-width: 1023px) {
   //   margin-top: 114px !important;

src/pages/main/dialysis/LongTable.vue

@@ -1,35 +1,39 @@
 <template>
   <div>
     <div class="blueBorder"></div>
-    <!-- <div class="tableTit">
-      <ul>
-        <li
-          v-for="(item,index) in ['序号','透析模式','透析时长','医生','更新日期','操作']"
-          :key="index"
-          :value="item.value"
-        >{{item}}</li>
-      </ul>
-    </div>
-    <div class="tableDate">
-      <van-list v-model="loading" :finished="finished" @load="onLoad">
-        <ul>
-          <li v-for="(item,index) in tableDate" :key="index" :value="item.value">
-            <span>{{item.no}}</span>
-            <span>{{item.mode_name}}</span>
-            <span>{{item.dialysis_duration_hour}}h {{item.dialysis_duration_minute}}min</span>
-            <span>{{tranDoctor(item.registrars_id)}}</span>
-            <span>{{item.edate}}</span>
-            <span @click="openEdit(index, item)">
-              <i class="iconfont">&#xe6f7;</i>修改
-            </span>
-          </li>
-        </ul>
-      </van-list>
-      <div class="NoData" v-show="tableDate.length == 0">
-        <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
+    <div class="scrollBox">
+      <div class="scrollTable">
+        <div class="tableTit">
+          <ul>
+            <li
+              v-for="(item,index) in ['序号','透析模式','透析时长','医生','更新日期','操作']"
+              :key="index"
+              :value="item.value"
+            >{{item}}</li>
+          </ul>
+        </div>
+        <div class="tableDate">
+          <van-list v-model="loading" :finished="finished" @load="onLoad">
+            <ul>
+              <li v-for="(item,index) in tableDate" :key="index" :value="item.value">
+                <span>{{item.no}}</span>
+                <span>{{item.mode_name}}</span>
+                <span>{{item.dialysis_duration_hour}}h {{item.dialysis_duration_minute}}min</span>
+                <span>{{tranDoctor(item.registrars_id)}}</span>
+                <span>{{item.edate}}</span>
+                <span @click="openEdit(index, item)">
+                  <i class="iconfont">&#xe6f7;</i>修改
+                </span>
+              </li>
+            </ul>
+          </van-list>
+          <div class="NoData" v-show="tableDate.length == 0">
+            <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
+          </div>
+        </div>
       </div>
-    </div>-->
-    <div class="newTable">
+    </div>
+    <!-- <div class="newTable">
       <el-table :data="tableDate" border style="width: 100%">
         <el-table-column fixed prop="date" label="序号" width="100" align="center">
             <template slot-scope="scope">
@@ -56,13 +60,8 @@
             {{scope.row.edate}}
           </template>
         </el-table-column>
-        <!-- <el-table-column label="操作" width="100">
-          <template slot-scope="scope">
-            <el-button @click="handleClick(scope.row)" type="text" size="small">修改</el-button>
-          </template>
-        </el-table-column> -->
       </el-table>
-    </div>
+    </div>-->
     <van-popup
       title="透析处方"
       v-model="showObj.showPopup"
@@ -339,18 +338,18 @@
 import {
   GetPatientDialysisSolutionList,
   EditDialysisSolution
-} from '@/api/patient'
-import { parseTime } from '@/utils'
-import { fetchAllAdminUsers } from '@/api/doctor'
-import { getDataConfig } from '@/utils/data'
-import CheckBoxSubMenu from '../dialog/subMenu/checkBoxSubMenu'
-import { Toast } from 'vant'
+} from "@/api/patient";
+import { parseTime } from "@/utils";
+import { fetchAllAdminUsers } from "@/api/doctor";
+import { getDataConfig } from "@/utils/data";
+import CheckBoxSubMenu from "../dialog/subMenu/checkBoxSubMenu";
+import { Toast } from "vant";
 
-let allno = 1
+let allno = 1;
 
 export default {
-  name: 'LongTable',
-  data () {
+  name: "LongTable",
+  data() {
     return {
       visibility: false,
       loading: false,
@@ -371,59 +370,59 @@ export default {
       },
       dialysisSolution: {
         id: 0,
-        mode: '',
-        mode_id: '',
-        mode_name: '',
-        dialysis_duration: '',
-        dialysis_duration_hour: '',
-        dialysis_duration_minute: '',
-        hemodialysis_machine: '',
-        perfusion_apparatus: '',
-        perfusion_apparatus_name: '',
-        blood_flow_volume: '',
-        dewater: '',
+        mode: "",
+        mode_id: "",
+        mode_name: "",
+        dialysis_duration: "",
+        dialysis_duration_hour: "",
+        dialysis_duration_minute: "",
+        hemodialysis_machine: "",
+        perfusion_apparatus: "",
+        perfusion_apparatus_name: "",
+        blood_flow_volume: "",
+        dewater: "",
         displace_liqui: 0,
-        replacement_way: '',
-        replacement_way_name: '',
-        anticoagulant: '',
-        anticoagulant_name: '',
-        anticoagulant_shouji: '',
-        anticoagulant_weichi: '',
-        anticoagulant_zongliang: '',
-        anticoagulant_gaimingcheng: '',
-        anticoagulant_gaijiliang: '',
-        target_ultrafiltration: '',
-        dialysate_formulation: '',
-        replacement_total: '',
-        kalium: '',
-        sodium: '',
-        calcium: '',
-        bicarbonate: '',
-        glucose: '',
-        dry_weight: '',
-        dialysate_flow: '',
-        dialysate_temperature: '',
-        conductivity: '',
-        doctor: '',
-        remark: ''
+        replacement_way: "",
+        replacement_way_name: "",
+        anticoagulant: "",
+        anticoagulant_name: "",
+        anticoagulant_shouji: "",
+        anticoagulant_weichi: "",
+        anticoagulant_zongliang: "",
+        anticoagulant_gaimingcheng: "",
+        anticoagulant_gaijiliang: "",
+        target_ultrafiltration: "",
+        dialysate_formulation: "",
+        replacement_total: "",
+        kalium: "",
+        sodium: "",
+        calcium: "",
+        bicarbonate: "",
+        glucose: "",
+        dry_weight: "",
+        dialysate_flow: "",
+        dialysate_temperature: "",
+        conductivity: "",
+        doctor: "",
+        remark: ""
       },
       anticoagulant: {
         id: 0,
-        name: '',
+        name: "",
         type: 1,
         shouji: 1,
         weichi: 1,
         zongliang: 1,
         gaimingcheng: -1,
         gaijiliang: -1,
-        shouji_unit: 'mg',
-        weichi_unit: 'mg/h',
-        zongliang_unit: 'mg',
-        gaimingcheng_unit: '',
-        gaijiliang_unit: ''
+        shouji_unit: "mg",
+        weichi_unit: "mg/h",
+        zongliang_unit: "mg",
+        gaimingcheng_unit: "",
+        gaijiliang_unit: ""
       },
       propForm: {
-        title: '',
+        title: "",
         list: [],
         optionList: [],
         isMultiple: 2,
@@ -434,326 +433,326 @@ export default {
       modeOption: [],
       dialysateFormulationOptions: [],
       anticoagulantsConfit: {},
-      timeValue: '',
-      time: '03:00',
-      record_date: ''
-    }
+      timeValue: "",
+      time: "03:00",
+      record_date: ""
+    };
   },
   methods: {
-    commitInfo: function () {
-      Toast.loading({ forbidClick: true, duration: 0 })
-      this.dialysisSolution.mode = this.dialysisSolution.mode_id
+    commitInfo: function() {
+      Toast.loading({ forbidClick: true, duration: 0 });
+      this.dialysisSolution.mode = this.dialysisSolution.mode_id;
       EditDialysisSolution(
         this.dialysisSolution.id,
         this.dialysisSolution
       ).then(response => {
         if (response.data.state == 0) {
-          Toast.fail(response.data.msg)
-          return false
+          Toast.fail(response.data.msg);
+          return false;
         } else {
-          Toast.success('修改成功')
+          Toast.success("修改成功");
           for (const key in response.data.data.solution) {
             this.tableDate[this.currentIndex][key] =
-              response.data.data.solution[key]
+              response.data.data.solution[key];
           }
-          this.popupDidHide()
+          this.popupDidHide();
         }
-      })
+      });
     },
-    openEdit (index, item) {
-      this.currentIndex = index
+    openEdit(index, item) {
+      this.currentIndex = index;
       for (var key in item) {
-        this.dialysisSolution[key] = item[key]
+        this.dialysisSolution[key] = item[key];
       }
 
       this.timeValue =
         this.dialysisSolution.dialysis_duration_hour +
-        '小时' +
+        "小时" +
         this.dialysisSolution.dialysis_duration_minute +
-        '分钟'
+        "分钟";
 
       this.time =
         (this.dialysisSolution.dialysis_duration_hour >= 10
           ? this.dialysisSolution.dialysis_duration_hour
-          : '0' + this.dialysisSolution.dialysis_duration_hour) +
-        ':' +
+          : "0" + this.dialysisSolution.dialysis_duration_hour) +
+        ":" +
         (this.dialysisSolution.dialysis_duration_minute >= 10
           ? this.dialysisSolution.dialysis_duration_minute
-          : '0' + this.dialysisSolution.dialysis_duration_minute)
+          : "0" + this.dialysisSolution.dialysis_duration_minute);
 
-      this.showObj.showPopup = true
+      this.showObj.showPopup = true;
 
       // document.getElementById('dialogTop').scrollTop = 200;
-      var dialogTop = document.querySelector('#dialogTop')
+      var dialogTop = document.querySelector("#dialogTop");
       if (dialogTop != null) {
         this.$nextTick(() => {
-          dialogTop.scrollTop = 0
-        })
+          dialogTop.scrollTop = 0;
+        });
       }
     },
-    popupDidHide () {
-      this.showObj.showPopup = false
-      this.visibility = false
-      this.showObj.showForm = true
+    popupDidHide() {
+      this.showObj.showPopup = false;
+      this.visibility = false;
+      this.showObj.showForm = true;
     },
-    openPicker: function () {
-      this.$refs.picker.open()
+    openPicker: function() {
+      this.$refs.picker.open();
     },
-    showSubMenu: function (val) {
+    showSubMenu: function(val) {
       switch (val) {
-        case 'mode':
-          this.propForm.type = 1
-          this.showObj.showForm = false
-          this.propForm.title = '透析模式'
-          this.visibility = true
-          this.propForm.list = []
-          this.propForm.optionList = this.modeOption
-          this.propForm.isMultiple = 1
-          this.propForm.selectId = this.dialysisSolution.mode_id
-          this.propForm.click_ref = 'mode'
-
-          break
-
-        case 'anticoagulant':
-          this.propForm.type = 5
-          this.showObj.showForm = false
-          this.propForm.title = '抗疑剂'
-          this.visibility = true
-          this.propForm.list = []
-          this.propForm.optionList = this.anticoagulantsConfit
-          this.propForm.isMultiple = 1
-          this.propForm.selectId = this.dialysisSolution.anticoagulant
-          this.propForm.click_ref = 'anticoagulant'
-          break
-        case 'dialysate_formulation':
-          this.propForm.type = 6
-          this.showObj.showForm = false
-          this.propForm.title = '透析液配方'
-          this.visibility = true
-          this.propForm.list = []
-          this.propForm.optionList = this.dialysateFormulationOptions
-          this.propForm.isMultiple = 1
-          this.propForm.selectId = this.dialysisSolution.dialysate_formulation
-          this.propForm.click_ref = 'dialysate_formulation'
-          break
+        case "mode":
+          this.propForm.type = 1;
+          this.showObj.showForm = false;
+          this.propForm.title = "透析模式";
+          this.visibility = true;
+          this.propForm.list = [];
+          this.propForm.optionList = this.modeOption;
+          this.propForm.isMultiple = 1;
+          this.propForm.selectId = this.dialysisSolution.mode_id;
+          this.propForm.click_ref = "mode";
+
+          break;
+
+        case "anticoagulant":
+          this.propForm.type = 5;
+          this.showObj.showForm = false;
+          this.propForm.title = "抗疑剂";
+          this.visibility = true;
+          this.propForm.list = [];
+          this.propForm.optionList = this.anticoagulantsConfit;
+          this.propForm.isMultiple = 1;
+          this.propForm.selectId = this.dialysisSolution.anticoagulant;
+          this.propForm.click_ref = "anticoagulant";
+          break;
+        case "dialysate_formulation":
+          this.propForm.type = 6;
+          this.showObj.showForm = false;
+          this.propForm.title = "透析液配方";
+          this.visibility = true;
+          this.propForm.list = [];
+          this.propForm.optionList = this.dialysateFormulationOptions;
+          this.propForm.isMultiple = 1;
+          this.propForm.selectId = this.dialysisSolution.dialysate_formulation;
+          this.propForm.click_ref = "dialysate_formulation";
+          break;
       }
     },
-    menuCancle: function () {
-      this.visibility = false
-      this.showObj.showForm = true
+    menuCancle: function() {
+      this.visibility = false;
+      this.showObj.showForm = true;
       this.$nextTick(() => {
         if (
           this.$refs[this.propForm.click_ref] != undefined &&
           this.$refs[this.propForm.click_ref] != null
         ) {
-          this.$refs[this.propForm.click_ref].scrollIntoView()
+          this.$refs[this.propForm.click_ref].scrollIntoView();
         }
-      })
+      });
     },
-    menuComfirm: function (val) {
-      this.visibility = false
-      this.showObj.showForm = true
+    menuComfirm: function(val) {
+      this.visibility = false;
+      this.showObj.showForm = true;
       this.$nextTick(() => {
         if (
           this.$refs[this.propForm.click_ref] != undefined &&
           this.$refs[this.propForm.click_ref] != null
         ) {
-          this.$refs[this.propForm.click_ref].scrollIntoView()
+          this.$refs[this.propForm.click_ref].scrollIntoView();
         }
-      })
+      });
       switch (val.type) {
         case 1:
-          this.dialysisSolution.mode_id = val.selectId
+          this.dialysisSolution.mode_id = val.selectId;
           this.dialysisSolution.mode_name = this.GetModeByModeId(
             this.dialysisSolution.mode_id
-          )
-          break
+          );
+          break;
 
         case 5:
-          this.dialysisSolution.anticoagulant = val.selectId
+          this.dialysisSolution.anticoagulant = val.selectId;
 
           if (
-            typeof this.anticoagulantsConfit[val.selectId] === 'undefined' ||
+            typeof this.anticoagulantsConfit[val.selectId] === "undefined" ||
             this.anticoagulantsConfit[val.selectId] == null
           ) {
-            return
+            return;
           }
-          this.anticoagulant = this.anticoagulantsConfit[val.selectId]
+          this.anticoagulant = this.anticoagulantsConfit[val.selectId];
 
-          break
+          break;
 
         case 6:
-          this.dialysisSolution.dialysate_formulation = val.selectId
+          this.dialysisSolution.dialysate_formulation = val.selectId;
 
-          break
+          break;
       }
     },
-    handleTimeConfirm: function (val) {
-      val = val.replace('小时')
-      val = val.replace('分钟')
-      let timeArray = val.split(':')
+    handleTimeConfirm: function(val) {
+      val = val.replace("小时");
+      val = val.replace("分钟");
+      let timeArray = val.split(":");
       if (parseInt(timeArray[0].substring(0, 1)) == 0) {
         this.dialysisSolution.dialysis_duration_hour = timeArray[0].charAt(
           timeArray[0].length - 1
-        )
+        );
       } else {
-        this.dialysisSolution.dialysis_duration_hour = timeArray[0]
+        this.dialysisSolution.dialysis_duration_hour = timeArray[0];
       }
 
       if (parseInt(timeArray[1].substring(0, 1)) == 0) {
         this.dialysisSolution.dialysis_duration_minute = timeArray[1].charAt(
           timeArray[1].length - 1
-        )
+        );
       } else {
-        this.dialysisSolution.dialysis_duration_minute = timeArray[1]
+        this.dialysisSolution.dialysis_duration_minute = timeArray[1];
       }
       this.timeValue =
         this.dialysisSolution.dialysis_duration_hour +
-        '小时' +
+        "小时" +
         this.dialysisSolution.dialysis_duration_minute +
-        '分钟'
+        "分钟";
       this.dialysisSolution.dialysis_duration =
         this.dialysisSolution.dialysis_duration_hour +
-        '.' +
-        this.dialysisSolution.dialysis_duration_minute
+        "." +
+        this.dialysisSolution.dialysis_duration_minute;
     },
-    GetModeByModeId: function (val) {
-      let treatment_mode_name = ''
-      let treatment_mode = this.modeOption
+    GetModeByModeId: function(val) {
+      let treatment_mode_name = "";
+      let treatment_mode = this.modeOption;
       for (let keys in treatment_mode) {
         if (treatment_mode[keys].id == val) {
-          treatment_mode_name = treatment_mode[keys].name
+          treatment_mode_name = treatment_mode[keys].name;
         }
       }
 
-      return treatment_mode_name
+      return treatment_mode_name;
     },
-    inputFocus: function (event) {
-      var input = event.target
-      setTimeout(function () {
-        input.scrollIntoView()
-      }, 0)
+    inputFocus: function(event) {
+      var input = event.target;
+      setTimeout(function() {
+        input.scrollIntoView();
+      }, 0);
 
       if (input.setSelectionRange) {
-        setTimeout(function () {
-          input.setSelectionRange(0, input.value.length)
-        }, 0)
+        setTimeout(function() {
+          input.setSelectionRange(0, input.value.length);
+        }, 0);
       } else if (input.createTextRange) {
-        var rng = input.createTextRange()
-        rng.move('character', input.value.length)
-        rng.select()
+        var rng = input.createTextRange();
+        rng.move("character", input.value.length);
+        rng.select();
       }
     },
-    lastInputBlur: function (event) {
-      var input = event.target
-      setTimeout(function () {
-        input.style.marginBottom = ''
-      }, 0)
+    lastInputBlur: function(event) {
+      var input = event.target;
+      setTimeout(function() {
+        input.style.marginBottom = "";
+      }, 0);
     },
-    lastInputFocus: function (event) {
-      var input = event.target
-      setTimeout(function () {
-        input.style.marginBottom = '2rem'
-        input.parentNode.scrollIntoView()
-      }, 0)
+    lastInputFocus: function(event) {
+      var input = event.target;
+      setTimeout(function() {
+        input.style.marginBottom = "2rem";
+        input.parentNode.scrollIntoView();
+      }, 0);
     },
-    GetDialysateFormulationById: function (val) {
-      let name = ''
-      let dfl = this.dialysateFormulationOptions.length
+    GetDialysateFormulationById: function(val) {
+      let name = "";
+      let dfl = this.dialysateFormulationOptions.length;
       for (let index = 0; index < dfl; index++) {
         if (this.dialysateFormulationOptions[index].id == val) {
-          name = this.dialysateFormulationOptions[index].name
-          break
+          name = this.dialysateFormulationOptions[index].name;
+          break;
         }
       }
-      return name
+      return name;
     },
-    GetAnticoagulantById: function (val) {
-      let anticoagulan_name = ''
-      let anticoagulant = this.anticoagulantsConfit
+    GetAnticoagulantById: function(val) {
+      let anticoagulan_name = "";
+      let anticoagulant = this.anticoagulantsConfit;
       for (let keys in anticoagulant) {
         if (anticoagulant[keys].id == val) {
-          anticoagulan_name = anticoagulant[keys].name
+          anticoagulan_name = anticoagulant[keys].name;
         }
       }
-      return anticoagulan_name
+      return anticoagulan_name;
     },
-    tranDoctor (id) {
+    tranDoctor(id) {
       if (id in this.adminUserOptions) {
-        return this.adminUserOptions[id].name
+        return this.adminUserOptions[id].name;
       } else {
-        return '未知'
+        return "未知";
       }
     },
-    fetchAllAdminUsers () {
+    fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
         if (response.data.state == 1) {
-          var ul = response.data.data.users.length
+          var ul = response.data.data.users.length;
           for (let index = 0; index < ul; index++) {
             this.adminUserOptions[response.data.data.users[index].id] =
-              response.data.data.users[index]
+              response.data.data.users[index];
           }
         }
-      })
+      });
     },
-    onLoad () {
+    onLoad() {
       // 异步更新数据
-      this.queryParams.page++
+      this.queryParams.page++;
       GetPatientDialysisSolutionList(this.queryParams).then(response => {
         if (response.data.state == 1) {
-          var sl = response.data.data.solutions.length
+          var sl = response.data.data.solutions.length;
           if (sl == 0) {
-            this.finished = true
+            this.finished = true;
           } else {
             for (let index = 0; index < sl; index++) {
-              var solution = response.data.data.solutions[index]
-              solution.no = allno
+              var solution = response.data.data.solutions[index];
+              solution.no = allno;
               solution.edate = parseTime(
                 solution.updated_time,
-                '{y}-{m}-{d} {h}:{i}'
-              )
-              allno++
-              this.tableDate.push(solution)
+                "{y}-{m}-{d} {h}:{i}"
+              );
+              allno++;
+              this.tableDate.push(solution);
             }
           }
-          this.loading = false
+          this.loading = false;
         }
-      })
+      });
     }
   },
-  created () {
-    allno = 1
-    this.fetchAllAdminUsers()
-    this.queryParams.id = this.$route.query.patient_id
-    this.onLoad()
+  created() {
+    allno = 1;
+    this.fetchAllAdminUsers();
+    this.queryParams.id = this.$route.query.patient_id;
+    this.onLoad();
 
-    this.modeOption = this.$store.getters.treatment_mode
+    this.modeOption = this.$store.getters.treatment_mode;
     this.dialysateFormulationOptions = getDataConfig(
-      'hemodialysis',
-      'dialysate_formulation'
-    )
-    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
-
-    var date = this.$route.query && this.$route.query.date
-    date *= 1000
-    var newDate = new Date(date)
-
-    var y = newDate.getFullYear()
-    var m = newDate.getMonth() + 1
-    var d = newDate.getDate()
+      "hemodialysis",
+      "dialysate_formulation"
+    );
+    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
+
+    var date = this.$route.query && this.$route.query.date;
+    date *= 1000;
+    var newDate = new Date(date);
+
+    var y = newDate.getFullYear();
+    var m = newDate.getMonth() + 1;
+    var d = newDate.getDate();
     if (isNaN(y) || isNaN(m) || isNaN(d)) {
-      newDate = new Date()
-      y = newDate.getFullYear()
-      m = newDate.getMonth() + 1
-      d = newDate.getDate()
+      newDate = new Date();
+      y = newDate.getFullYear();
+      m = newDate.getMonth() + 1;
+      d = newDate.getDate();
     }
     this.record_date =
-      y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
+      y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
   },
   components: {
     CheckBoxSubMenu
   }
-}
+};
 </script>
 
 <style style="stylesheet/scss" lang="scss"  scoped>
@@ -779,9 +778,9 @@ export default {
     li {
       @include flex;
       border-right: 2px #fff solid;
-      font-size: 0.3rem;
-      height: 0.88rem;
-      line-height: 0.88rem;
+      font-size: 0.45rem;
+      height: 1.2rem;
+      line-height: 1.2rem;
     }
     &:last-child {
       border-right: none;
@@ -794,9 +793,9 @@ export default {
   @include box-sizing;
   ul {
     li {
-      font-size: 0.3rem;
-      height: 0.88rem;
-      line-height: 0.88rem;
+      font-size: 0.45rem;
+      height: 1.2rem;
+      line-height: 1.2rem;
       @include display-flex;
       @include align-items-center;
       @include text-align;
@@ -807,8 +806,8 @@ export default {
         border-bottom: 2px #fff solid;
         background: #ecf5ff;
         display: inline-block;
-        height: 0.88rem;
-        line-height: 0.88rem;
+        height: 1.2rem;
+        line-height: 1.2rem;
         &:last-child {
           color: $main-color;
         }
@@ -824,6 +823,13 @@ export default {
     }
   }
 }
+.scrollBox {
+  width: 100%;
+  overflow: auto;
+  .scrollTable {
+    width: 768px;
+  }
+}
 </style>
 <style lang="scss">
 .newTable {

src/pages/main/dialysis/MissionTable.vue

@@ -21,15 +21,15 @@
       <div class="tableTit">
         <ul>
           <li style="width:10%;">序号</li>
-          <li style="width:15%;">日期</li>
-          <li style="width:75%;">宣教内容</li>
+          <li style="width:25%;">日期</li>
+          <li style="width:65%;">宣教内容</li>
         </ul>
       </div>
       <div class="tableDate">
         <ul v-for="(item,index) in tableDate" :key="index" :value="item.value">
           <li style="width:10%;">{{index+1}}</li>
-          <li style="width:15%;">{{parseTime(item.assessment_date, "{y}-{m}-{d}")}}</li>
-          <li style="width:75%;">{{item.mission}}</li>
+          <li style="width:25%;">{{parseTime(item.assessment_date, "{y}-{m}-{d}")}}</li>
+          <li style="width:65%;">{{item.mission}}</li>
         </ul>
       </div>
       <!--<div class="NoData" v-show="tableDate.length == 0"><img src="@/assets/login/data.jpg" alt=""></div>-->
@@ -248,9 +248,9 @@ export default {
     @include justify-content-center;
     li {
       border-right: 2px #fff solid;
-      font-size: 0.3rem;
-      height: 0.88rem;
-      line-height: 0.88rem;
+      font-size: 0.45rem;
+      height: 1.2rem;
+      line-height: 1.2rem;
     }
     &:last-child {
       border-right: none;
@@ -267,7 +267,7 @@ export default {
     @include text-align;
     @include justify-content-center;
     li {
-      font-size: 0.3rem;
+      font-size: 0.45rem;
       padding: 0.16rem 0;
       line-height: 0.5rem;
       border-right: 2px #fff solid;
@@ -277,8 +277,8 @@ export default {
         border-bottom: 2px #fff solid;
         background: #ecf5ff;
         display: inline-block;
-        height: 0.88rem;
-        line-height: 0.88rem;
+        height: 1.2rem;
+        line-height: 1.2rem;
         .iconfont {
           color: $main-color;
           font-size: 0.3rem;

src/pages/main/dialysis/RecordTable.vue

@@ -44,7 +44,7 @@
         </ul>
       </div>
       <div class="blueBorder"></div>
-      <!-- <div style="width:100%;overflow:hildden;overflow-x:auto;" class="RecordTable">
+      <div style="width:100%;overflow:hildden;overflow-x:auto;" class="RecordTable">
         <table class="table" style>
           <tr>
             <th width="124px">透析日期</th>
@@ -87,9 +87,8 @@
         <div class="NoData" v-show="tableDate.length == 0">
           <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
         </div>
-
-      </div>-->
-      <el-table :data="tableDate" border style="width: 100%">
+      </div>
+      <!-- <el-table :data="tableDate" border style="width: 100%">
         <el-table-column fixed prop="date" label="透析日期" width="100" align="center">
           <template slot-scope="scope">{{parseTime(scope.row.dialysis_date, "{y}-{m}-{d}")}}</template>
         </el-table-column>
@@ -146,7 +145,7 @@
         <el-table-column prop="city" label="治疗医生" width="120" align="center">
           <template slot-scope="scope">{{getName(scope.row.treatment_summary.zl_doctor)}}</template>
         </el-table-column>
-      </el-table>
+      </el-table>-->
     </van-list>
 
     <mt-datetime-picker

src/pages/main/dialysis/SchedulTable.vue

@@ -1,100 +1,101 @@
 <template>
-    <div>
-      <van-list
-        width="100%"
-        v-model="loading"
-        :finished="finished"
-        @load="onLoad"
-      >
-        <div class="blueBorder"></div>
-        <div class="tableTit " >
-                <ul>
-                    <li v-for="(item,index) in ['日期','班次','分区','机号','治疗模式']" :key="index" :value="item.value" >{{item}}</li>
-                </ul>
+  <div>
+    <van-list width="100%" v-model="loading" :finished="finished" @load="onLoad">
+      <div class="blueBorder"></div>
+      <div class="schedulTable">
+        <div class="tableTit">
+          <ul>
+            <li
+              v-for="(item,index) in ['日期','班次','分区','机号','治疗模式']"
+              :key="index"
+              :value="item.value"
+            >{{item}}</li>
+          </ul>
         </div>
-            <div class="tableDate" >
-                <ul>
-                    <li v-for="(item,index) in tableDate" :key="index" :value="item.value" >
-                    <span>{{parseTime(item.schedule_date, "{y}-{m}-{d}")}}</span>
-                    <span>{{scheduleType(item.schedule_type)}}</span>
-                    <span>{{item.zone.name}}</span>
-                    <span>{{item.bed.number}}</span>
-                    <span>{{item.mode.name}}</span>
-                    </li>
-                </ul>
-            </div>
-      </van-list>
-        <!--<div class="NoData" v-show="tableDate.length == 0"><img src="@/assets/login/data.jpg" alt=""></div>-->
-      <div class="NoData" v-show="tableDate.length == 0"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
-
+        <div class="tableDate">
+          <ul>
+            <li v-for="(item,index) in tableDate" :key="index" :value="item.value">
+              <span>{{parseTime(item.schedule_date, "{y}-{m}-{d}")}}</span>
+              <span>{{scheduleType(item.schedule_type)}}</span>
+              <span>{{item.zone.name}}</span>
+              <span>{{item.bed.number}}</span>
+              <span>{{item.mode.name}}</span>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </van-list>
+    <!--<div class="NoData" v-show="tableDate.length == 0"><img src="@/assets/login/data.jpg" alt=""></div>-->
+    <div class="NoData" v-show="tableDate.length == 0">
+      <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
     </div>
+  </div>
 </template>
 
 <script>
-  import {parseTime} from "@/utils"
-  import {getSchedualList} from '@/api/patient';
+import { parseTime } from "@/utils";
+import { getSchedualList } from "@/api/patient";
 export default {
   name: "LongTable",
-  created(){
-    this.tableDate=[]
+  created() {
+    this.tableDate = [];
     let params = {
-      page : this.page + 1,
+      page: this.page + 1,
       limit: this.limit,
       patient_id: this.$route.query.patient_id
-    }
-    getSchedualList(params).then(response =>{
-      if(response.data.state == 0){
+    };
+    getSchedualList(params).then(response => {
+      if (response.data.state == 0) {
         return false;
-      }else{
-        if(response.data.data.schedules.length == 0){
-
-        }else{
-          for(let i = 0; i < response.data.data.schedules.length;i++){
-            this.tableDate.push(response.data.data.schedules[i])
+      } else {
+        if (response.data.data.schedules.length == 0) {
+        } else {
+          for (let i = 0; i < response.data.data.schedules.length; i++) {
+            this.tableDate.push(response.data.data.schedules[i]);
           }
         }
       }
     });
-
   },
   data() {
     return {
       tableDate: [],
       loading: false,
       finished: false,
-      page:0,
-      limit:15,
+      page: 0,
+      limit: 15
     };
-
-  },  methods: {
+  },
+  methods: {
     parseTime(time, layout) {
-      return parseTime(time, layout)
-    },onLoad() {
-      this.page = this.page + 1
+      return parseTime(time, layout);
+    },
+    onLoad() {
+      this.page = this.page + 1;
       let params = {
-        page : this.page + 1,
+        page: this.page + 1,
         limit: this.limit,
         patient_id: this.$route.query.patient_id
-      }
-      getAllEducationList(params).then(response =>{
-        if(response.data.state == 0){
+      };
+      getAllEducationList(params).then(response => {
+        if (response.data.state == 0) {
           this.finished = true;
           this.loading = false;
           return false;
-        }else{
-          if(response.data.data.schedules.length == 0){
+        } else {
+          if (response.data.data.schedules.length == 0) {
             this.finished = true;
             this.loading = false;
-
-          }else{
-            for(let i = 0; i < response.data.data.schedules.length;i++){
-              this.tableDate.push(response.data.data.schedules[i])
+          } else {
+            for (let i = 0; i < response.data.data.schedules.length; i++) {
+              this.tableDate.push(response.data.data.schedules[i]);
             }
             this.loading = false;
           }
         }
       });
-    }, scheduleType(scheduleType) {
+    },
+    scheduleType(scheduleType) {
       var typeName = "";
       switch (scheduleType) {
         case 1:
@@ -111,27 +112,33 @@ export default {
           break;
       }
       return typeName;
-    },
+    }
   }
 };
 </script>
 
 <style style="stylesheet/scss" lang="scss"  scoped>
+.schedulTable {
+  width: 100%;
+  overflow: auto;
+}
 .tableTit {
   background: $main-color;
   color: $text-color;
   @include box-sizing;
+  width: 768px;
   ul {
     @include display-flex;
     @include align-items-center;
     @include text-align;
     @include justify-content-center;
+
     li {
       @include flex;
       border-right: 2px #fff solid;
-      font-size: 0.3rem;
-      height: 0.88rem;
-      line-height: 0.88rem;
+      font-size: 0.45rem;
+      height: 1.2rem;
+      line-height: 1.2rem;
     }
     &:last-child {
       border-right: none;
@@ -143,10 +150,11 @@ export default {
   color: $pgh-color;
   @include box-sizing;
   ul {
+    width: 768px;
     li {
-      font-size: 0.3rem;
-      height: 0.88rem;
-      line-height: 0.88rem;
+      font-size: 0.45rem;
+      height: 1.2rem;
+      line-height: 1.2rem;
       @include display-flex;
       @include align-items-center;
       @include text-align;
@@ -157,8 +165,8 @@ export default {
         border-bottom: 2px #fff solid;
         background: #ecf5ff;
         display: inline-block;
-        height: 0.88rem;
-        line-height: 0.88rem;
+        height: 1.2rem;
+        line-height: 1.2rem;
         .iconfont {
           color: $main-color;
           font-size: 0.3rem;

src/pages/main/today/dialysisMonitoring.vue

@@ -5,8 +5,8 @@
       <p>{{title}}</p>
       <span class="line"></span>
     </h2>
-    <!-- <div class="dm" style="width:100%;overflow:hildden;overflow-x:auto;">
-      <table  class="table" style="">
+    <div class="dm" style="width:100%;overflow:hildden;overflow-x:auto;">
+      <table class="table" style>
         <tr>
           <th v-if="isShow('监测时间')" width="124px">时间</th>
           <th v-if="isShow('体温')" width="80px">体温(℃)</th>
@@ -21,10 +21,10 @@
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if="isShow('置换率')" width="92px">置换率(L/h)</th>
-          <th v-if="isShow('置换量')"  width="92px">置换量(L)</th>
+          <th v-if="isShow('置换量')" width="92px">置换量(L)</th>
 
-          <th v-if="isShow('电导度')"  width="92px">电导度(mS/m)</th>
-          <th v-if="isShow('置换液流量')"  width="92px">置换液流量(ml/h)</th>
+          <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
+          <th v-if="isShow('置换液流量')" width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
           <th v-if="isShow('处理')" width="92px">处理</th>
           <th v-if="isShow('结果')" width="92px">结果</th>
@@ -32,7 +32,9 @@
         <tr v-for="(item,index) in tableDate" :key="index" :value="item.value">
           <td v-if="isShow('监测时间')">{{parseTime(item.operate_time, "{y}-{m}-{d} {h}:{i}")}}</td>
           <td v-if="isShow('体温')">{{item.temperature?item.temperature:''}}</td>
-          <td v-if="isShow('血压')">{{item.systolic_blood_pressure?item.systolic_blood_pressure:''}}/{{item.diastolic_blood_pressure?item.diastolic_blood_pressure:''}}</td>
+          <td
+            v-if="isShow('血压')"
+          >{{item.systolic_blood_pressure?item.systolic_blood_pressure:''}}/{{item.diastolic_blood_pressure?item.diastolic_blood_pressure:''}}</td>
 
           <td v-if="isShow('脉搏')">{{item.pulse_frequency?item.pulse_frequency:''}}</td>
           <td v-if="isShow('呼吸频率')">{{item.breathing_rate?item.breathing_rate:''}}</td>
@@ -44,17 +46,20 @@
           <td v-if="isShow('透析液温度')">{{item.dialysate_temperature?item.dialysate_temperature:''}}</td>
           <td v-if="isShow('置换率')">{{item.replacement_rate?item.replacement_rate:''}}</td>
           <td v-if="isShow('置换量')">{{item.displacement_quantity?item.displacement_quantity:''}}</td>
-          <th v-if="isShow('电导度')" >{{item.conductivity?item.conductivity:''}}</th>
-          <th v-if="isShow('置换液流量')" >{{item.displacement_flow_quantity?item.displacement_flow_quantity:''}}</th>
+          <th v-if="isShow('电导度')">{{item.conductivity?item.conductivity:''}}</th>
+          <th
+            v-if="isShow('置换液流量')"
+          >{{item.displacement_flow_quantity?item.displacement_flow_quantity:''}}</th>
           <td v-if="isShow('病情变化')">{{item.symptom}}</td>
           <td v-if="isShow('处理')">{{item.dispose}}</td>
           <td v-if="isShow('结果')">{{item.result}}</td>
         </tr>
       </table>
-      <div class="NoData" v-show="tableDate.length == 0"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
-
-    </div>-->
-    <el-table :data="tableDate" border style="width: 100%" ref="form">
+      <div class="NoData" v-show="tableDate.length == 0">
+        <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
+      </div>
+    </div>
+    <!-- <el-table :data="tableDate" border style="width: 100%" ref="form">
       <span v-if="isShow('监测时间')">
         <el-table-column fixed prop="date" label="时间" width="100" align="center">
           <template slot-scope="scope">{{parseTime(scope.row.operate_time, "{y}-{m}-{d} {h}:{i}")}}</template>
@@ -170,7 +175,7 @@
           <template slot-scope="scope">{{scope.row.result}}</template>
         </el-table-column>
       </span>
-    </el-table>
+    </el-table>-->
   </div>
 </template>
 

src/pages/main/today/statOrder.vue

@@ -6,7 +6,7 @@
       <span class="line"></span>
     </h2>
 
-    <!-- <div class="newDiv">
+    <div class="newDiv">
       <table class="table">
         <tr>
           <th width="12%">开嘱医生</th>
@@ -52,11 +52,12 @@
           </tr>
         </template>
       </table>
+
+      <div class="NoData" v-show="advice_groups.length == 0">
+        <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
+      </div>
     </div>
-    <div class="NoData" v-show="advice_groups.length == 0">
-      <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
-    </div>-->
-    <el-table :data="tableDate" border style="width: 100%">
+    <!-- <el-table :data="tableDate" border style="width: 100%">
       <el-table-column fixed label="开嘱医生" width="100">
         <template
           slot-scope="scope"
@@ -88,21 +89,21 @@
           slot-scope="scope"
         >{{scope.row.checker != 0 ? (doctor_map[scope.row.checker] != undefined ? doctor_map[scope.row.checker].name : "") : ""}}</template>
       </el-table-column>
-    </el-table>
+    </el-table>-->
   </div>
 </template>
 
 <script>
-import { parseTime } from '@/utils'
+import { parseTime } from "@/utils";
 
 export default {
-  name: 'statOrder',
-  data () {
+  name: "statOrder",
+  data() {
     return {
-      title: '临时医嘱 ',
+      title: "临时医嘱 ",
       template_id: 0,
       tableDate: []
-    }
+    };
   },
   props: {
     doctor_map: {
@@ -111,94 +112,93 @@ export default {
     advice_groups: {
       type: Array,
       default: () => {
-        return []
+        return [];
       }
     }
   },
 
   methods: {
-    setAdvices (advices) {
+    setAdvices(advices) {
       if (advices == null) {
-        advices = []
+        advices = [];
       }
-      this.tableDate.splice(0, this.tableDate.length)
-      this.tableDate.push(...advices)
+      this.tableDate.splice(0, this.tableDate.length);
+      this.tableDate.push(...advices);
     },
-    parseTime (time, layout) {
+    parseTime(time, layout) {
       if (time == 0) {
-        return ''
+        return "";
       }
-      return parseTime(time, layout)
+      return parseTime(time, layout);
     },
-    createMedicalOrder (row) {
+    createMedicalOrder(row) {
       if (row.parent_id > 0) {
-        var spliceIndex = -1
+        var spliceIndex = -1;
         for (let index = this.tableDate.length - 1; ; index--) {
           if (this.tableDate[index].parent_id === row.parent_id) {
-            spliceIndex = index
-            break
+            spliceIndex = index;
+            break;
           } else if (this.tableDate[index].id === row.parent_id) {
-            spliceIndex = index
-            break
+            spliceIndex = index;
+            break;
           }
         }
         if (spliceIndex > -1) {
-          spliceIndex += 1
+          spliceIndex += 1;
           if (spliceIndex === this.tableDate.length) {
-            this.tableDate.push(row)
+            this.tableDate.push(row);
           } else {
-            var swapData = this.tableDate.splice(spliceIndex)
-            this.tableDate.push(row)
-            this.tableDate = this.tableDate.concat(swapData)
+            var swapData = this.tableDate.splice(spliceIndex);
+            this.tableDate.push(row);
+            this.tableDate = this.tableDate.concat(swapData);
           }
         }
       } else {
-        this.tableDate.unshift(row)
+        this.tableDate.unshift(row);
       }
     },
-    delMedicalOrder (row) {
+    delMedicalOrder(row) {
       if (row.parent_id > 0) {
-        var rslen = this.tableDate.length
+        var rslen = this.tableDate.length;
         for (let i = 0; i < rslen; i++) {
           if (this.tableDate[i].id == row.id) {
-            this.tableDate.splice(i, 1)
-            break
+            this.tableDate.splice(i, 1);
+            break;
           }
         }
       } else {
-        var resetTableData = this.tableDate
-        this.tableDate = []
-        var that = this
-        var rslen = resetTableData.length
+        var resetTableData = this.tableDate;
+        this.tableDate = [];
+        var that = this;
+        var rslen = resetTableData.length;
         for (let i = 0; i < rslen; i++) {
           if (
             resetTableData[i].id != row.id &&
             resetTableData[i].parent_id != row.id
           ) {
-            that.tableDate.push(resetTableData[i])
+            that.tableDate.push(resetTableData[i]);
           }
         }
       }
     },
-    executionMedicalOrder (row) {
-      var alen = this.tableDate.length
+    executionMedicalOrder(row) {
+      var alen = this.tableDate.length;
       for (let index = 0; index < alen; index++) {
         if (this.tableDate[index].id == row.id) {
-          this.tableDate[index].execution_state = 1
-          this.tableDate[index].execution_staff = row.execution_staff
-          this.tableDate[index].execution_time = row.execution_time
-          this.tableDate[index].checker = row.checker
-          break
+          this.tableDate[index].execution_state = 1;
+          this.tableDate[index].execution_staff = row.execution_staff;
+          this.tableDate[index].execution_time = row.execution_time;
+          this.tableDate[index].checker = row.checker;
+          break;
         }
       }
     }
   },
-  created () {
-    this.template_id = this.$store.getters.user.template_info.template_id
-    console.log('this是什么东西', this.advice_groups)
+  created() {
+    this.template_id = this.$store.getters.user.template_info.template_id;
+    console.log("this是什么东西", this.advice_groups);
   }
-}
-
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

src/pages/monitoring/index.vue

@@ -62,110 +62,76 @@
           </li>
         </ul>
       </div>
-      <van-list
-        v-model="loading"
-        :finished="finished"
-        finished-text="  "
-        @load="onLoad"
-      >
+      <van-list v-model="loading" :finished="finished" finished-text="  " @load="onLoad">
         <div class="blueBorder"></div>
         <table class="table">
           <tr>
-            <th width="10%">姓名</th>
-            <th width="8%">机号</th>
+            <th width="8%">姓名</th>
+            <th width="6%">机号</th>
             <th width="9%">透析号</th>
-            <th width="13%">排班时间</th>
+            <th width="10%">排班时间</th>
             <th width="10%">透析模式</th>
             <th width="9%">脱水量</th>
-            <th width="14%">体重(透前/透后)</th>
-            <th width="27%">监控预警(血压/心率)</th>
+            <th width="10%">体重(透前/透后)</th>
+            <th width="28%">监控预警(血压/心率)</th>
           </tr>
         </table>
 
-        <table
-          class="table"
-          v-for="(items, index) in dialysis_scheduals"
-          :key="index"
-        >
+        <table class="table" v-for="(items, index) in dialysis_scheduals" :key="index">
           <tr v-if="items.zone_name.length > 0">
             <td width="8%">{{ items.zone_name }}</td>
-            <td width="8%"></td>
+            <td width="6%"></td>
             <td width="9%"></td>
-            <td width="13%"></td>
+            <td width="10%"></td>
             <td width="10%"></td>
             <td width="9%"></td>
-            <td width="14%"></td>
-            <td width="27%"></td>
+            <td width="10%"></td>
+            <td width="28%"></td>
           </tr>
-          <tr
-            v-for="(item, index) in items.scheduals"
-            :key="index"
-            @click="clickfunction(item)"
-          >
-            <td width="10%" style="color:#409eff;">{{ item.patient.name }}</td>
-            <td width="8%">
+          <tr v-for="(item, index) in items.scheduals" :key="index" @click="clickfunction(item)">
+            <td width="8%" style="color:#409eff;">{{ item.patient.name }}</td>
+            <td width="6%">
               {{
-                item.dialysis_order.device_number.number.length > 0
-                  ? item.dialysis_order.device_number.number
-                  : item.device_number.number
+              item.dialysis_order.device_number.number.length > 0
+              ? item.dialysis_order.device_number.number
+              : item.device_number.number
               }}
             </td>
 
             <td width="9%">{{ item.patient.dialysis_no }}</td>
-            <td width="13%">
-              {{ parseTime(item.schedule_date, "{y}-{m}-{d}") }}
-            </td>
+            <td width="10%">{{ parseTime(item.schedule_date, "{y}-{m}-{d}") }}</td>
             <td width="10%">{{ item.treatment_mode.name }}</td>
             <td width="9%">
               {{
-                item.prescription.dewater_amount
-                  ? item.prescription.dewater_amount
-                  : ""
+              item.prescription.dewater_amount
+              ? item.prescription.dewater_amount
+              : ""
               }}
             </td>
-            <td width="14%">
+            <td width="10%">
               {{
-                item.assessment_before_dislysis.weight_before
-                  ? item.assessment_before_dislysis.weight_before
-                  : ""
+              item.assessment_before_dislysis.weight_before
+              ? item.assessment_before_dislysis.weight_before
+              : ""
               }}/{{
-                item.assessment_after_dislysis.weight_after
-                  ? item.assessment_after_dislysis.weight_after
-                  : ""
+              item.assessment_after_dislysis.weight_after
+              ? item.assessment_after_dislysis.weight_after
+              : ""
               }}
             </td>
-            <td width="27%">
-              <span
-                v-if="monitorBloodPressureStatus(item.monitoring_record) == 1"
-                >低压</span
-              >
-              <span
-                v-if="monitorBloodPressureStatus(item.monitoring_record) == 2"
-                >正常</span
-              >
-              <span
-                v-if="monitorBloodPressureStatus(item.monitoring_record) == 3"
-                >高压</span
-              >
-              <span v-if="monitorRateStatus(item.monitoring_record) == 1"
-                >心率过缓</span
-              >
-              <span v-if="monitorRateStatus(item.monitoring_record) == 2"
-                >正常</span
-              >
-              <span v-if="monitorRateStatus(item.monitoring_record) == 3"
-                >心率过高</span
-              >
+            <td width="28%">
+              <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 1">低压</span>
+              <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 2">正常</span>
+              <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 3">高压</span>
+              <span v-if="monitorRateStatus(item.monitoring_record) == 1">心率过缓</span>
+              <span v-if="monitorRateStatus(item.monitoring_record) == 2">正常</span>
+              <span v-if="monitorRateStatus(item.monitoring_record) == 3">心率过高</span>
             </td>
           </tr>
         </table>
 
         <div class="NoData" v-show="dialysis_scheduals.length == 0">
-          <img
-            style="margin-top: 50px; margin-bottom: 50px"
-            src="@/assets/login/data.jpg"
-            alt
-          />
+          <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
         </div>
       </van-list>
       <!-- <div class="monitoringTable">
@@ -224,7 +190,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </div> -->
+      </div>-->
     </div>
     <side-bar :active_index="1"></side-bar>
     <mt-datetime-picker
@@ -278,7 +244,7 @@ export default {
   },
   methods: {
     clickfunction: function(val) {
-      console.log("val是什么 ",val)
+      console.log("val是什么 ", val);
       this.$router.push({
         path: "/details",
         query: {
@@ -353,7 +319,7 @@ export default {
             this.schedule_date = item.schedule_date;
             arr3.push(item.patient);
           });
-          console.log("arr3",arr3)
+          console.log("arr3", arr3);
           this.tableData = arr2;
         }
       });
@@ -579,7 +545,10 @@ export default {
   }
 }
 .table {
-  width: 100%;
+  width: 1000px;
+  @media only screen and (min-width: 768px) {
+    width: 1600px;
+  }
 }
 .van-list {
   padding-top: 76px;
@@ -588,8 +557,8 @@ export default {
   @media only screen and (min-width: 376px) and (max-width: 737px) {
     padding-top: 80px !important;
   }
-  @media only screen and (min-width: 813px) and (max-width: 1024px) {
-    padding-top: 116px !important;
+  @media only screen and (min-width: 768px) {
+    padding-top: 120px !important;
   }
 }
 .mainBox {

src/pages/personal/ChangePassword.vue

@@ -2,8 +2,10 @@
   <div class="container">
     <div class="changePassword">
       <van-field v-model="username" clearable label="旧密码" placeholder="请输入旧密码" />
+      <van-field v-model="sms" center clearable label="验证码" placeholder="请输入短信验证码">
+        <van-button slot="button" size="small" type="primary">发送验证码</van-button>
+      </van-field>
       <van-field v-model="password" type="password" label="新密码" placeholder="请输入新密码" />
-      <van-field v-model="password" type="password" label="确认密码" placeholder="请确认密码" />
       <div class="finish">完成</div>
     </div>
   </div>
@@ -40,6 +42,10 @@
     .van-field__label {
       max-width: 2.5rem;
     }
+    .van-button--primary {
+      background-color: #258ffc;
+      border: 1px solid #258ffc;
+    }
   }
   .finish {
     width: 90%;

src/styles/style.scss

@@ -554,9 +554,9 @@ body {
 
 // 表单样式
 .table {
-  width: 2000px;
+  width: 2400px;
   overflow: auto;
-  font-size: 0.34rem;
+  font-size: 0.45rem;
   text-align: center;
   border: $border-color;
   padding-bottom: 0.02rem;
@@ -571,13 +571,13 @@ body {
       color: #fff;
       padding: 0;
       margin: 0;
-      height: 0.88rem;
+      height: 1.2rem;
       font-weight: normal;
     }
     td {
       background: #ecf5ff;
       border: none;
-      padding: 0.18rem 0;
+      padding: 0.26rem 0;
 
       .xg {
         color: $main-color;
@@ -823,7 +823,7 @@ body {
   .back {
     // color: $main-color;
     color: #fff;
-    margin-right: 0.4rem;
+    margin-right: 0.3rem;
     .iconfont {
       // color: $main-color;
       color: #fff;