Merge branch 'wzf' of http://git.shengws.com/zhangbj/xt_pad into wzf

build/cdn.json

 {
-  "version": "1.0.52"
+  "version": "1.0.91"
 }

config/prod.env.js

 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
-
   // BASE_API: '"https://api.xt.kuyicloud.com"'
+
+  BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 }

src/App.vue

 
 <script>
 export default {
-  name: "App",
+  name: 'App',
   provide () {
     return {
       reload: this.reload
         this.isRouterAlive = true
       })
     }
+  },
+  watch: {
+    '$route': function (to, from) {
+      document.body.scrollTop = 0
+      document.documentElement.scrollTop = 0
+    }
   }
 
-};
+}
 </script>
 
 <style>

src/api/dialysis.js

 }
 
 
+export function CreateDryWeight(params){
+  return request({
+    url:"/m/api/dryweight/commit",
+    method:'post',
+    params:params,
+  })
+
+}
+
+
+

src/pages/advice/DialysisAdviceTable.vue

     @include align-items-center;
     @include text-align;
     @include justify-content-between;
-    width: 80%;
+    width: 90%;
     margin: 0 auto;
     font-size: 0.32rem;
     color: $pgh-color;

src/pages/home/login.vue

   computed: {
     loginDisable() {
       // return false
-      return this.form.mobile.length == 0 || /^1[234578]\d{9}$/.test(this.form.mobile) == false || this.form.pwd.length == 0
+      return this.form.mobile.length == 0 || /^1[2345789]\d{9}$/.test(this.form.mobile) == false || this.form.pwd.length == 0
     }
   },
   created() {

src/pages/main/DetailsPage.vue

         <!-- <div class="time" style="width:1.49rem;">
                   <span class="iconfont">2018-01-01&#xe74a;</span>
         </div>-->
-
+<<<<<<< .mine
         <div class="print" style="float: right; visibility: hidden;">
           <el-button size="mini" type="primary" @click="print" icon="el-icon-printer">打印</el-button>
+
+
+
+
+
+
+
+
+
+
+=======
+              <div class="print" style="float: right;">
+                <el-button size="mini" type="primary" @click="print" icon="el-icon-printer">打印</el-button>
+              </div>
+
+            </div>
+            <div class="Tab">
+              <CaseHistory v-show="index==0" title="病历"></CaseHistory>
+              <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
+              <dialysis-tab v-show="index==1" title="透析" v-on:records="jump(val)"></dialysis-tab>
+              <today-tab ref="today" v-show="index==2" title="今日" ></today-tab>
+            </div>
+
+>>>>>>> .theirs
         </div>
       </div>
       <div class="Tab">
             year-format="{value} "
             month-format="{value} "
             date-format="{value} ">
+<<<<<<< .mine
     </mt-datetime-picker>-->
   </div>
+
+=======
+        </mt-datetime-picker> -->
+
+    </div>
+>>>>>>> .theirs
 </template>
 
 <script>
+<<<<<<< .mine
 import SideBar from "@/pages/layout/SideBar";
 import TodayTab from "./today/TodayTab";
 import DialysisTab from "./dialysis/DialysisTab";
 import { GetPatientInfoWithDiseases } from "@/api/patient";
 import { Toast } from "vant";
 import CaseHistory from "./records/CaseHistory";
+=======
+import SideBar from '@/pages/layout/SideBar'
+import TodayTab from './today/TodayTab'
+import DialysisTab from './dialysis/DialysisTab'
+import RecordsTab from './records/RecordsTab'
+import { Popover } from 'vux'
+import CheckTab from './dialysis/CheckTab'
+import {parseTime} from '@/utils'
+import {GetPatientInfoWithDiseases} from '@/api/patient'
+import { Toast } from 'vant'
+import CaseHistory from './records/CaseHistory'
+>>>>>>> .theirs
 
 export default {
-  name: "DetailsPage",
+  name: 'DetailsPage',
   components: {
     CaseHistory,
     CheckTab,
     RecordsTab,
     Popover
   },
-  data() {
+  data () {
     return {
       // pickerVisible: new Date(),
       patient_id: 0,
-      patient_name: "",
+      patient_name: '',
       date: 0,
       index: 2,
+<<<<<<< .mine
       patient: null
     };
+=======
+      patient: null
+    }
+>>>>>>> .theirs
   },
-  created() {
-    var patient_id = this.$route.query.patient_id;
-    var date = this.$route.query.date;
-    var patient_name = this.$route.query.patient_name;
-    this.patient_id = patient_id;
-    this.date = date;
-    this.patient_name = patient_name;
-    this.GetPatientInfoWithDiseases(this.patient_id);
+  created () {
+    var patient_id = this.$route.query.patient_id
+    var date = this.$route.query.date
+    var patient_name = this.$route.query.patient_name
+    this.patient_id = patient_id
+    this.date = date
+    this.patient_name = patient_name
+    this.GetPatientInfoWithDiseases(this.patient_id)
   },
   methods: {
-    ClickTab: function(tabIndex) {
-      this.index = tabIndex;
+    ClickTab: function (tabIndex) {
+      this.index = tabIndex
     },
-    backAction() {
-      this.$router.back(-1);
+    backAction () {
+      this.$router.back(-1)
     },
+<<<<<<< .mine
     openPicker() {
       this.$refs.picker.open();
     },
         this.$router.push(
           "/Print?xtdate=" + xtdate + "&xtno=" + this.patient.dialysis_no
         );
+=======
+    openPicker () {
+      this.$refs.picker.open()
+    },
+    print: function () {
+      var xtdate = parseTime(this.date, '{y}-{m}-{d}')
+      if (this.patient != null) {
+        this.$router.push('/Print?xtdate=' + xtdate + '&xtno=' + this.patient.dialysis_no)
+
+
+>>>>>>> .theirs
       }
+<<<<<<< .mine
     },
     GetPatientInfoWithDiseases(id) {
       GetPatientInfoWithDiseases(id)
           // on cancel
           Toast.fail("网络异常");
           return false;
+=======
+    },
+    GetPatientInfoWithDiseases (id) {
+      GetPatientInfoWithDiseases(id).then(response => {
+        if (response.data.state == 1) {
+          this.patient = response.data.data.patient
+        } else {
+          Toast.fail('网络异常')
+          return false
+
+
+
+
+
+
+
+>>>>>>> .theirs
+<<<<<<< .mine
         });
     },
     jump: function(val) {
       this.index = 2;
+
+
+
+
+
+
+
+
+
+=======
+        }
+      }).catch(() => {
+        // on cancel
+        Toast.fail('网络异常')
+        return false
+      })
+    },
+    jump: function (val) {
+      this.index = 2
+    },
+    toMyPatients () {
+      var patient_id = this.$route.query.patient_id
+      this.$router.push('/mypatients/' + patient_id)
+>>>>>>> .theirs
     }
   }
-};
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
   }
 }
 </style>
-

src/pages/main/DialysisArea.vue

                 class="iconfont"
               >&#xe74a;</span>
             </li>
+
             <div class="popover-demo-content">
               <ul>
                 <li
             {{ selected_date_str }}
             <span class="iconfont">&#xe74a;</span>
           </li>
+
+          <li @click="mypatient()">
+            我的病人
+            <span class="iconfont">&#xe74a;</span>
+          </li>
         </ul>
       </div>
+
       <div class="stateBox">
         <div v-for="(item, index) in filtedScheduals" :key="index">
           <h2 class="title">{{ item.zone_name }}</h2>
   data() {
     return {
       loading: false,
-
+      user_id: 0,
       networkStates: true,
       timer: null,
-      selected_date: this.$store.getters.app.dialysis_area.schedule_date, //new Date(),
+      ismypatient: false,
+      selected_date: this.$store.getters.app.dialysis_area.schedule_date, // new Date(),
       schedual_types: [
         { value: 0, text: "全部班", select: true },
         { value: 1, text: "上午", select: false },
         }
         return schedules;
       }
+      if (this.ismypatient) {
+        var schedules = [];
+        for (let o_i = 0; o_i < this.dialysis_scheduals.length; o_i++) {
+          const scheduleInfo = this.dialysis_scheduals[o_i];
+          var originSchedules = scheduleInfo.scheduals;
+          if (originSchedules.length == 0) {
+            continue;
+          }
+          var filtedSchedules = [];
+          for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+            const schedule = originSchedules[s_i];
+            if (schedule.dialysis_order.start_nurse == this.user_id) {
+              filtedSchedules.push(schedule);
+              // break;
+            }
+          }
+          if (filtedSchedules.length > 0) {
+            schedules.push({
+              zone_name: scheduleInfo.zone_name,
+              scheduals: filtedSchedules
+            });
+          }
+        }
+        return schedules;
+      }
 
       var zone_selected = this.zone_selected;
       var timetype_selected = this.schedual_type_selected;
         var filtedSchedules = [];
         for (let s_i = 0; s_i < originSchedules.length; s_i++) {
           const schedule = originSchedules[s_i];
-          if (
-            zone_name.length == 0 ||
-            (zone_name.length > 0 &&
-              zone_name == schedule.device_number.zone.name)
-          ) {
+          if (this.ismypatient) {
+            if (schedule.dialysis_order.creator == this.user_id) {
+              filtedSchedules.push(schedule);
+            }
+          } else {
             if (
-              timetype_selected == 0 ||
-              schedule.schedule_type == timetype_selected
+              zone_name.length == 0 ||
+              (zone_name.length > 0 &&
+                zone_name == schedule.device_number.zone.name)
             ) {
-              filtedSchedules.push(schedule);
+              if (
+                timetype_selected == 0 ||
+                schedule.schedule_type == timetype_selected
+              ) {
+                filtedSchedules.push(schedule);
+              }
             }
           }
         }
           });
         }
       }
+      this.ismypatient = false;
       return schedules;
     }
   },
+
   created() {
-    this.requestDialysisScheduals();
+    this.user_id = this.$store.getters.user.user.id;
+
+    var storedata = this.$store.getters.scheduals;
+    var scheduals = storedata.scheduals;
+    if (Object.keys(storedata).length > 0) {
+      var zoneMap = {};
+      var schedualMap = {};
+      for (let index = 0; index < scheduals.length; index++) {
+        const schedual = scheduals[index];
+        if (schedual.dialysis_order == null) {
+          continue;
+        }
+        if (schedualMap[schedual.device_number.zone.name] == null) {
+          schedualMap[schedual.device_number.zone.name] = [];
+        }
+        schedualMap[schedual.device_number.zone.name].push(schedual);
+        if (zoneMap[schedual.device_number.zone.name] == null) {
+          zoneMap[schedual.device_number.zone.name] =
+            schedual.device_number.zone;
+        }
+      }
+
+      var zones = [];
+      zones.push({ value: 0, text: "全部分区" });
+      for (var zoneName in zoneMap) {
+        zones.push({ value: zoneMap[zoneName].id, text: zoneName });
+      }
+
+      zones = zones.sort(function(a, b) {
+        return a.value > b.value;
+      });
+      this.zones = zones;
+
+      var dialysis_scheduals = [];
+      for (let index = 0; index < zones.length; index++) {
+        const zone = zones[index];
+        var scheduals = schedualMap[zone.text];
+        if (scheduals == null) {
+          continue;
+        }
+        dialysis_scheduals.push({
+          zone_name: zone.text,
+          scheduals: scheduals
+        });
+      }
+      this.dialysis_scheduals = dialysis_scheduals;
+    } else {
+      this.requestDialysisScheduals();
+    }
   },
   mounted() {
     this.timer = window.setInterval(() => {
     this.timer = null;
   },
   methods: {
+    mypatient() {
+      this.search_keyword = "";
+      this.zone_selected = 0;
+      this.schedual_type_selected = 0;
+      this.ismypatient = true;
+    },
     reloads: function() {
       this.reload();
     },
     handletimeType: function(index) {
+      this.ismypatient = false;
       this.sch_type_options_visible = false;
       this.schedual_type_selected = index;
       this.$emit("clear_search_keyword");
       });
     },
     handleZoneChange: function(index) {
+      this.ismypatient = false;
       this.zone_options_visible = false;
       this.zone_selected = index;
       this.$emit("clear_search_keyword");
       });
     },
     handleScheduleDateChange: function(date) {
+      this.ismypatient = false;
       this.zone_selected = 0;
       this.schedual_type_selected = 0;
-
       this.$emit("clear_search_keyword");
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
         zone: this.zone_selected,
 
     requestDialysisScheduals() {
       // this.$toast.loading({forbidClick: true, duration: 0})
-      this.loading = true;
+      // this.loading = true;
       var type = 0;
       getDialysisScheduals({ type: type, date: this.selected_date_str })
         .then(rs => {
 
             // console.log(resp.data)
             var scheduals = resp.data.scheduals;
+            this.$store.dispatch("SetScheduals", { scheduals: scheduals });
             var zoneMap = {};
             var schedualMap = {};
             for (let index = 0; index < scheduals.length; index++) {
         .catch(error => {
           this.loading = false;
 
-          //超时之后在这里捕抓错误信息.
+          // 超时之后在这里捕抓错误信息.
           if (error.response) {
             this.networkStates = false;
 
     openPicker() {
       this.$refs.picker.open();
     }
+    // getMyPatient () {
+    //   console.log('这是啥', this.zone_options_visible)
+    //   console.log('日期', this.selected_date)
+    // }
   }
 };
 </script>
     @include align-items-center;
     @include text-align;
     @include justify-content-between;
-    width: 60%;
+    width: 80%;
     margin: 0 auto;
     li {
       font-size: 0.32rem;

src/pages/main/PatientBox.vue

 </template>
 
 <script>
+<<<<<<< .mine
 import { parseTime } from "@/utils";
 import { jsGetAge } from "@/utils/tools";
 import { setDialysisOrWaitSelectedConfig } from "@/utils/data_config";
       }
     },
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+import {parseTime} from '@/utils'
+import {jsGetAge} from '@/utils/tools'
+import {
+  setDialysisOrWaitSelectedConfig
+} from '@/utils/data_config'
+export default {
+  name: 'PatientBox',
+  props: {
+    patients: Array
+  },
+  data () {
+    return {}
+  },
+  created () {
+    console.log('11111')
+    console.log(this.patients)
+  },
+  methods: {
+    getUnReadNum: function (schedual) {
+      if (schedual.doctor_advice != null) {
+        let doctorAdvice = []
+        for (let i = 0; i < schedual.doctor_advice.length; i++) {
+          if (schedual.doctor_advice[i].execution_state == 2) {
+            doctorAdvice.push(schedual.doctor_advice[i])
+          }
+        }
+        const sorted = this.groupBy(doctorAdvice, function (item) {
+          return [item.groupno]
+        })
+        return sorted.length
+      }
+    },
+    getStatus: function (schedual) {
+      var isShowDot = false
+      if (schedual.doctor_advice != null) {
+        for (let i = 0; i < schedual.doctor_advice.length; i++) {
+          if (schedual.doctor_advice[i].execution_state == 2) {
+            isShowDot = true
+          }
+        }
+        return isShowDot
+      } else {
+        return false
+      }
+    },
+    stateColor: function (schedual) {
+      var state = this.computeState(schedual)
+      if (state == 1) {
+        return 'blue'
+      } else if (state == 2) {
+        return 'gray'
+      } else if (state == 3) {
+        return 'red'
+      } else if (state == 5) {
+        return 'green1'
+      } else if (state == 6) {
+        return 'green2'
+      } else {
+        return 'blue'
+      }
+    },
+    functionColor: function (schedual) {
+      var state = this.computeState(schedual)
+      if (state == 1 || state == 3) {
+        return 'blue'
+      } else if (state == 2) {
+        return 'gray'
+      } else {
+        return 'blue'
+      }
+    },
+    borderColor: function (schedual) {
+      var yc = this.isAbnormal(schedual)
+      if (yc == true) {
+        return 'red'
+      } else {
+        return 'gray'
+      }
+    },
+    stateText: function (schedual) {
+      var state = this.computeState(schedual)
+      if (state == 1) {
+        return '已上机'
+      } else if (state == 2) {
+        return '已下机'
+      } else if (state == 3) {
+        return '监测中'
+      } else if (state == 5) {
+        return '待称重'
+      } else if (state == 6) {
+        return '待开处方'
+      } else {
+        // return schedual.patient.gender == 1 ? "男" : "女"
+        return '未上机'
+      }
+    },
+    computeState: function (schedual) {
+      if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weight_before == 0) {
+        // 未签到称重
+        return 5
+      }
+      if (schedual.prescription == null || schedual.prescription.creater == 0) {
+        // 未确认处方
+        return 6
+      }
+
+      if (schedual.dialysis_order == null) {
+        // 未上机
+        return 4
+      } else if (schedual.dialysis_order.stage == 2) {
+        // 已下机
+        return 2
+      } else if (
+        schedual.dialysis_order.stage == 1 &&
+          schedual.monitoring_records != null &&
+          schedual.monitoring_records.length > 1
+      ) {
+        // 监测中
+        return 3
+      } else {
+        return 1
+      }
+    },
+>>>>>>> .theirs
+
+<<<<<<< .mine
     orderState: function(schedual) {
       if (schedual.dialysis_order == null) {
         // 未上机
       } else {
         return schedual.patient.age;
       }
+=======
+    orderState: function (schedual) {
+      if (schedual.dialysis_order == null) {
+        // 未上机
+        return 4
+      } else if (schedual.dialysis_order.stage == 2) {
+        // 已下机
+        return 2
+      } else if (
+        schedual.dialysis_order.stage == 1 &&
+          schedual.monitoring_records != null &&
+          schedual.monitoring_records.length > 1
+      ) {
+        // 监测中
+        return 3
+      } else {
+        return 1
+      }
+    },
+    isAbnormal: function (schedual) {
+      return false // schedual.yc;
+    },
+    timeTypeText: function (schedual) {
+      if (schedual.schedule_type == 1) {
+        return '上午'
+      } else if (schedual.schedule_type == 2) {
+        return '下午'
+      } else {
+        return '晚上'
+      }
+    },
+    genderText: function (schedual) {
+      if (schedual.patient.gender == 0) {
+        return '未知'
+      } else if (schedual.patient.gender == 1) {
+        return '男'
+      } else {
+        return '女'
+      }
+    },
+    age: function (schedual) {
+      if (schedual.patient.age == 0) {
+        return jsGetAge(parseTime(schedual.patient.birthday, '{y}-{m}-{d}'), '-')
+      } else {
+        return schedual.patient.age
+      }
+
+
+
+>>>>>>> .theirs
 
+<<<<<<< .mine
       // var now = new Date();
       // var nowYear = parseTime(now, "{y}");
       // var birthdayYear = parseTime(schedual.patient.birthday, "{y}");
       } else {
         setDialysisOrWaitSelectedConfig(0);
       }
+=======
+      // var now = new Date();
+      // var nowYear = parseTime(now, "{y}");
+      // var birthdayYear = parseTime(schedual.patient.birthday, "{y}");
+      // // console.log(nowYear)
+      // // console.log(birthdayYear)
+      // return nowYear - birthdayYear;
+    },
+    groupBy (array, f) {
+      const groups = {}
+      array.forEach(function (o) {
+        const group = JSON.stringify(f(o))
+        groups[group] = groups[group] || []
+        groups[group].push(o)
+      })
+      return Object.keys(groups).map(function (group) {
+        return groups[group]
+      })
+    },
+    detailAction: function (schedual) {
+      if (schedual.dialysis_order != null) {
+        setDialysisOrWaitSelectedConfig(1)
+      } else {
+        setDialysisOrWaitSelectedConfig(0)
+      }
+>>>>>>> .theirs
 
+<<<<<<< .mine
       var patient_id = schedual.patient_id;
       var date = schedual.schedule_date;
       this.$router.push({
           patient_id: patient_id,
           date: date,
           patient_name: schedual.patient.name
+=======
+      var patient_id = schedual.patient_id
+      var date = schedual.schedule_date
+      this.$router.push({
+        path: '/details',
+        query: {
+          patient_id: patient_id,
+          date: date,
+          patient_name: schedual.patient.name
+>>>>>>> .theirs
         }
+<<<<<<< .mine
       });
+=======
+      })
+>>>>>>> .theirs
     }
   }
+<<<<<<< .mine
 };
+=======
+}
+>>>>>>> .theirs
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
   font-size: 0.8em;
   border-radius: 20px;
   color: #fff;
+<<<<<<< .mine
   background: #f56c6c;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+  width: 1.35rem;
+  height: 0.56rem;
+  line-height: 0.56rem;
+  border-radius: 4px;
+  margin: 0 auto;
+  font-size: 0.32rem;
+  }
+  .blue {
+  background: $main-color;
+  }
+  .red {
+  background: #f18f68;
+  }
+  .green {
+  background: #5bd18b;
+  }
+  .green1 {
+        background: #e6a23c;
+      }
+      .green2 {
+        background: #7930c3;
+      }
+  .gray {
+  background: #a8b3ba;
+  }
+  .lightGray {
+  background: #c6cdd2;
+  }
+  .time {
+  font-size: 0.26rem;
+  color: #34495e;
+  }
+  }
+  }
+  }
+  .red {
+  border: 1px #ff7979 solid;
+  }
+  .redpoint{
+  display:inline-block;
+  height:20px;
+  width:20px;
+  line-height:18px;
+  text-align:center;
+  font-size:0.8em;
+  border-radius:20px;
+  color:#fff;
+  background:#F56C6C;
+>>>>>>> .theirs
   position: absolute;
   top: -8px;
   left: 0.7rem;
   }
 }
 </style>
-

src/pages/main/PrintIndex.vue

         <!--&lt;!&ndash;<el-button size="mini" type="primary" icon="el-icon-printer" @click="printThisPage">打印</el-button>&ndash;&gt;-->
         <!--</div>-->
       </div>
+<<<<<<< .mine
       <DialysisPrintOrderOne
         style="margin-top:60px;"
         v-bind:childResponse="childResponse"
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id ==5"
       ></DialysisPrintOrderFive>
+=======
+      <DialysisPrintOrderOne style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==1"> </DialysisPrintOrderOne>
+      <DialysisPrintOrderTwo style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==2||org_template_info.template_id ==0"></DialysisPrintOrderTwo>
+      <DialysisPrintOrderFive style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==5"></DialysisPrintOrderFive>
+      <!--<DialysisPrintOrderSix style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==6"></DialysisPrintOrderSix>-->
+      <DialysisPrintOrderSix style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==6"></DialysisPrintOrderSix>
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
     </div>
     <side-bar :active_index="0" v-if="isShow == true"></side-bar>
   </div>
 import DialysisPrintOrderOne from "./template/DialysisPrintOrderOne";
 import DialysisPrintOrderTwo from "./template/DialysisPrintOrderTwo";
 import DialysisPrintOrderFive from "./template/DialysisPrintOrderFive";
+import DialysisPrintOrderSix from './template/DialysisPrintOrderSix'
 
 export default {
   name: "PrintIndex",
   components: {
+    DialysisPrintOrderSix,
     DialysisPrintOrderOne,
     DialysisPrintOrderTwo,
     DialysisPrintOrderFive,

src/pages/main/RecordPage.vue

   </div>
 </template>
 
-
 <script>
+<<<<<<< .mine
 import DialysisArea from "./DialysisArea";
 import WaitingArea from "./WaitingArea";
 import { Popover } from "vux";
 import { getDialysisScheduals, getWaitingScheduals } from "@/api/dialysis";
 import { parseTime } from "@/utils/index";
 import { getDialysisOrWaitSelectedConfig } from "@/utils/data_config";
+=======
+import DialysisArea from './DialysisArea'
+import WaitingArea from './WaitingArea'
+import {Popover} from 'vux'
+import {getDialysisScheduals, getWaitingScheduals} from '@/api/dialysis'
+import {parseTime} from '@/utils/index'
+import {getDialysisOrWaitSelectedConfig} from '@/utils/data_config'
+>>>>>>> .theirs
 
+<<<<<<< .mine
 export default {
   name: "RecordPage",
   props: {
     un_read_wait_num: {
       type: Number
+=======
+export default {
+  name: 'RecordPage',
+  props: {
+    un_read_wait_num: {
+      type: Number
+>>>>>>> .theirs
     },
+<<<<<<< .mine
     un_read_dialysis_num: {
       type: Number
     }
     // Group,
     // Cell
   },
+=======
+    un_read_dialysis_num: {
+      type: Number
+    }
+  },
+  data () {
+    return {
+      index: 1,
+      search_input: '',
+      search_keyword: '',
+      scheduals: [],
+      advice_groups: [],
+      unReadWaitNum: 0,
+      unReadDialysisNum: 0
+
+
+
+
 
+
+
+
+
+>>>>>>> .theirs
+
+<<<<<<< .mine
   methods: {
     ClickTab: function(tabIndex) {
       this.index = tabIndex;
+
+
+
+
+
+
+
+
+
+
+=======
+    }
+  },
+  components: {
+    DialysisArea,
+    WaitingArea,
+    Popover
+    // Group,
+    // Cell
+  },
+
+  methods: {
+    ClickTab: function (tabIndex) {
+      this.index = tabIndex
+>>>>>>> .theirs
     },
+<<<<<<< .mine
     searchWithKeyword: function() {
       this.$refs.search_field.blur();
       this.search_keyword = this.search_input;
+=======
+    searchWithKeyword: function () {
+      this.$refs.search_field.blur()
+      this.search_keyword = this.search_input
+>>>>>>> .theirs
     },
+<<<<<<< .mine
     clearKeyword: function() {
       this.search_input = "";
       this.search_keyword = "";
+=======
+    clearKeyword: function () {
+      this.search_input = ''
+      this.search_keyword = ''
+>>>>>>> .theirs
     }
+<<<<<<< .mine
   },
   created() {
     var index = getDialysisOrWaitSelectedConfig();
     if (index != null) {
       this.index = index;
     }
+=======
+  },
+  created () {
+    var index = getDialysisOrWaitSelectedConfig()
+    console.log(index)
+    if (index != null) {
+      this.index = index
+    }
+>>>>>>> .theirs
   }
+<<<<<<< .mine
 };
+=======
+}
+>>>>>>> .theirs
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
   }
 }
 </style>
-

src/pages/main/WaitingArea.vue

                 <li
                   v-for="(option, index) in zone_options"
                   :key="index"
-                  @click="handleZoneChange(index)"
+                  @click="handleZoneChange(index,option)"
                   :class="zone_selected == index ? 'tick' : ''"
                 >{{ option.text }}</li>
               </ul>
       menuList: [
         { value: "1", label: "全部", count: 0 },
         { value: "3", label: "待开处方", count: 0 },
-        { value: "2", label: "透前称量", count: 0 }
+        { value: "2", label: "待透前称量", count: 0 }
       ],
 
       select_index: 0,
       zone_selected: 0,
       time_selected: 0,
+      cur_zone_selected: 0,
       networkStates: true,
       scheduals: [],
 
   },
   computed: {
     filtedScheduals: function() {
+
       var search_keyword = this.search_keyword;
       if (this.search_keyword.length > 0) {
         var scheduals = [];
         return this.processScheduals(scheduals);
       }
       //
-      // if (this.zone_selected != 0) {
-      //   var zone_name = this.zone_options[this.zone_selected].text
-      //   for (let index = 0; index < this.zone_scheduals.length; index++) {
-      //     const zone_scheduals = this.zone_scheduals[index]
-      //     if (zone_scheduals.zone_name == zone_name) {
-      //       return [zone_scheduals]
-      //     }
-      //   }
-      // }
-
-      // if (this.time_selected != 0) {
-      //   var zone_name = this.zone_options[this.zone_selected].text
-      //   console.log(zone_name)
-      //   var schedules = [];
-      //   for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
-      //     const scheduleInfo = this.zone_scheduals[o_i];
-      //     var originSchedules = scheduleInfo.scheduals;
-      //     var filtedSchedules = [];
-      //     for (let s_i = 0; s_i < originSchedules.length; s_i++) {
-      //       const schedule = originSchedules[s_i];
-      //       if(this.zone_selected == 0){
-      //         if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
-      //           filtedSchedules.push(schedule);
-      //         }
-      //
-      //       }else{
-      //         console.log(zone_name)
-      //         console.log(schedule.device_number.zone.name)
-      //
-      //         if ((zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
-      //           if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
-      //             filtedSchedules.push(schedule);
-      //           }
-      //         }
-      //       }
-      //     }
-      //     if (filtedSchedules.length > 0) {
-      //       schedules.push({
-      //         zone_name: scheduleInfo.zone_name,
-      //         scheduals: filtedSchedules
-      //       });
-      //     }
-      //   }
-      //   return schedules
-      // }
+      if (this.zone_selected != 0) {
+
+        // var zone_name = this.zone_options[this.zone_selected].text
+        // for (let index = 0; index < this.zone_scheduals.length; index++) {
+        //   const zone_scheduals = this.zone_scheduals[index]
+        //   if (zone_scheduals.zone_name == zone_name) {
+        //     return [zone_scheduals]
+        //   }
+        // }
+        var zone_name = this.zone_options[this.zone_selected].text
+        var schedules = [];
+        var filtedSchedules = [];
+        for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
+          const scheduleInfo = this.zone_scheduals[o_i];
+          var originSchedules = scheduleInfo.scheduals;
+          
+          for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+            const schedule = originSchedules[s_i];
+            if(this.zone_selected == 0){
+              if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
+                filtedSchedules.push(schedule);
+              }
+            }else{
+              if ((zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
+                if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
+                  filtedSchedules.push(schedule);
+                }
+              }
+            }
+          }
+          // if (filtedSchedules.length > 0) {
+          //   schedules.push({
+          //     zone_name: scheduleInfo.zone_name,
+          //     scheduals: filtedSchedules
+          //   });
+          // }
+        }
+        console.log(filtedSchedules)
+        return this.processScheduals(filtedSchedules);
+      }
+
+      if (this.time_selected != 0) {
+        var zone_name = this.zone_options[this.zone_selected].text
+        var schedules = [];
+        var filtedSchedules = [];
+        for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
+          const scheduleInfo = this.zone_scheduals[o_i];
+          var originSchedules = scheduleInfo.scheduals;
+          
+          for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+            const schedule = originSchedules[s_i];
+            if(this.zone_selected == 0){
+              if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
+                filtedSchedules.push(schedule);
+              }
+
+            }else{
+              if ((zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
+                if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
+                  filtedSchedules.push(schedule);
+                }
+              }
+            }
+          }
+          // if (filtedSchedules.length > 0) {
+          //   schedules.push({
+          //     zone_name: scheduleInfo.zone_name,
+          //     scheduals: filtedSchedules
+          //   });
+          // }
+        }
+        console.log(filtedSchedules)
+        return this.processScheduals(filtedSchedules);
+      }
 
       var zone_selected = this.zone_selected;
       var timetype_selected = this.time_selected;
+      var assessment_before_dislysis_count = 0;
+      var prescription_count = 0;
       if (zone_selected != 0 || timetype_selected != 0) {
-        var zone_name =
-          zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
+        var zone_name = zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
         var schedules = [];
+        var filtedSchedules = [];
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
           const scheduleInfo = this.zone_scheduals[o_i];
           var originSchedules = scheduleInfo.scheduals;
-          var filtedSchedules = [];
+          
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
             const schedule = originSchedules[s_i];
-            if (
-              zone_name.length == 0 ||
-              (zone_name.length > 0 &&
-                zone_name == schedule.device_number.zone.name)
-            ) {
-              if (
-                timetype_selected == 0 ||
-                schedule.schedule_type == timetype_selected
-              ) {
+            if ( zone_name.length == 0 || (zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
+              if ( timetype_selected == 0 ||  schedule.schedule_type == timetype_selected ) {
                 filtedSchedules.push(schedule);
               }
             }
           }
-          if (filtedSchedules.length > 0) {
-            schedules.push({
-              zone_name: scheduleInfo.zone_name,
-              scheduals: filtedSchedules
-            });
+          // if (filtedSchedules.length > 0) {
+          //   schedules.push({
+          //     zone_name: scheduleInfo.zone_name,
+          //     scheduals: filtedSchedules
+          //   });
+          // }
+        }
+
+        console.log(filtedSchedules)
+        return this.processScheduals(filtedSchedules);
+
+        if (this.select_index == 2) {
+          var scheduals = [];
+          for (let index = 0; index < this.scheduals.length; index++) {
+            const schedual = this.scheduals[index];
+            if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weight_before == 0) {
+              if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
+                continue
+              }
+              if(timetype_selected > 0 && schedual.schedule_type != timetype_selected) {
+                continue
+              }
+              scheduals.push(schedual);
+            }
+          }
+          return this.processScheduals(scheduals);
+          // return scheduals;
+        } else if (this.select_index == 1) {
+          var scheduals = [];
+          for (let index = 0; index < this.scheduals.length; index++) {
+            const schedual = this.scheduals[index];
+            if (schedual.prescription == null || schedual.prescription.creater == 0) {
+              if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
+                continue
+              }
+              if(timetype_selected > 0 && schedual.schedule_type != timetype_selected) {
+                continue
+              }
+              scheduals.push(schedual);
+            }
           }
+          // return scheduals;
+          return this.processScheduals(scheduals);
+        } else {
+          // return this.zone_scheduals;
+          var scheduals = [];
+          for (let index = 0; index < this.scheduals.length; index++) {
+            const schedual = this.scheduals[index];
+            if (schedual.dialysis_order == null) {
+              if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
+                continue
+              }
+              if(timetype_selected > 0 && schedual.schedule_type != timetype_selected) {
+                continue
+              }
+              scheduals.push(schedual);
+            }
+          }
+          // return scheduals;
+          return this.processScheduals(scheduals);
         }
-        return schedules;
       }
 
       if (this.select_index == 2) {
         var scheduals = [];
         for (let index = 0; index < this.scheduals.length; index++) {
           const schedual = this.scheduals[index];
-          if (schedual.assessment_before_dislysis == null) {
+          if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weight_before == 0) {
             scheduals.push(schedual);
           }
         }
         var scheduals = [];
         for (let index = 0; index < this.scheduals.length; index++) {
           const schedual = this.scheduals[index];
-          if (
-            schedual.assessment_before_dislysis == null &&
-            schedual.prescription == null
-          ) {
+          if (schedual.prescription == null || schedual.prescription.creater == 0) {
             scheduals.push(schedual);
           }
         }
         // return scheduals;
         return this.processScheduals(scheduals);
       } else {
-        return this.zone_scheduals;
+        // return this.zone_scheduals;
+        var scheduals = [];
+        for (let index = 0; index < this.scheduals.length; index++) {
+          const schedual = this.scheduals[index];
+          if (schedual.dialysis_order == null) {
+            scheduals.push(schedual);
+          }
+        }
+        // return scheduals;
+        return this.processScheduals(scheduals);
       }
     }
   },
     if (type != null) {
       this.select_index = parseInt(type);
     }
-    this.requestScheduals();
+   
+    var storedata = this.$store.getters.waitscheduals
+    var scheduals = storedata.waitscheduals
+    if (Object.keys(storedata).length > 0) {
+      var totalCount = scheduals.length;
+      var prescription_count = 0;
+      var assessment_before_dislysis_count = 0;
+      for (let index = 0; index < scheduals.length; index++) {
+        const schedual = scheduals[index];
+        if (schedual.assessment_before_dislysis == null) {
+          assessment_before_dislysis_count += 1;
+        }
+        if (schedual.prescription == null) {
+          prescription_count += 1;
+        }
+      }
+      this.menuList[2].count = assessment_before_dislysis_count;
+      this.menuList[1].count = prescription_count;
+      this.scheduals = scheduals;
+
+      this.zone_options = this.makeZones(scheduals);
+      this.zone_scheduals = this.processScheduals(scheduals);
+    } else {
+      this.requestScheduals();
+    }
   },
   mounted() {
     this.timer = window.setInterval(() => {
   beforeDestroy() {
     clearInterval(this.timer);
     this.timer = null;
-    // this.$once('hook:beforeDestroy', () => {
-    //   clearInterval(this.timer);
-    // })
+    this.$once('hook:beforeDestroy', () => {
+      clearInterval(this.timer);
+    })
   },
   methods: {
+    processScheduals: function(scheduals) {
+      var zoneMap = {};
+      var schedualMap = {};
+      var assessment_before_dislysis_count = 0;
+      var prescription_count = 0;
+      for (let index = 0; index < scheduals.length; index++) {
+        const schedual = scheduals[index];
+        if (schedualMap[schedual.device_number.zone.id] == null) {
+          schedualMap[schedual.device_number.zone.id] = [];
+        }
+        if (this.select_index == 1) {
+            if(schedual.prescription == null || schedual.prescription.creater == 0){
+            schedualMap[schedual.device_number.zone.id].push(schedual);
+            prescription_count++
+          }
+        } else if (this.select_index == 2){
+            if(schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weight_before == 0){
+            schedualMap[schedual.device_number.zone.id].push(schedual);
+            assessment_before_dislysis_count++
+          }
+        } else {
+          if(schedual.dialysis_order == null){
+            schedualMap[schedual.device_number.zone.id].push(schedual);
+          }
+        }
+        if (zoneMap[schedual.device_number.zone.id] == null) {
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
+        }
+      }
+
+      if (this.select_index == 1) {
+        this.menuList[1].count = prescription_count;
+      }
+      if (this.select_index == 2) {
+        this.menuList[2].count = assessment_before_dislysis_count;
+      }
+
+
+      var zones = [];
+      // zones.push({ value: 0, text: "全部分区" })
+      for (var zoneId in zoneMap) {
+        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name });
+      }
+
+      zones = zones.sort(function(a, b) {
+        return a.id > b.id;
+      });
+      // this.zones = zones
+
+      var zone_scheduals = [];
+      for (let index = 0; index < zones.length; index++) {
+        const zone = zones[index];
+        var scheduals = schedualMap[zone.id];
+        zone_scheduals.push({
+          zone_id: zone.id,
+          zone_name: zone.name,
+
+          scheduals: scheduals
+        });
+      }
+      // this.zone_scheduals = zone_scheduals;
+      return zone_scheduals;
+    },
     reloads: function() {
       this.reload();
     },
       setSelectedTimesDataConfigList(this.time_selected);
       setWaitTypeSelectedConfig(tabIndex);
     },
-    handleZoneChange: function(index) {
+    handleZoneChange: function(index,zone) {
       this.zone_options_visible = false;
       this.zone_selected = index;
-      this.select_index = -1;
+      this.cur_zone_selected = zone.value
+      // this.select_index = -1;
       setSelectedAreaDataConfigList(index.toString());
     },
     handleTimeChange: function(index) {
       this.time_selected = index;
-      this.select_index = -1;
+      // this.select_index = -1;
       this.time_options_visible = false;
       setSelectedTimesDataConfigList(index.toString());
     },
 
     requestScheduals() {
-      this.loading = true;
+      // this.loading = true;
       var date = parseTime(Date.parse(new Date()), "{y}-{m}-{d}");
       getWaitingScheduals({ date: date })
         .then(rs => {
             this.loading = false;
 
             var scheduals = resp.data.scheduals;
+            this.$store.dispatch("SetWaitScheduals",{waitscheduals:scheduals})
             var totalCount = scheduals.length;
             var prescription_count = 0;
             var assessment_before_dislysis_count = 0;
       //   return a.value > b.value
       // })
       return zones;
-    },
-    processScheduals: function(scheduals) {
-      var zoneMap = {};
-      var schedualMap = {};
-      for (let index = 0; index < scheduals.length; index++) {
-        const schedual = scheduals[index];
-        if (schedualMap[schedual.device_number.zone.id] == null) {
-          schedualMap[schedual.device_number.zone.id] = [];
-        }
-        schedualMap[schedual.device_number.zone.id].push(schedual);
-        if (zoneMap[schedual.device_number.zone.id] == null) {
-          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
-        }
-      }
-
-      var zones = [];
-      // zones.push({ value: 0, text: "全部分区" })
-      for (var zoneId in zoneMap) {
-        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name });
-      }
-
-      zones = zones.sort(function(a, b) {
-        return a.id > b.id;
-      });
-      // this.zones = zones
-
-      var zone_scheduals = [];
-      for (let index = 0; index < zones.length; index++) {
-        const zone = zones[index];
-        var scheduals = schedualMap[zone.id];
-        zone_scheduals.push({
-          zone_id: zone.id,
-          zone_name: zone.name,
-
-          scheduals: scheduals
-        });
-      }
-      // this.zone_scheduals = zone_scheduals;
-      return zone_scheduals;
     }
   }
 };

src/pages/main/dialog/AcceptsDialog.vue

             <el-radio v-model="receiveTreatmentAsses.consciousness" label="1">清醒</el-radio>
             <el-radio v-model="receiveTreatmentAsses.consciousness" label="2">嗜睡</el-radio>
             <el-radio v-model="receiveTreatmentAsses.consciousness" label="3">昏迷</el-radio>
+            <el-radio v-model="receiveTreatmentAsses.consciousness" label="4">模糊</el-radio>
+
 
           </el-form-item>
           <el-form-item label="病人食欲: " v-if="isShow('病人食欲')">

src/pages/main/dialog/AssessmentDialog.vue

             <input type="tel" @focus="inputFocus" v-model="formValue.weight_before"/>
           </div>
         </div>
-        <div class="item" v-if="isShow('干体重')">
+
+
+        <div class="item" v-if="isShow('干体重')&&this.$store.getters.user.template_info.template_id == 6">
+          <h2 class="name">干体重(kg)</h2>
+          <div class="content" @click="showDryWeight">
+            <input type="tel" @focus="inputFocus" v-model="formValue.dry_weight" disabled="disabled"/>
+          </div>
+        </div>
+
+        <div class="item" v-if="isShow('干体重')&& this.$store.getters.user.template_info.template_id != 6">
           <h2 class="name">干体重(kg)</h2>
           <div class="content">
-            <input type="tel" @focus="inputFocus" v-model="formValue.dry_weight"/>
+            <input type="tel" @focus="inputFocus" v-model="formValue.dry_weight" />
+          </div>
+        </div>
+
+
+        <div class="item" v-if="isShow('衣物重')">
+          <h2 class="name">衣物重(kg)</h2>
+          <div class="content">
+            <input type="tel" @focus="inputFocus" v-model="formValue.additional_weight"/>
           </div>
         </div>
         <div class="item" v-if="isShow('体温')">
                     v-model="formValue.remark"></textarea>
         </div>
       </div>
-
     </div>
-    <!--<two-menu title="二级菜单" v-show="true" ></two-menu>-->
+
     <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" v-on:menu-empty="menuEmpty"
                         :propsForm="propForm"></check-box-sub-menu>
+
+    <dry-weight-menu ref="dry"  v-on:menu-cancle-two="menuDryCancle" v-on:menu-comfirm-two="menuDryComfirm" :propsForm="propDryForm"></dry-weight-menu>
+
   </div>
 </template>
 
   import {EditAssessmentBeforeDislysis} from '@/api/patient'
   import {Toast} from 'vant'
   import {getDataConfig} from '@/utils/data'
+  import DryWeightMenu from './subMenu/dryWeightMenu'
 
   export default {
     name: 'PrescriptionDialog',
     props: {
+      dry_weight:{
+        type: Object,
+
+      },
       patient_prop: {
         type: Object,
       },
       },
       last_predialysis: {
         type: Object,
+      },  admin_users_prop: {
+        type: Array
       },
     },
     data () {
       return {
+        propDryForm:{
+          weight:0,
+          doctor:[],
+        },
         isShowDialog: true,
         //sub menu prop
         visibility: false,
+        is_show_dry_weight: false,
         propForm: {
           title: '',
           list: [],
         formValue: {
           weight_before: '',
           dry_weight: '',
+          additional_weight :'',
           temperature: '',
           systolic_blood_pressure: '',
           diastolic_blood_pressure: '',
       }
     },
     methods: {
+      menuDryComfirm(val){
+        console.log(val)
+        this.isShowDialog = true
+        this.$refs.dry.close()
+        this.formValue.dry_weight = val.dry_weight
+        this.propDryForm.weight = val.dry_weight
+        this.dry_weight = val
+        this.$emit("weight_update",this.dry_weight);
+
+      },
+      menuDryCancle(){
+        this.isShowDialog = true
+        this.$refs.dry.close()
+
+        // this.is_show_dry_weight = false
+
+
+      },
       isShow(name){
         var filedList = this.$store.getters.user.fileds
 
       },
       commitInfo: function () {
         Toast.loading({forbidClick: true, duration: 0})
-        console.log(this.formValue)
+        if (this.formValue.dry_weight == undefined){
+          this.formValue.dry_weight = "0"
+        }else{
+
+          this.formValue.dry_weight = this.formValue.dry_weight.toString()
+        }
+
+
         EditAssessmentBeforeDislysis(this.$route.query.patient_id, this.record_date, this.formValue).then(response => {
           if (response.data.state == 0) {
             Toast(response.data.msg)
             this.$emit('evaluation', response.data.data.evaluation)
           }
         })
+      },showDryWeight:function(){
+        if(this.$store.getters.user.user.user_type == 3){
+          return
+        }
+        this.isShowDialog = false
+        this.$refs.dry.open()
+        this.propDryForm.doctor=[]
+        for (let i = 0; i < this.admin_users_prop.length;i++){
+          if(this.admin_users_prop[i].user_type == 2 || this.admin_users_prop[i].user_type == 1){
+            this.propDryForm.doctor.push(this.admin_users_prop[i])
+          }
+        }
       },
       close: function () {
         this.$emit('close')
       }
 
     }, components: {
+      DryWeightMenu,
       CheckBoxSubMenu,
 
     }, created () {
         d = newDate.getDate()
       }
       this.record_date = y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
-      // console.log(this.predialysis)
       this.formValue = this.predialysis
+      console.log("3333333")
+
       if (this.predialysis.id == undefined && this.last_predialysis.id != undefined) {
-        this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
+        console.log("111111")
+        this.$set(this.formValue, 'additional_weight', this.last_predialysis['additional_weight'].toString())
         this.$set(this.formValue, 'internal_fistula', this.last_predialysis['internal_fistula'])
         this.$set(this.formValue, 'internal_fistula_skin', this.last_predialysis['internal_fistula_skin'])
         this.$set(this.formValue, 'blood_access_part_id', this.last_predialysis['blood_access_part_id'])
         this.$set(this.formValue, 'blood_access_part_opera_id', this.last_predialysis['blood_access_part_opera_id'])
       }
 
+      if(this.$store.getters.user.template_info.template_id != 6 && this.predialysis.id == undefined && this.last_predialysis.id != undefined){
+        console.log("222222")
+
+        this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
+      }
+
+      if (this.$store.getters.user.template_info.template_id == 6 ) {
+        console.log("333333333")
+
+        if(this.dry_weight != null && this.dry_weight.id != undefined){
+          this.$set(this.formValue, 'dry_weight', this.dry_weight.dry_weight.toString())
+          this.propDryForm.weight = this.dry_weight.dry_weight.toString()
+        }else{
+          if(this.predialysis.id == undefined && this.last_predialysis.id != undefined){
+            this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
+            this.propDryForm.weight = this.formValue.dry_weight
+          }
+        }
+      }
       this.hemorrhage_state = this.formValue.is_hemorrhage == 0
     }
   }

src/pages/main/dialog/LongDialog.vue

 </template>
 
 <script>
-import LongDialogMenu from "./subMenu/LongDialogMenu";
-import { createPatientDialysisSolution } from "@/api/patient";
-import { Toast } from "vant";
+import LongDialogMenu from './subMenu/LongDialogMenu'
+import { createPatientDialysisSolution } from '@/api/patient'
+import { Toast } from 'vant'
 
 export default {
-  name: "LongDialog",
+  name: 'LongDialog',
   components: {
     LongDialogMenu
   },
   methods: {
-    handleDialyser(item) {
-      this.showObj.paden_show = true;
+    handleDialyser (item) {
+      this.showObj.paden_show = true
     },
-    showModel() {
-      this.showObj.mode_show[0] = true;
-      this.showObj.paden_show = false;
+    showModel () {
+      this.showObj.mode_show[0] = true
+      this.showObj.paden_show = false
     },
-    showQi() {
-      this.showObj.mode_show[1] = true;
-      this.showObj.paden_show = false;
+    showQi () {
+      this.showObj.mode_show[1] = true
+      this.showObj.paden_show = false
     },
-    showMenu(index) {
-      this.showObj.mode_show[index] = true;
-      this.showObj.paden_show = false;
+    showMenu (index) {
+      this.showObj.mode_show[index] = true
+      this.showObj.paden_show = false
     },
 
-    submitSolution() {
-      this.dialysisSolution.mode = this.dialysisSolution.mode_id;
+    submitSolution () {
+      this.dialysisSolution.mode = this.dialysisSolution.mode_id
       createPatientDialysisSolution(
         this.patient.id,
         this.dialysisSolution
       ).then(response => {
         if (response.data.state == 0) {
-          Toast.fail(response.data.msg);
+          Toast.fail(response.data.msg)
           // this.$toast({message: response.data.msg});
-          return false;
+          return false
         } else {
-          Toast.success("创建成功");
+          Toast.success('创建成功')
           // this.$toast({message: "创建成功"});
-          this.$emit("longSolution");
+          this.$emit('longSolution')
           for (const key in response.data.data.solution) {
-            this.solution_prop[key] = response.data.data.solution[key];
+            this.solution_prop[key] = response.data.data.solution[key]
           }
           // this.solution_prop = response.data.data.solution
         }
-      });
+      })
     }
   },
 
     },
     machines_prop: {
       type: Array,
-      default: function() {
-        return new Array();
+      default: function () {
+        return new Array()
       }
     }
   },
-  data() {
+  data () {
     return {
-      doctor: "",
+      doctor: '',
       showObj: {
         mode_show: {
           0: false,
 
       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: ''
       },
       patient: {
         id: 0
       },
       dialysisSolution: {
         id: 0,
-        mode: "",
-        mode_id: "",
-        mode_name: "",
-        dialysis_duration: "",
-        hemodialysis_machine: "",
-        perfusion_apparatus: "",
-        perfusion_apparatus_name: "",
-        blood_flow_volume: "",
-        dewater: "",
+        mode: '',
+        mode_id: '',
+        mode_name: '',
+        dialysis_duration: '',
+        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: "",
-        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: '',
+        kalium: '',
+        sodium: '',
+        calcium: '',
+        bicarbonate: '',
+        glucose: '',
+        dry_weight: '',
+        dialysate_flow: '',
+        dialysate_temperature: '',
+        conductivity: '',
+        doctor: '',
+        remark: ''
       }
-    };
+    }
   },
   watch: {
-    "dialysisSolution.anticoagulant": function() {
-      var thismode = parseInt(this.dialysisSolution.anticoagulant);
+    'dialysisSolution.anticoagulant': function () {
+      var thismode = parseInt(this.dialysisSolution.anticoagulant)
       if (isNaN(thismode) || thismode <= 0) {
-        return false;
+        return false
       }
       if (
-        typeof this.anticoagulantsConfit[thismode] == "undefined" ||
+        typeof this.anticoagulantsConfit[thismode] === 'undefined' ||
         this.anticoagulantsConfit[thismode] == null
       ) {
-        return false;
+        return false
       }
+<<<<<<< .mine
       this.anticoagulant = this.anticoagulantsConfit[thismode];
       this.dialysisSolution.anticoagulant_name = this.anticoagulantsConfit[
         thismode
       ].name;
+=======
+      this.anticoagulant = this.anticoagulantsConfit[thismode]
+      this.dialysisSolution.anticoagulant_name = this.anticoagulantsConfit[thismode].name
+
+
+>>>>>>> .theirs
     },
+<<<<<<< .mine
     "dialysisSolution.hemodialysis_machine": function() {
       var machine = parseInt(this.dialysisSolution.hemodialysis_machine);
+=======
+    'dialysisSolution.hemodialysis_machine': function () {
+      var machine = parseInt(this.dialysisSolution.hemodialysis_machine)
+>>>>>>> .theirs
       if (isNaN(machine) || machine <= 0) {
-        return;
+        return
       }
       for (let index = 0; index < this.dialyserList.length; index++) {
         if (machine == this.dialyserList[index].id) {
+<<<<<<< .mine
           this.dialysisSolution.hemodialysis_machine_name = this.dialyserList[
             index
           ].name;
           break;
+=======
+          this.dialysisSolution.hemodialysis_machine_name = this.dialyserList[index].name
+          break
+
+
+>>>>>>> .theirs
         }
       }
     },
+<<<<<<< .mine
     "dialysisSolution.perfusion_apparatus": function() {
       var apparatus = parseInt(this.dialysisSolution.perfusion_apparatus);
       if (isNaN(apparatus) || apparatus <= 0) {
         return false;
+=======
+    'dialysisSolution.perfusion_apparatus': function () {
+      var apparatus = parseInt(this.dialysisSolution.perfusion_apparatus)
+      if (isNaN(apparatus) || apparatus <= 0) {
+        return false
+>>>>>>> .theirs
       }
       for (let index = 0; index < this.perfusion_apparatus.length; index++) {
         if (apparatus == this.perfusion_apparatus[index].id) {
+<<<<<<< .mine
           this.dialysisSolution.perfusion_apparatus_name = this.perfusion_apparatus[
             index
           ].name;
           break;
+=======
+          this.dialysisSolution.perfusion_apparatus_name = this.perfusion_apparatus[index].name
+          break
+
+
+>>>>>>> .theirs
         }
       }
     },
+<<<<<<< .mine
     "dialysisSolution.replacement_way": function() {
       var way = parseInt(this.dialysisSolution.replacement_way);
       if (isNaN(way) || way <= 0) {
         return false;
+=======
+    'dialysisSolution.replacement_way': function () {
+      var way = parseInt(this.dialysisSolution.replacement_way)
+      if (isNaN(way) || way <= 0) {
+        return false
+>>>>>>> .theirs
       }
       for (let index = 0; index < this.replacementWays.length; index++) {
         if (way == this.replacementWays[index].id) {
+<<<<<<< .mine
           this.dialysisSolution.replacement_way_name = this.replacementWays[
             index
           ].name;
           break;
+=======
+          this.dialysisSolution.replacement_way_name = this.replacementWays[index].name
+          break
+
+
+>>>>>>> .theirs
         }
       }
     }
   //   }
 
   // },
-  created() {
-    this.doctor = this.$store.getters.user.user.user_name;
-    this.modeOptions = this.$store.getters.treatment_mode;
-    this.perfusion_apparatus = this.$store.getters.perfusion_apparatus;
-    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
-    this.replacementWays = this.$store.getters.replacement_ways;
+  created () {
+    this.doctor = this.$store.getters.user.user.user_name
+    this.modeOptions = this.$store.getters.treatment_mode
+    this.perfusion_apparatus = this.$store.getters.perfusion_apparatus
+    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
+    this.replacementWays = this.$store.getters.replacement_ways
 
     for (var modeOne in this.modeOptions) {
-      this.modeList.push(this.modeOptions[modeOne]);
+      this.modeList.push(this.modeOptions[modeOne])
     }
     for (var one in this.anticoagulantsConfit) {
-      this.anticoagulantsConfitList.push(this.anticoagulantsConfit[one]);
+      this.anticoagulantsConfitList.push(this.anticoagulantsConfit[one])
     }
 
-    this.patient = this.patient_prop;
+    this.patient = this.patient_prop
 
     // console.log("this.solution_prop",this.solution_prop);
     if (this.solution_prop != null && this.solution_prop.id != "") {
       for (const key in this.solution_prop) {
-        this.dialysisSolution[key] = this.solution_prop[key];
+        this.dialysisSolution[key] = this.solution_prop[key]
       }
     }
 
+<<<<<<< .mine
     this.dialyserList = this.machines_prop;
   }
+=======
+    this.dialyserList = this.machines_prop
+  }
+>>>>>>> .theirs
   // data() {
   //   return {
   //     show_two_menu: false
   //     this.show_two_menu = true;
   //   }
   // }
-};
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
   }
 }
 </style>
-

src/pages/main/dialog/OrdersDialog.vue

           @click="modifyExecAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0) }"
         >修改执行医嘱</span>
-        <span
+        <span v-if="template_id != 6"
           @click="checkAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0) || (this.$store.getters.user.user.user_type == 2 && !isPremission) }"
         >医嘱核对</span>
               <th width="40%">医嘱内容</th>
               <th width="10%">执行时间</th>
               <th width="10%">执行护士</th>
-              <th width="10%">核对人员</th>
+              <th v-if="template_id != 6" width="10%">核对人员</th>
             </tr>
             <template v-for="(group, group_index) in advice_groups">
               <tr
                 >
                   <div class="txt">
                     <span>{{advice.advice_name }}</span>
+<<<<<<< .mine
                     <span
                       v-if="advice.advice_desc"
                     >{{ advice.advice_desc }}{{advice.drug_spec_unit}}</span>
                     <span
                       v-if="advice.single_dose"
                     >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+=======
+                    <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
+                    <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}})</span>
+                    <span v-if="advice.single_dose && template_id != 6" >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+
+
+
+
+
+
+>>>>>>> .theirs
                     <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
                     <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
                     <span
     date *= 1000;
     var newDate = new Date(date);
 
+<<<<<<< .mine
     var y = newDate.getFullYear();
     var m = newDate.getMonth() + 1;
     var d = newDate.getDate();
     this.record_date =
       y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+    },
+    data () {
+      return {
+        isShowDialog: true,
+        template_id: 0,
+        isShowExce: true,
+        isShowMofifyExce: false,
+        title: '临时医嘱',
+        index: 0,
+        doctor: '',
+        adviceTemplates: [],
+        drugOptions: {},
+        deliveryWayOptions: [],
+        executionFrequencyOptions: [],
+        unitsOption: [],
+        unitsObj: [],
+        record_date: '',
+        nowExecTime: new Date(),
+        patient: {
+          id: 0
+        },
+        admin_users: [],
+        adviceList: [],
+        parent_id: 0,
+        current_select_object: -1,
+        current_group_index: -1,
+        current_advice_index: -1,
+        current_advice: null,
+        currentAdviceIdsStr: '',
+        currentAdvices: [],
+        currentSubAdvices: [],
+        isPremission:false,
+>>>>>>> .theirs
+
+<<<<<<< .mine
     this.patient = this.patient_prop;
     this.adviceList = this.advice_list_prop;
     this.admin_users = this.admin_users_prop;
     this.doctor = this.$store.getters.user.user.user_name;
     this.getAdviceConfig();
 
+
+=======
+      }
+    },
+    created () {
+      this.template_id = this.$store.getters.user.template_info.template_id
+      var date = this.$route.query && this.$route.query.date
+      date *= 1000
+      var newDate = new Date(date)
+>>>>>>> .theirs
+
     this.unitsOption = getDataConfig("hemodialysis", "units");
     for (var index in this.unitsOption) {
       this.unitsObj[this.unitsOption[index].id] = this.unitsOption[index];
         advices[i]["is_selected"] = 0;
       }
 
+<<<<<<< .mine
       var new_group = Object.assign(
         {},
         {
           group_no: 0,
           start_time: 0,
           advices: []
-        }
+
+
+=======
+    methods: {
+      modifyExecAdvice: function () {
+        // if(!this.isPremission){
+        //   Toast.fail('你没有权限修改医嘱！')
+        // }else{
+          this.nowExecTime = new Date(this.currentAdvices[0].start_time * 1000)
+          this.$refs.mofify_exec_time.open()
+
+>>>>>>> .theirs
+        // }
       );
       new_group.group_no = advices[0].groupno;
       new_group.start_time = advices[0].start_time;

src/pages/main/dialog/PlaneDialog.vue

           return false;
         } else {
           Toast.success("下机成功");
-          this.$emit('did_off', response.data.data.dialysisOrder);
+          this.$emit('did_off', response.data.data.assessmentAfterDislysis);
           var record = this.record
           for (const key in response.data.data.dialysisOrder) {
             this.$set(record, key, response.data.data.dialysisOrder[key])

src/pages/main/dialog/ThorougDialog.vue

         </div>
 
         <div class="item" v-if="isShow('实际超滤量')">
-          <label class="name" for="sjcll">实际超滤量(L)</label>
+          <label v-if="template_id == 6" class="name" for="sjcll">实际超滤量(ml)</label>
+          <label v-else class="name" for="sjcll">实际超滤量(L)</label>
           <div class="content">
             <input type="tel" @focus="inputFocus" id="sjcll" v-model="formValue.actual_ultrafiltration"/>
 
         puncture_point_oozing_blood_state: false,
         puncture_point_haematoma_state: false,
         eat_state: false,
-
+        template_id: 0,
         isShowDialog: true,
         time: '00:00',
         puncture_point_oozing_bloods:[
             this.propForm.title = '凝血'
             this.propForm.isHasOther = 2
             this.visibility = true
+            this.propForm.list = []
             this.propForm.list = getDataConfig("hemodialysis", "cruor");
             this.propForm.optionList = []
             this.propForm.isMultiple = 2
             } else {
               this.propForm.result = []
             }
-
             this.propForm.click_ref = "cruor"
             break
           case 'symptom_after_dialysis':
             this.propForm.isHasOther = 2
 
             this.visibility = true
+            this.propForm.list = []
+
             this.propForm.list = getDataConfig('hemodialysis','symptoms');
             this.propForm.optionList = []
             this.propForm.isMultiple = 2
             this.propForm.title = '导管'
             this.visibility = true
             this.propForm.isHasOther = 2
+            this.propForm.list = []
 
             this.propForm.list = getDataConfig('hemodialysis','catheter')
             this.propForm.optionList = []
             this.propForm.isHasOther = 2
 
             this.visibility = true
+            this.propForm.list = []
+
             this.propForm.list = getDataConfig('hemodialysis','complication')
             this.propForm.optionList = []
             this.propForm.isMultiple = 2
             this.isShowDialog = false
             this.propForm.title = '内瘘'
             this.visibility = true
+            this.propForm.list = []
             this.propForm.list = getDataConfig('hemodialysis','internal_fistula')
             this.propForm.optionList = []
             this.propForm.isMultiple = 2
             this.propForm.title = '交待病房护士/患者/陪人观察内容'
             this.visibility = true
             this.propForm.isHasOther = 2
+            this.propForm.list = []
 
             this.propForm.list = this.$store.getters.observation_content
             this.propForm.optionList = []
             this.propForm.title = '透析过程提前原因'
             this.visibility = true
             this.propForm.isHasOther = 2
+            this.propForm.list = []
 
             this.propForm.list = this.$store.getters.in_advance_reason
             this.propForm.optionList = []
             this.propForm.title = '失衡综合症情况'
             this.visibility = true
             this.propForm.isHasOther = 2
+            this.propForm.list = []
 
             this.propForm.list = this.$store.getters.disequilibrium_syndrome_option
             this.propForm.optionList = []
             this.isShowDialog = false
             this.propForm.title = '动脉管道'
             this.propForm.isHasOther = 2
+            this.propForm.list = []
 
             this.visibility = true
             this.propForm.list = []
       let initMinute = ''
       let tempHour = ''
       let tempMinute = ''
+      this.template_id = this.$store.getters.user.template_info.template_id
 
-      if (this.record != null && this.record.id != '' && this.record.assessment_doctor != 0) {
+      if (this.record != null && this.record.id != '' ) {
         for (const key in this.formValue) {
           // console.log(key, this.record[key]);
           this.formValue[key] = this.record[key];
         }
-      }else if (this.last_record != null && this.last_record.id != "") {
-        for (const key in this.formValue) {
-          // console.log(key, this.record[key]);
-          this.formValue[key] = this.last_record[key];
-        }
-        if (this.record != null && this.record.id != '' && this.record.assessment_doctor == 0){
-          this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)
-          this.$set(this.formValue, "weight_after", this.record.weight_after)
-          this.$set(this.formValue, "weight_loss", this.record.weight_loss)
-        } else {
-          this.$set(this.formValue, "actual_ultrafiltration", '')
-          this.$set(this.formValue, "weight_after", '')
-          this.$set(this.formValue, "weight_loss", '')
-        }
-      } 
-  
+      }
+      // else  {
+        // if (this.record != null && this.record.id != '' && this.record.assessment_doctor == 0){
+        //   this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)
+        //   this.$set(this.formValue, "weight_after", this.record.weight_after)
+        //   this.$set(this.formValue, "weight_loss", this.record.weight_loss)
+        //   this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)
+        //   this.$set(this.formValue, "actual_displacement", this.record.actual_displacement)
+        //   this.$set(this.formValue, "actual_treatment_hour", this.record.actual_treatment_hour)
+        //   this.$set(this.formValue, "actual_treatment_minute", this.record.actual_treatment_minute)
+        // } else {
+          // this.$set(this.formValue, "actual_ultrafiltration", '')
+          // this.$set(this.formValue, "weight_after", '')
+          // this.$set(this.formValue, "weight_loss", '')
+          // this.$set(this.formValue, "actual_ultrafiltration", '')
+          // this.$set(this.formValue, "actual_displacement", '')
+          // this.$set(this.formValue, "actual_treatment_hour", '')
+          // this.$set(this.formValue, "actual_treatment_minute", '')
+        // }
+      // }
+
 
 
 

src/pages/main/dialog/TwoMenu.vue

       this.single.id_key = id_key;
       this.handle_select = handle_select;
       this.handle_hide = handle_hide;
+      console.log( this.single.cur_id )
     },
     // showMutableSelect(list_options, selected_values, title, show_key, id_key, handle_select) {
     //   this.show = true

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

 
 <script>
 export default {
-  name: "SelectAdviceTemplate",
+  name: 'SelectAdviceTemplate',
   props: {
     visibility: {
       type: Boolean,
     templates: {
       type: Array,
       default: () => {
-        return [];
+        return []
       }
     }
   },
-  data() {
+  data () {
     return {
       fold_template_ids: [],
       selecting_advice_ids: []
-    };
+    }
   },
   methods: {
-    backAction: function() {
-      this.$emit("back");
+    backAction: function () {
+      this.$emit('back')
     },
-    foldTemplateAction: function(template_id) {
+    foldTemplateAction: function (template_id) {
       for (let index = 0; index < this.fold_template_ids.length; index++) {
         if (this.fold_template_ids[index] == template_id) {
-          this.fold_template_ids.splice(index, 1);
-          return;
+          this.fold_template_ids.splice(index, 1)
+          return
         }
       }
-      this.fold_template_ids.push(template_id);
+      this.fold_template_ids.push(template_id)
     },
-    selectAdviceAction: function(template, advice) {
-      var isCancelSelect = false;
+    selectAdviceAction: function (template, advice) {
+      var isCancelSelect = false
       for (let index = 0; index < this.selecting_advice_ids.length; index++) {
         if (this.selecting_advice_ids[index].advice_id == advice.id) {
-          this.selecting_advice_ids.splice(index, 1);
-          isCancelSelect = true;
-          break;
+          this.selecting_advice_ids.splice(index, 1)
+          isCancelSelect = true
+          break
         }
       }
       if (!isCancelSelect) {
         this.selecting_advice_ids.push({
           template_id: template.id,
           advice_id: advice.id
-        });
+        })
       }
     },
-    selectTemplateAllAdviceAction: function(template) {
+    selectTemplateAllAdviceAction: function (template) {
       for (
         let index = 0;
         index < template.DoctorAdviceTemplate.length;
         index++
       ) {
-        const advice = template.DoctorAdviceTemplate[index];
+        const advice = template.DoctorAdviceTemplate[index]
         if (advice.parent_id > 0) {
-          continue;
+          continue
         }
-        var didSelect = false;
+        var didSelect = false
         for (
           let s_a_index = 0;
           s_a_index < this.selecting_advice_ids.length;
           s_a_index++
         ) {
           if (this.selecting_advice_ids[s_a_index].advice_id == advice.id) {
-            didSelect = true;
-            break;
+            didSelect = true
+            break
           }
         }
         if (!didSelect) {
           this.selecting_advice_ids.push({
             template_id: template.id,
             advice_id: advice.id
-          });
+          })
         }
       }
     },
-    cancelSelectTemplateAllAdviceAction: function(template) {
+    cancelSelectTemplateAllAdviceAction: function (template) {
       for (
         let index = this.selecting_advice_ids.length - 1;
         index >= 0;
         index--
       ) {
         if (this.selecting_advice_ids[index].template_id == template.id) {
-          this.selecting_advice_ids.splice(index, 1);
+          this.selecting_advice_ids.splice(index, 1)
         }
       }
     },
-    submitAction: function() {
-      var advices = [];
+    submitAction: function () {
+      var advices = []
       // WAIN: 效率低，可以通过在 selecting_advice_ids 加上 template_index 和 advice_index 字段来消除 this.templates 的循环
       for (let t_a_i = 0; t_a_i < this.selecting_advice_ids.length; t_a_i++) {
-        const tpl_advice = this.selecting_advice_ids[t_a_i];
+        const tpl_advice = this.selecting_advice_ids[t_a_i]
         for (let t_i = 0; t_i < this.templates.length; t_i++) {
-          const tpl = this.templates[t_i];
+          const tpl = this.templates[t_i]
           if (tpl.id == tpl_advice.template_id) {
-            var child_begin = false;
+            var child_begin = false
             for (let a_i = 0; a_i < tpl.DoctorAdviceTemplate.length; a_i++) {
-              const adv = tpl.DoctorAdviceTemplate[a_i];
+              const adv = tpl.DoctorAdviceTemplate[a_i]
               if (adv.id == tpl_advice.advice_id) {
-                advices.push(adv);
-                child_begin = true;
+                advices.push(adv)
+                child_begin = true
               } else if (child_begin == true) {
                 if (adv.parent_id == tpl_advice.advice_id) {
-                  advices.push(adv);
+                  advices.push(adv)
                 } else {
-                  break;
+                  break
                 }
               }
             }
           }
         }
       }
-      this.$emit("finish", advices);
+      this.$emit('finish', advices)
 
       this.$nextTick(() => {
-        this.fold_template_ids = [];
-        this.selecting_advice_ids = [];
-      });
+        this.fold_template_ids = []
+        this.selecting_advice_ids = []
+      })
     },
 
-    isFold: function(template_id) {
+    isFold: function (template_id) {
       for (let index = 0; index < this.fold_template_ids.length; index++) {
         if (this.fold_template_ids[index] == template_id) {
-          return true;
+          return true
         }
       }
-      return false;
+      return false
     },
-    isAdviceSelecting: function(advice_id) {
+    isAdviceSelecting: function (advice_id) {
       for (let index = 0; index < this.selecting_advice_ids.length; index++) {
         if (this.selecting_advice_ids[index].advice_id == advice_id) {
-          return true;
+          return true
         }
       }
-      return false;
+      return false
     },
-    isTemplateSelectingAllAdvices: function(template) {
-      var count = 0;
+    isTemplateSelectingAllAdvices: function (template) {
+      var count = 0
       for (let t_a_i = 0; t_a_i < this.selecting_advice_ids.length; t_a_i++) {
         if (this.selecting_advice_ids[t_a_i].template_id == template.id) {
-          count++;
+          count++
         }
       }
 
-      var p_advice_count = 0;
+      var p_advice_count = 0
       for (
         let index = 0;
         index < template.DoctorAdviceTemplate.length;
         index++
       ) {
         if (template.DoctorAdviceTemplate[index].parent_id == 0) {
-          p_advice_count++;
+          p_advice_count++
         }
       }
       if (count < p_advice_count) {
-        return false;
+        return false
       } else {
-        return true;
+        return true
       }
     }
   }
-};
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss">
 .optionsBox {
   background: #fff;
-  max-height: 10.6rem;
+  max-height: 9.6rem;
   min-height: 5rem;
   overflow-y: scroll;
   @media only screen and (max-width: 812px) {

src/pages/main/dialog/subMenu/LongAdviceSubMenu.vue

              <div style="padding-top: 15px;padding-left: 10px">开嘱医生&nbsp;{{ getDoctorName(advice.advice_doctor) }}</div><br/>
               <div style="padding-left: 10px">开嘱时间&nbsp;{{ getTime(advice.created_time) }}</div><br/>
               <div style="padding-bottom: 15px;padding-left: 10px"> 医嘱内容&nbsp;{{getContent(advice)}}</div>
+              <div style="padding-bottom: 15px;padding-left: 10px" v-if="advice.frequency_type == 1"> 推送频率 每日必推</div>
+              <div style="padding-bottom: 15px;padding-left: 10px" v-if="advice.frequency_type == 2"> 推送频率&nbsp;{{advice.day_count}}天/次</div>
+              <div style="padding-bottom: 15px;padding-left: 10px" v-if="advice.frequency_type == 3"> 推送频率&nbsp;每周{{advice.week_day}}</div>
 
             </van-checkbox>
           </van-checkbox-group>
       }, getContent (val) {
         let prescribing_number = ''
         let single_dose = ''
+        let advice_desc = ''
+
         if (val.prescribing_number > 0) {
           prescribing_number = val.prescribing_number + val.prescribing_number_unit
         }
         if (val.single_dose > 0) {
           single_dose = ' 单次用量 ' + val.single_dose + val.single_dose_unit
         }
+
+        if (val.advice_desc > 0) {
+          advice_desc = val.advice_desc + val.drug_spec_unit
+        }
+
         let name = ""
         if (val.child.length > 0){
           for (let i = 0 ; i < val.child.length; i++){
               val.child[i]['single'] = ''
             }
             name = name+"▲"+val.child[i].advice_name+""
-              + val.child[i].drug_spec
+              + val.child[i].advice_desc
               + val.child[i].drug_spec_unit
               + val.child[i].presc
               + val.child[i].single
           }
-          return  val.advice_name +"  "+ val.drug_spec+" "
+          return  val.advice_name +"  "+advice_desc+" "
             + val.drug_spec_unit
             + prescribing_number
             + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark +name
 
         } else {
-          return val.advice_name +"  "+ val.drug_spec+" "
-            + val.drug_spec_unit
+          return val.advice_name +"  "+advice_desc
             + prescribing_number
             + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark
         }
       },
       getValue: function () {
         let form = {}
-
         let results = []
-
         for (let i = 0; i < this.propsForm.list.length; i++){
           for (let a = 0; a < this.propsForm.result.length; a++){
             if( this.propsForm.list[i].id == this.propsForm.result[a]){
             }
           }
         }
-
         var obj5={}
         results = results.reduce((cur, next) => {
           obj5[next.id] ? '' : obj5[next.id] = true && cur.push(next)
           return cur
         }, [])
-
-        results
-
         return results
       },
 

src/pages/main/dialog/subMenu/MsgTip.vue

+<template>
+  <div v-if="visibility" class="Dialog">
+    <div class="DialogTit">
+      <div class="back" @click="cancle()">
+        <span class="iconfont">&#xe720; </span>返回
+      </div>
+      <h1 class="name">{{patient_prop.name}} [透析号 {{patient_prop.dialysis_no}} ]</h1>
+      <span @click="comfirm" class="success" >确定</span
+      >
+    </div>
+
+    <div class="DialogContent">
+        <div class="item">
+          <label class="name" for="txms">本次透析日期</label>
+          <div class="content">
+            <span class="text" id="txms"> {{dialysis_date}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">透前体重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{predialysis.weight_before}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">干体重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{last_predialysis.dry_weight}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">衣物重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{predialysis.additional_weight}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">体重增加（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{add_weight}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">透后体重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{record.weight_after}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">体重减少（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{record.weight_loss}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">上次透后体重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{predialysis.weight_after_last_transparency}}</span>
+            
+          </div>
+        </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {parseTime} from '@/utils'
+
+  export default {
+    name: 'LongAdviceSubMenu',
+    created () {
+      if (predialysis.weight_before > 0 && predialysis.weight_after_last_transparency > 0) {
+        add_weight = parseFloat(predialysis.weight_before - predialysis.weight_after_last_transparency).toFixed(2)
+      }
+    },
+    data () {
+      return {
+        result: [],
+        id: 0,
+        selectName: '',
+        add_weight:0
+      }
+    },
+    props: {
+      predialysis: {
+        type: Object
+      },
+      visibility: {
+        type: Boolean,
+        default: false
+      },
+      last_predialysis: {
+        type: Object
+      },
+      record: {
+        type: Object
+      },
+      last_record: {
+        type: Object
+      },
+      patient_prop: {
+        type: Object
+      },
+      prescription_prop: {
+        type: Object
+      },
+    },
+    computed: {
+    dialysis_date: function () {
+      return parseTime(this.$route.query.date, '{y}/{m}/{d}')
+      }
+    },
+    methods: {
+
+
+      cancle: function () {
+        this.$emit('menu-msg-tip')
+      },
+      comfirm: function () {
+        this.$emit('menu-msg-tip')
+      },
+      getValue: function () {
+        let form = {}
+
+        let results = []
+
+        for (let i = 0; i < this.propsForm.list.length; i++){
+          for (let a = 0; a < this.propsForm.result.length; a++){
+            if( this.propsForm.list[i].id == this.propsForm.result[a]){
+              results.push(this.propsForm.list[i])
+            }
+          }
+        }
+
+        var obj5={}
+        results = results.reduce((cur, next) => {
+          obj5[next.id] ? '' : obj5[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+        results
+
+        return results
+      },
+
+    },
+    watch: {
+      visibility (val) {
+        //初始化数据操作
+      }
+    }
+  }
+</script>
+
+<style style="stylesheet/scss" lang="scss" scoped>
+  .optionsBox {
+  background: #fff;
+  max-height: 10rem;
+  min-height: 5rem;
+  @media only screen and (max-width: 812px) {
+  min-height: 8rem !important;
+  }
+  ul {
+  overflow-y: scroll;
+  max-height: 9rem;
+  li {
+  height: 1.1rem;
+  line-height: 1.1rem;
+  border-bottom: 1px #e5e5e5 solid;
+  padding: 0 0.38rem;
+  font-size: 0.36rem;
+  color: $title-color;
+  }
+  .tick {
+  position: relative;
+  &::before {
+  content: "";
+  display: inline-block;
+  border: 2px solid $main-color;
+  border-top-width: 0;
+  border-right-width: 0;
+  width: 0.3rem;
+  height: 0.15rem;
+  -webkit-transform: rotate(-50deg);
+  position: absolute;
+  top: 0.38rem;
+  right: 0.44rem;
+  }
+  }
+  }
+  }
+  .CheckBox {
+  background: #fff;
+  max-height: 6.8rem;
+  min-height: 5rem;
+  overflow-y: scroll;
+  @media only screen and (max-width: 812px) {
+  max-height: 8rem !important;
+  min-height: 8rem !important;
+  }
+
+  ul {
+  li {
+  line-height: 1rem;
+  }
+  }
+  }
+</style>

src/pages/main/dialog/subMenu/dryWeightMenu.vue

+<template>
+  <div>
+    <div class="Dialog" v-if="visibility">
+      <div class="DialogTit">
+        <span class="iconfont" @click="closeDialog()">&#xe720; 返回</span>
+        <h1 class="name">干体重调整</h1>
+        <span class="success" @click="commitDryWeight()">提交</span>
+      </div>
+
+      <div class="DialogContent">
+        <div class="item">
+          <label class="name" for="xll">干体重</label>
+          <div class="content">
+            <input autofocus placeholder="请输入干体重" type="tel" id="xll" v-model="dry_weight"/>
+          </div>
+        </div>
+
+        <div class="item" @click="select_nurse">
+          <h2 class="name">医生</h2>
+          <div class="content">
+            <span class="text" style="width: 100px">{{getDoctorName(this.creator)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+
+        <div class="item">
+          <h2 class="name">备注</h2>
+          <div class="content">
+            <input type="tel" id="xll" v-model="remark"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!--<two-menu ref="selector">-->
+    <!--</two-menu>-->
+    <two-menu ref="selector"></two-menu>
+  </div>
+</template>
+
+<script>
+
+  import TwoMenu from '../TwoMenu'
+  import {CreateDryWeight} from '@/api/dialysis'
+
+  export default {
+
+    name: 'dryWeightMenu',
+    components: {TwoMenu},
+    data () {
+      return {
+        dry_weight: 0,
+        remark: '',
+        creator: 0,
+        visibility: false
+
+      }
+    },
+    props: {
+      propsForm: {
+        type: Object
+      },
+    },
+    methods: {
+      open () {
+        this.creator = this.$store.getters.user.user.id
+        this.dry_weight =  this.propsForm.weight
+        this.visibility = true
+      },
+      close () {
+        this.visibility = false
+      },
+      closeDialog () {
+        this.$emit('menu-cancle-two')
+
+      }, commitDryWeight () {
+        let params = {
+          id: this.$route.query.patient_id,
+          dry_weight: this.dry_weight,
+          remark: this.remark,
+          doctor_id: this.creator,
+        }
+        CreateDryWeight(params).then(rs => {
+          var res = rs.data
+          if (res.state == 1) {
+            this.$message.success("提交成功");
+            this.$emit('menu-comfirm-two',res.data.weight)
+
+          }
+        })
+      }, select_nurse () {
+        this.close()
+        var _this = this
+        if (this.$store.getters.user.user.user_type = 2) {
+          this.$refs.selector.showSingleSelect(this.propsForm.doctor, _this.creator, '选择医生', 'name', 'id', function (select_id) {
+            _this.visibility = true
+            _this.creator = select_id
+          }, function () {
+            _this.visibility = true
+          })
+        }
+      }, getDoctorName (id) {
+        for (let i = 0; i < this.propsForm.doctor.length; i++) {
+          if (this.propsForm.doctor[i].id == id) {
+            return this.propsForm.doctor[i].name
+          }
+        }
+
+      }
+    },
+  }
+</script>
+
+<style style="stylesheet/scss" lang="scss" scoped>
+  .optionsBox {
+  background: #fff;
+  max-height: 10.6rem;
+  min-height: 5rem;
+  overflow-y: scroll;
+  @media only screen and (max-width: 812px) {
+  min-height: 8rem !important;
+  }
+  ul {
+  li {
+  height: 1rem;
+  line-height: 1rem;
+  border-bottom: 1px #e5e5e5 solid;
+  padding: 0 0.38rem;
+  }
+  .tick {
+  position: relative;
+  &::before {
+  content: "";
+  display: inline-block;
+  border: 2px solid $main-color;
+  border-top-width: 0;
+  border-right-width: 0;
+  width: 0.3rem;
+  height: 0.15rem;
+  -webkit-transform: rotate(-50deg);
+  position: absolute;
+  top: 0.38rem;
+  right: 0.44rem;
+  }
+  }
+  }
+  }
+  .CheckBox {
+  background: #fff;
+  max-height: 10.6rem;
+  min-height: 5rem;
+  overflow-y: scroll;
+  ul {
+  li {
+  line-height: 1rem;
+  }
+  }
+  }
+</style>

src/pages/main/dialog/subMenu/newCheckBoxSubMenu.vue

 
 <script>
 export default {
-  name: "newCheckBoxSubMenu",
-  created() {},
-  data() {
+  name: 'newCheckBoxSubMenu',
+  created () {},
+  data () {
     return {
       result: [],
       id: 0,
-      selectName: ""
-    };
+      selectName: ''
+    }
   },
   props: {
     propsForm: {
     }
   },
   methods: {
-    cancle: function() {
-      this.$emit("menu-cancle");
+    cancle: function () {
+      this.$emit('menu-cancle')
     },
-    comfirm: function() {
-      this.$emit("menu-comfirm", this.getValue());
+    comfirm: function () {
+      this.$emit('menu-comfirm', this.getValue())
     },
-    getValue: function() {
-      let form = {};
+    getValue: function () {
+      let form = {}
       if (this.propsForm.isMultiple == 2) {
-        form["type"] = this.propsForm.type;
-        form["result"] = this.propsForm.result;
+        form['type'] = this.propsForm.type
+        form['result'] = this.propsForm.result
         // form["click_ref"] = this.propsForm.click_ref
       } else {
-        form["type"] = this.propsForm.type;
-        form["selectId"] = this.propsForm.selectId;
+        form['type'] = this.propsForm.type
+        form['selectId'] = this.propsForm.selectId
         // form["click_ref"] = this.propsForm.click_ref
       }
-      return form;
+      return form
     },
-    itemClick: function(id) {
+    itemClick: function (id) {
       if (id == -2) {
-        this.$emit("menu-empty", this.getValue());
+        this.$emit('menu-empty', this.getValue())
       }
-      this.propsForm.selectId = id;
-      this.$emit("menu-comfirm", this.getValue());
+      this.propsForm.selectId = id
+      this.$emit('menu-comfirm', this.getValue())
     }
   },
   watch: {
-    visibility(val) {
-      //初始化数据操作
+    visibility (val) {
+      // 初始化数据操作
     }
   }
-};
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
 .optionsBox {
   background: #fff;
-  max-height: 10.6rem;
+  max-height: 9.6rem;
   min-height: 5rem;
   overflow-y: scroll;
   @media only screen and (max-width: 812px) {

src/pages/main/index.vue

         }
       });
     },
+<<<<<<< .mine
     requestDialysisScheduals() {
       var date = this.$store.getters.app.dialysis_area.schedule_date;
       var type = 0;
               for (let y = 0; y < schedual.doctor_advice.length; y++) {
                 if (schedual.doctor_advice[y].execution_state == 2) {
                   doctorAdvice.push(schedual.doctor_advice[y]);
+=======
+    methods: {
+
+      requestScheduals () {
+        var storedata = this.$store.getters.waitscheduals
+        var scheduals = storedata.waitscheduals
+        if (Object.keys(storedata).length > 0){
+              this.scheduals = scheduals
+              console.log(this.scheduals)
+              let doctorAdvice = []
+              for (let i = 0; i < this.scheduals.length; i++) {
+                for (let y = 0; y < this.scheduals[i].doctor_advice.length; y++) {
+                  if(this.scheduals[i].dialysis_order == null ){
+                    if (this.scheduals[i].doctor_advice[y].execution_state == 2) {
+                      doctorAdvice.push(this.scheduals[i].doctor_advice[y])
+                    }
+                  }
+
+>>>>>>> .theirs
                 }
               }
-            }
 
+<<<<<<< .mine
             const sorted = this.groupBy(doctorAdvice, function(item) {
               return [item.groupno];
             });
 
+=======
+              const sorted = this.groupBy(doctorAdvice, function (item) {
+                return [item.groupno]
+              })
+              this.unReadWaitNum = sorted.length
+>>>>>>> .theirs
+
+<<<<<<< .mine
             this.unReadDialysisNum = sorted.length;
           } else {
             this.$toast({
           }
         })
         .catch(v => {});
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+        } else {
+          var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
+          getWaitingScheduals({date: date}).then(rs => {
+            var resp = rs.data
+             this.$store.dispatch("SetRequestScheduals",{resp})
+            // console.log(resp);
+            if (resp.state == 1) {
+              var scheduals = resp.data.scheduals
+              this.scheduals = scheduals
+              console.log(this.scheduals)
+              let doctorAdvice = []
+              for (let i = 0; i < this.scheduals.length; i++) {
+                for (let y = 0; y < this.scheduals[i].doctor_advice.length; y++) {
+                  if(this.scheduals[i].dialysis_order == null ){
+                    if (this.scheduals[i].doctor_advice[y].execution_state == 2) {
+                      doctorAdvice.push(this.scheduals[i].doctor_advice[y])
+                    }
+                  }
+                }
+              }
+
+              const sorted = this.groupBy(doctorAdvice, function (item) {
+                return [item.groupno]
+              })
+
+
+              this.unReadWaitNum = sorted.length
+
+            } else {
+              this.$toast({
+                message: resp.msg
+              })
+            }
+          })
+        }
+      },
+      requestDialysisScheduals () {
+        var storedata = this.$store.getters.scheduals
+        var scheduals = storedata.scheduals
+        if (Object.keys(storedata).length > 0){
+          let doctorAdvice = []
+          for (let index = 0; index < scheduals.length; index++) {
+            const schedual = scheduals[index]
+            if (schedual.dialysis_order == null) {
+              continue
+            }
+            for (let y = 0; y < schedual.doctor_advice.length; y++) {
+              if (schedual.doctor_advice[y].execution_state == 2) {
+                doctorAdvice.push(schedual.doctor_advice[y])
+              }
+            }
+          }
+
+          const sorted = this.groupBy(doctorAdvice, function (item) {
+            return [item.groupno]
+          })
+
+          this.unReadDialysisNum = sorted.length
+        }else {
+          var date = this.$store.getters.app.dialysis_area.schedule_date
+          var type = 0
+          getDialysisScheduals({type: type, date: parseTime(date, '{y}-{m}-{d}')})
+            .then(rs => {
+              var resp = rs.data
+              this.$store.dispatch("SetRequestDialysisScheduals",{resp})
+              if (resp.state == 1) {
+                var scheduals = resp.data.scheduals
+                let doctorAdvice = []
+                for (let index = 0; index < scheduals.length; index++) {
+                  const schedual = scheduals[index]
+                  if (schedual.dialysis_order == null) {
+                    continue
+                  }
+                  for (let y = 0; y < schedual.doctor_advice.length; y++) {
+                    if (schedual.doctor_advice[y].execution_state == 2) {
+                      doctorAdvice.push(schedual.doctor_advice[y])
+                    }
+                  }
+                }
+
+                const sorted = this.groupBy(doctorAdvice, function (item) {
+                  return [item.groupno]
+                })
+
+                this.unReadDialysisNum = sorted.length
+
+              } else {
+                this.$toast({
+                  message: resp.msg
+                })
+              }
+            })
+            .catch(v => {
+            })
+          }
+      }, groupBy (array, f) {
+        const groups = {}
+        array.forEach(function (o) {
+          const group = JSON.stringify(f(o))
+          groups[group] = groups[group] || []
+          groups[group].push(o)
+        })
+        return Object.keys(groups).map(function (group) {
+          return groups[group]
+        })
+      },getData(){
+        console.log("111111")
+        // this.requestScheduals()
+        // this.requestDialysisScheduals()
+      }
+
+>>>>>>> .theirs
     },
     groupBy(array, f) {
       const groups = {};

src/pages/main/template/DialysisPrintOrderFive.vue

                   <check-box text="清醒" :checked="receiverTreatmentAccess.consciousness==1?true:false"></check-box>
                   <check-box text="嗜睡" :checked="receiverTreatmentAccess.consciousness==2?true:false"></check-box>
                   <check-box text="昏迷" :checked="receiverTreatmentAccess.consciousness==3?true:false"></check-box>
+                  <check-box text="模糊" :checked="receiverTreatmentAccess.consciousness==4?true:false"></check-box>
+
                 </div>
                 <div class="inline_block"  style="margin-left: 5px;">
                   活动性出血：

src/pages/main/template/DialysisPrintOrderOne.vue

                       </div>
                     </td>
                     <td width="50">意识:</td>
-                    <td width="180">
+                    <td width="220">
                       <div>
                         <label-box :isChecked='receiverTreatmentAccess.consciousness==1?true:false'
                                    showValue='清醒'></label-box>
                         &nbsp;
                         <label-box :isChecked='receiverTreatmentAccess.consciousness==2?true:false'
                                    showValue='嗜睡'></label-box>
-                        &nbsp;
                         <label-box :isChecked='receiverTreatmentAccess.consciousness==3?true:false'
                                    showValue='昏迷'></label-box>
+                        <label-box :isChecked='receiverTreatmentAccess.consciousness==4?true:false'
+                                   showValue='模糊'></label-box>
                       </div>
                     </td>
                     <td width="10"></td>

src/pages/main/template/DialysisPrintOrderTwo.vue

                   <check-box text="轮椅" :checked="receiverTreatmentAccess.way==3?true:false"></check-box>
                   <check-box text="平车" :checked="receiverTreatmentAccess.way==4?true:false"></check-box>
                 </div>
-                <div class="inline_block" style="margin-left: 30px;">
+                <div class="inline_block" style="margin-left: 5px;">
                   透析频次：
                   <div class="under_line" style="width: 50px;text-align: left">
                     {{predialysis.dialysis_count?predialysis.dialysis_count:''}}
                   </div>
                   次/周
                 </div>
-                <div class="inline_block" style="margin-left: 30px;">
+                <div class="inline_block" style="margin-left: 5px;">
                   透析机编号:
                   <div class="under_line" style="width: 40px;text-align: left">{{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:patientInfo.DialysisSchedule.device_number.number}}</div>
                   型号
                   <div class="under_line" style="width: 70px;text-align: left">{{predialysis&&predialysis.machine_type.length > 0 ?predialysis.machine_type:''}}</div>
                 </div>
+
+
               </div>
               <div class="row" style="padding: 2px 0;line-height:19px;">
                 <div class="inline_block" >
                   <check-box text="清醒" :checked="receiverTreatmentAccess.consciousness==1?true:false"></check-box>
                   <check-box text="嗜睡" :checked="receiverTreatmentAccess.consciousness==2?true:false"></check-box>
                   <check-box text="昏迷" :checked="receiverTreatmentAccess.consciousness==3?true:false"></check-box>
+                  <check-box text="模糊" :checked="receiverTreatmentAccess.consciousness==4?true:false"></check-box>
                 </div>
-                <div class="inline_block"  style="margin-left: 20px;">
+                <div class="inline_block"  >
                   活动性出血：
                   <check-box text="无" :checked="predialysis.is_hemorrhage==2?true:false"></check-box>
                   <check-box text="异常" :checked="predialysis.is_hemorrhage==1?true:false"></check-box>
                   <td>{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}}/{{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}</td>
                   <td>{{monitor.venous_pressure?monitor.venous_pressure:''}}/{{monitor.arterial_pressure?monitor.arterial_pressure:''}}</td>
                   <td>{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
-                  <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:'/'}}</td>
+                  <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume / 1000:'/'}}</td>
                   <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
                   <td style="line-height:16px;padding:0px;"><div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">{{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}} </span> </div></td>
                   <td>
                   <td>{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}}/{{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}</td>
                   <td>{{monitor.venous_pressure?monitor.venous_pressure:''}}/{{monitor.arterial_pressure?monitor.arterial_pressure:''}}</td>
                   <td>{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
-                  <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:'/'}}</td>
+                  <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume /1000:'/'}}</td>
                   <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
                   <td style="line-height:16px;"><div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">{{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}}</span></div>  </td>
                   <td>

src/pages/main/today/acceptsAssessment.vue

           <span class="content">{{this.record.sick_condition_other}}</span>
         </li>
 
+<<<<<<< .mine
         <li v-if="isShow('摄入量')">
+=======
+        <li style="height: 0.6rem;"  v-if="isShow('摄入量')">
+>>>>>>> .theirs
           <label>摄入量:</label>
           <span class="content">{{intakes}}</span>
         </li>
 
         <!-- </ul>
 
-
         <ul >-->
         <li v-if="isShow('营养状况')">
           <label>营养状况:</label>
           <span class="content">{{this.record.psychological_other}}</span>
         </li>
       </ul>
+<<<<<<< .mine
+
+=======
+
+>>>>>>> .theirs
     </div>
   </div>
 </template>
 
 <script>
 export default {
-  name: "AcceptsAssessment",
-  data() {
+  name: 'AcceptsAssessment',
+  data () {
     return {
-      title: "接诊评估 ",
+      title: '接诊评估 ',
 
       ways: {
+<<<<<<< .mine
         "1": "步行",
         "2": "扶行",
         "3": "轮椅",
         "4": "平车"
+=======
+        '1': '步行',
+        '2': '扶行',
+        '3': '轮椅',
+        '4': '平车'
+>>>>>>> .theirs
       },
       conditions: {
+<<<<<<< .mine
         "1": "住院",
         "2": "门诊",
         "3": "手术期"
+=======
+        '1': '住院',
+        '2': '门诊',
+        '3': '手术期'
+>>>>>>> .theirs
       },
       consciousnesses: {
+<<<<<<< .mine
         "1": "清醒",
         "2": "嗜睡",
         "3": "昏迷"
+
+=======
+        '1': '清醒',
+        '2': '嗜睡',
+        '3': '昏迷',
+        '4': '模糊'
+>>>>>>> .theirs
       },
       appetites: {
+<<<<<<< .mine
         "1": "正常",
         "2": "减退",
         "3": "恶心",
         "4": "呕吐",
         "5": "腹泻"
+=======
+        '1': '正常',
+        '2': '减退',
+        '3': '恶心',
+        '4': '呕吐',
+        '5': '腹泻'
+>>>>>>> .theirs
       },
       postures: {
+<<<<<<< .mine
         "1": "自动体位",
         "2": "平卧位",
         "3": "半卧位",
         "2": "约束带",
         "3": "床栏",
         "4": "加强宣教"
+
+=======
+        '1': '自动体位',
+        '2': '平卧位',
+        '3': '半卧位',
+        '4': '端坐位',
+        '5': '躁动不安'
+      },
+sick_condition: {
+        '1': '一般',
+        '2': '重',
+        '3': '危'
+      },
+danger_level: {
+        '1': '无',
+        '2': '低风险',
+        '3': '中度风险',
+        '4': '高风险'
+
+      },
+intake: {
+        '1': '正常',
+        '2': '减少'
+      }, 
+nutrition: {
+        '1': '正常',
+        '2': '营养不良'
+      }, 
+psychological_assessment: {
+        '1': '正常',
+        '2': '异常'
+      }, 
+precautionss: {
+        '1': '镇定剂',
+        '2': '约束带',
+        '3': '床栏',
+        '4': '加强宣教'
+>>>>>>> .theirs
       }
-    };
+    }
   },
   props: {
     record: {
     }
   },
   computed: {
+<<<<<<< .mine
     way: function() {
       if (this.record == null || this.record.id == "") {
         return "";
+=======
+    way: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+>>>>>>> .theirs
       } else {
+<<<<<<< .mine
         return this.ways[this.record.way] == undefined
           ? ""
           : this.ways[this.record.way] + "";
+=======
+        return this.ways[this.record.way] == undefined ? '' : (this.ways[this.record.way] + '')
+
+
+>>>>>>> .theirs
       }
     },
+<<<<<<< .mine
     condition: function() {
       if (this.record == null || this.record.id == "") {
         return "";
+=======
+    condition: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+>>>>>>> .theirs
       } else {
+<<<<<<< .mine
         return this.conditions[this.record.condition] == undefined
           ? ""
           : this.conditions[this.record.condition] + "";
+=======
+        return this.conditions[this.record.condition] == undefined ? '' : this.conditions[this.record.condition] + ''
+
+
+>>>>>>> .theirs
       }
     },
+<<<<<<< .mine
     consciousness: function() {
       if (this.record == null || this.record.id == "") {
         return "";
+=======
+    consciousness: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+>>>>>>> .theirs
       } else {
+<<<<<<< .mine
         return this.consciousnesses[this.record.consciousness] == undefined
           ? ""
           : this.consciousnesses[this.record.consciousness] + "";
+=======
+        return this.consciousnesses[this.record.consciousness] == undefined ? '' : this.consciousnesses[this.record.consciousness] + ''
+
+
+>>>>>>> .theirs
       }
     },
+<<<<<<< .mine
     appetite: function() {
       if (this.record == null || this.record.id == "") {
         return "";
+=======
+    appetite: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+>>>>>>> .theirs
       } else {
+<<<<<<< .mine
         return this.appetites[this.record.appetite] == undefined
           ? ""
           : this.appetites[this.record.appetite] + "";
+=======
+        return this.appetites[this.record.appetite] == undefined ? '' : this.appetites[this.record.appetite] + ''
+
+
+>>>>>>> .theirs
       }
     },
+<<<<<<< .mine
     posture: function() {
       if (this.record == null || this.record.id == "") {
         return "";
+=======
+    posture: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+>>>>>>> .theirs
       } else {
+<<<<<<< .mine
         return this.postures[this.record.posture] == undefined
           ? ""
           : this.postures[this.record.posture] + "";
+=======
+        return this.postures[this.record.posture] == undefined ? '' : this.postures[this.record.posture] + ''
+
+
+>>>>>>> .theirs
       }
+<<<<<<< .mine
     },
     sickCondition: function() {
       if (this.record == null || this.record.id == "") {
         return "";
+=======
+    }, 
+sickCondition: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+>>>>>>> .theirs
       } else {
+<<<<<<< .mine
         return this.sick_condition[this.record.sick_condition] == undefined
           ? ""
           : this.sick_condition[this.record.sick_condition] + "";
+=======
+        return this.sick_condition[this.record.sick_condition] == undefined ? '' : this.sick_condition[this.record.sick_condition] + ''
+
+
+>>>>>>> .theirs
       }
+<<<<<<< .mine
     },
     dangerLevel: function() {
       if (this.record == null || this.record.id == "") {
         return "";
+=======
+    }, 
+dangerLevel: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+>>>>>>> .theirs
       } else {
+<<<<<<< .mine
         return this.danger_level[this.record.danger_level] == undefined
           ? ""
           : this.danger_level[this.record.danger_level] + "";
+=======
+        return this.danger_level[this.record.danger_level] == undefined ? '' : this.danger_level[this.record.danger_level] + ''
+
+
+>>>>>>> .theirs
       }
+<<<<<<< .mine
     },
     precautions: function() {
       if (this.record == null || this.record.id == "") {
         return "";
+=======
+    }, 
+precautions: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+>>>>>>> .theirs
       } else {
+<<<<<<< .mine
         return this.precautionss[this.record.precaution] == undefined
           ? ""
           : this.precautionss[this.record.precaution] + "";
+=======
+        return this.precautionss[this.record.precaution] == undefined ? '' : this.precautionss[this.record.precaution] + ''
+
+
+>>>>>>> .theirs
       }
+<<<<<<< .mine
     },
     intakes: function() {
       if (this.record == null || this.record.id == "") {
         return "";
+=======
+    }, 
+intakes: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+>>>>>>> .theirs
       } else {
+<<<<<<< .mine
         return this.intake[this.record.intake] == undefined
           ? ""
           : this.intake[this.record.intake] + "";
+=======
+        return this.intake[this.record.intake] == undefined ? '' : this.intake[this.record.intake] + ''
+
+
+>>>>>>> .theirs
       }
+<<<<<<< .mine
     },
     nutritions: function() {
       if (this.record == null || this.record.id == "") {
         return "";
+=======
+    }, 
+nutritions: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+>>>>>>> .theirs
       } else {
+<<<<<<< .mine
         return this.nutrition[this.record.nutrition] == undefined
           ? ""
           : this.nutrition[this.record.nutrition] + "";
+=======
+        return this.nutrition[this.record.nutrition] == undefined ? '' : this.nutrition[this.record.nutrition] + ''
+
+
+>>>>>>> .theirs
       }
+<<<<<<< .mine
     },
     psychologicalAssessment: function() {
       if (this.record == null || this.record.id == "") {
         return "";
+=======
+    }, 
+psychologicalAssessment: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+>>>>>>> .theirs
       } else {
+<<<<<<< .mine
         return this.psychological_assessment[
           this.record.psychological_assessment
         ] == undefined
           : this.psychological_assessment[
               this.record.psychological_assessment
             ] + "";
+=======
+        return this.psychological_assessment[this.record.psychological_assessment] == undefined ? '' : this.psychological_assessment[this.record.psychological_assessment] + ''
+
+
+
+
+
+
+>>>>>>> .theirs
       }
     }
   },
   methods: {
+<<<<<<< .mine
     isShow(name) {
       var filedList = this.$store.getters.user.fileds;
+=======
+    isShow (name) {
+      var filedList = this.$store.getters.user.fileds
+>>>>>>> .theirs
 
+<<<<<<< .mine
       for (let i = 0; i < filedList.length; i++) {
         if (
           filedList[i].module == 2 &&
           filedList[i].is_show == 1
         ) {
           return true;
+=======
+      for (let i = 0; i < filedList.length; i++) {
+        if (filedList[i].module == 2 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+          return true
+
+
+
+
+>>>>>>> .theirs
         }
       }
+<<<<<<< .mine
       return false;
     }
+
+=======
+      return false
+    }
+
+>>>>>>> .theirs
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 </style>
-
-
-

src/pages/main/today/assessmentAfter.vue

         <li v-if="isShow('实际超滤量')">
           <label for="sjcll">实际超滤量: </label>
           <span class="content" id="sjcll">{{actual_ultrafiltration?actual_ultrafiltration:''}}</span>
-          <span class="unit">{{actual_ultrafiltration?"L":''}}</span>
+          <span v-if="template_id == 6" class="unit">{{actual_ultrafiltration?"ml":''}}</span>
+          <span v-else class="unit">{{actual_ultrafiltration?"L":''}}</span>
         </li>
         <li v-if="isShow('透析器凝血')">
           <label for="nx">透析器凝血 : </label>
         </li>
       <!-- </ul>
 
-
       <ul > -->
         <li v-if="isShow('透析过程')">
           <label for="tw">透析过程 : </label>
           <span class="content" id="tw" >{{in_advance_reason}}</span>
         </li>
 
-
-
         <li v-if="isShow('内瘘管拔针后压迫止血时间')">
           <label for="ml">内瘘管拔针后压迫止血时间 : </label>
           <span id="ml" class="content" v-if="hemostasis_minute">{{hemostasis_minute}}min</span>
 </template>
 
 <script>
-  export default {
-    name: "DialysisPrescription",
-    data() {
-      return {
-        title: "透后评估 ",
-        // note: "无明显异常",
-        // doctor: "刘小军  医生",
-        // info1: [
-        //   { value: "1", label: "透后体重 : ", content: "55", unit: "kg" },
-        //   { value: "2", label: "收缩压 : ", content: "174", unit: "mmHg" },
-        //   { value: "3", label: "实际超滤量: ", content: "20", unit: "ml" },
-        //   { value: "4", label: "疑血 : ", content: "无震颤", unit: "" },
-        //   { value: "5", label: "", content: "", unit: "" }
-        // ],
-        // info2: [
-        //   { value: "1", label: "体重减少 : ", content: "3", unit: "kg" },
-        //   { value: "2", label: "舒张压 : ", content: "200", unit: "mmHg" },
-        //   { value: "3", label: "实际置换量 : ", content: "20", unit: "ml" },
-        //   { value: "3", label: "透后症状 : ", content: "无症状", unit: "" },
-        //   { value: "4", label: "导管 : ", content: "导管堵塞", unit: "" }
-        // ],
-        // info3: [
-        //   { value: "1", label: "体温 : ", content: "14", unit: "℃" },
-        //   { value: "2", label: "心率 : ", content: "2", unit: "次/分" },
-        //   { value: "3", label: "实际治疗时长 : ", content: "4时4分", unit: "" },
-        //   { value: "4", label: "透析中入量: ", content: "一般", unit: "" },
-        //   { value: "4", label: "并发症: ", content: "痔疮出血", unit: "" }
-        // ]
-      };
-    },
-    props: {
-      record: {
-        type: Object,
-      }
-    },
-    computed: {
-      weight_after: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.weight_after
-      },
-      systolic_blood_pressure: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.systolic_blood_pressure
-      },
-      actual_ultrafiltration: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.actual_ultrafiltration
-      },
-      cruor: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.cruor
-      },
-      internal_fistula: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.internal_fistula;
-      },
-      weight_loss: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.weight_loss
-      },
-      inpatient_department: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.inpatient_department
-      },
-      patient_gose: function () {
-        if (this.record == null || this.record.id == "") {
-          return 0
-        }
-        return this.record.patient_gose
-      },
-      diastolic_blood_pressure: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.diastolic_blood_pressure
-      },
-      actual_displacement: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.actual_displacement
-      },
-      symptom_after_dialysis: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.symptom_after_dialysis
+export default {
+  name: 'DialysisPrescription',
+  data () {
+    return {
+      title: '透后评估 ',
+      template_id: 0
+      // note: "无明显异常",
+      // doctor: "刘小军  医生",
+      // info1: [
+      //   { value: "1", label: "透后体重 : ", content: "55", unit: "kg" },
+      //   { value: "2", label: "收缩压 : ", content: "174", unit: "mmHg" },
+      //   { value: "3", label: "实际超滤量: ", content: "20", unit: "ml" },
+      //   { value: "4", label: "疑血 : ", content: "无震颤", unit: "" },
+      //   { value: "5", label: "", content: "", unit: "" }
+      // ],
+      // info2: [
+      //   { value: "1", label: "体重减少 : ", content: "3", unit: "kg" },
+      //   { value: "2", label: "舒张压 : ", content: "200", unit: "mmHg" },
+      //   { value: "3", label: "实际置换量 : ", content: "20", unit: "ml" },
+      //   { value: "3", label: "透后症状 : ", content: "无症状", unit: "" },
+      //   { value: "4", label: "导管 : ", content: "导管堵塞", unit: "" }
+      // ],
+      // info3: [
+      //   { value: "1", label: "体温 : ", content: "14", unit: "℃" },
+      //   { value: "2", label: "心率 : ", content: "2", unit: "次/分" },
+      //   { value: "3", label: "实际治疗时长 : ", content: "4时4分", unit: "" },
+      //   { value: "4", label: "透析中入量: ", content: "一般", unit: "" },
+      //   { value: "4", label: "并发症: ", content: "痔疮出血", unit: "" }
+      // ]
+    }
+    },
+  props: {
+    record: {
+      type: Object
+    }
+  },
+created () {
+    this.template_id = this.$store.getters.user.template_info.template_id
+  },
+  computed: {
+    weight_after: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.weight_after
+    },
+    systolic_blood_pressure: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.systolic_blood_pressure
+    },
+    actual_ultrafiltration: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.actual_ultrafiltration
+    },
+    cruor: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.cruor
+    },
+    internal_fistula: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.internal_fistula
       },
-      blood_access_part: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        let vascular_access = this.$store.getters.vascular_access;
+    weight_loss: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.weight_loss
+    },
+    inpatient_department: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.inpatient_department
+    },
+    patient_gose: function () {
+      if (this.record == null || this.record.id == '') {
+        return 0
+      }
+      return this.record.patient_gose
+    },
+    diastolic_blood_pressure: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.diastolic_blood_pressure
+    },
+    actual_displacement: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.actual_displacement
+    },
+    symptom_after_dialysis: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.symptom_after_dialysis
+    },
+    blood_access_part: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      let vascular_access = this.$store.getters.vascular_access
         let valen = vascular_access.length
-        let name = '-';
+      let name = '-'
         for (let index = 0; index < valen; index++) {
-          if (vascular_access[index].id == this.record.blood_access_part_id) {
-            name = vascular_access[index].name;
+        if (vascular_access[index].id == this.record.blood_access_part_id) {
+          name = vascular_access[index].name
             break;
-          }
         }
-        return name
-      },
-      puncture_point_oozing_blood_name: function () {
-
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        switch (this.record.puncture_point_oozing_blood) {
-          case 1:
-            return '有'
-            break;
+      }
+      return name
+    },
+    puncture_point_oozing_blood_name: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      switch (this.record.puncture_point_oozing_blood) {
+        case 1:
+          return '有'
+          break
           case 2:
-            return '无'
-            break
+          return '无'
+          break
 
-          default:
-            return '-'
-            break;
+        default:
+          return '-'
+          break
         }
-      },eat_name:function(){
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        switch (this.record.is_eat) {
-          case 1:
-            return '有'
-            break;
+    }, 
+eat_name: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      switch (this.record.is_eat) {
+        case 1:
+          return '有'
+          break
           case 2:
-            return '无'
-            break
+          return '无'
+          break
 
-          default:
-            return '-'
-            break;
+        default:
+          return '-'
+          break
         }
-      },
-      patient_gose_name: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        switch (this.record.patient_gose) {
-          case 1:
-            return '离院'
-            break;
+    },
+    patient_gose_name: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      switch (this.record.patient_gose) {
+        case 1:
+          return '离院'
+          break
           case 2:
-            return '留观'
-            break
-          case 3:
-            return '住院'
-            break
+          return '留观'
+          break
+        case 3:
+          return '住院'
+          break
 
-          default:
-            return '-'
-            break;
+        default:
+          return '-'
+          break
         }
-      },
-      blood_access_opera: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        let vascular_access = this.$store.getters.vascular_access_desc;
+    },
+    blood_access_opera: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      let vascular_access = this.$store.getters.vascular_access_desc
         let valen = vascular_access.length
-        let name = '-';
+      let name = '-'
         for (let index = 0; index < valen; index++) {
-          if (vascular_access[index].id == this.record.blood_access_part_opera_id) {
-            name = vascular_access[index].name;
+        if (vascular_access[index].id == this.record.blood_access_part_opera_id) {
+          name = vascular_access[index].name
             break;
-          }
-        }
-        return name
-      },
-      catheter: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.catheter
-      },
-      puncture_point_haematoma_name: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
         }
-        switch (this.record.puncture_point_haematoma) {
-          case 1:
-            return '有'
-            break;
+      }
+      return name
+    },
+    catheter: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.catheter
+    },
+    puncture_point_haematoma_name: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      switch (this.record.puncture_point_haematoma) {
+        case 1:
+          return '有'
+          break
           case 2:
-            return '无'
-            break
-          default:
-            return '-'
-            break;
+          return '无'
+          break
+        default:
+          return '-'
+          break
         }
-      },
-      breathing_rate:function(){
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.breathing_rate
-      },
-      temperature: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.temperature
-      },
-      pulse_frequency: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.pulse_frequency
-      },
-      actual_treatment_hour: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.actual_treatment_hour
-      },
-      actual_treatment_minute: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.actual_treatment_minute
-      },
-      dialysis_intakes_feed: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.dialysis_intakes
-      },
-      observation_content_other: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.observation_content_other
-      },
-      observation_content: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.observation_content
-      },
-      complication: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        return this.record.complication
-      },
-      internal_fistula_tremor_ac_name: function () {
-        if (this.record == null || this.record.id == "") {
-          return "-"
-        }
-        switch (this.record.internal_fistula_tremor_ac) {
-          case 1:
-            return '存在'
-            break;
+    },
+    breathing_rate: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.breathing_rate
+    },
+    temperature: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.temperature
+    },
+    pulse_frequency: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.pulse_frequency
+    },
+    actual_treatment_hour: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.actual_treatment_hour
+    },
+    actual_treatment_minute: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.actual_treatment_minute
+    },
+    dialysis_intakes_feed: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.dialysis_intakes
+    },
+    observation_content_other: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.observation_content_other
+    },
+    observation_content: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.observation_content
+    },
+    complication: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.complication
+    },
+    internal_fistula_tremor_ac_name: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      switch (this.record.internal_fistula_tremor_ac) {
+        case 1:
+          return '存在'
+          break
           case 2:
-            return '减弱'
-            break;
+          return '减弱'
+          break
           case 3:
-            return '无';
+          return '无'
             break
-          default:
-            return '-'
-            break;
-        }
-      },
-
-      remark: function () {
-        if (this.record == null || this.record.id == "") {
-          return ""
-        }
-        return this.record.remark
-      },in_advance_minute:function () {
-        if (this.record == null || this.record.id == "") {
-          return ""
-        }
-        return this.record.in_advance_minute
-      },in_advance_reason:function () {
-        if (this.record == null || this.record.id == "") {
-          return ""
-        }
-        return this.record.in_advance_reason + ","+this.record.in_advance_reason_other
-      },hemostasis_minute:function () {
-        if (this.record == null || this.record.id == "") {
-          return ""
+        default:
+          return '-'
+          break
         }
+    },
 
-        return this.record.hemostasis_minute
-      },in_advance_reason_other:function () {
-        if (this.record == null || this.record.id == "") {
-          return ""
-        }
-        return this.record.in_advance_reason_other
+    remark: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+      }
+      return this.record.remark
+    }, 
+in_advance_minute: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+      }
+      return this.record.in_advance_minute
+    },
+ in_advance_reason: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+      }
+      return this.record.in_advance_reason + ',' + this.record.in_advance_reason_other
+    },
+ hemostasis_minute: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
+
+      return this.record.hemostasis_minute
     },
-    methods: {
-      isShow(name){
-        var filedList = this.$store.getters.user.fileds
+ in_advance_reason_other: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+      }
+      return this.record.in_advance_reason_other
+    }
+  },
+  methods: {
+    isShow (name) {
+      var filedList = this.$store.getters.user.fileds
 
-        for (let i = 0; i < filedList.length; i++){
-          if(filedList[i].module == 5 && filedList[i].filed_name_cn == name&&filedList[i].is_show == 1){
-            return true
-          }
+      for (let i = 0; i < filedList.length; i++) {
+        if (filedList[i].module == 5 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+          return true
         }
-        return false
-      },
-      getOpera:function (id) {
-        var hemostasis_opera = this.$store.getters.hemostasis_opera;
-        var hemostasisOperaName = "";
-        for (let i = 0; i < hemostasis_opera.length; i++){
-          if(hemostasis_opera[i].id == id){
-            hemostasisOperaName =    hemostasis_opera[i].name
-          }
+      }
+      return false
+    },
+    getOpera: function (id) {
+      var hemostasis_opera = this.$store.getters.hemostasis_opera
+        var hemostasisOperaName = '';
+      for (let i = 0; i < hemostasis_opera.length; i++) {
+        if (hemostasis_opera[i].id == id) {
+          hemostasisOperaName = hemostasis_opera[i].name
         }
-        return hemostasisOperaName
-
-      },getTremorNoise:function (id) {
-        var tremor_noise = this.$store.getters.tremor_noise;
-        var tremorNoiseName = "";
-        for (let i = 0; i < tremor_noise.length; i++){
-          if(tremor_noise[i].id == id){
-            tremorNoiseName =    tremor_noise[i].name
-          }
+      }
+      return hemostasisOperaName
+    },
+ getTremorNoise: function (id) {
+      var tremor_noise = this.$store.getters.tremor_noise
+        var tremorNoiseName = '';
+      for (let i = 0; i < tremor_noise.length; i++) {
+        if (tremor_noise[i].id == id) {
+          tremorNoiseName = tremor_noise[i].name
         }
-        return tremorNoiseName
-      },getDisequilibriumSyndrome:function (id) {
-        var disequilibrium_syndrome = this.$store.getters.disequilibrium_syndrome;
-        var disequilibriumSyndromeName = "";
-        for (let i = 0; i < disequilibrium_syndrome.length; i++){
-          if(disequilibrium_syndrome[i].id == id){
-            disequilibriumSyndromeName =    disequilibrium_syndrome[i].name
-          }
+      }
+      return tremorNoiseName
+    },
+ getDisequilibriumSyndrome: function (id) {
+      var disequilibrium_syndrome = this.$store.getters.disequilibrium_syndrome
+        var disequilibriumSyndromeName = '';
+      for (let i = 0; i < disequilibrium_syndrome.length; i++) {
+        if (disequilibrium_syndrome[i].id == id) {
+          disequilibriumSyndromeName = disequilibrium_syndrome[i].name
         }
-        return disequilibriumSyndromeName
-
-      },getDisequilibriumSyndromeOptionName:function (id) {
-        var disequilibrium_syndrome_option = this.$store.getters.disequilibrium_syndrome_option;
-        var disequilibriumSyndromeOptionName = "";
-        for (let i = 0; i < disequilibrium_syndrome_option.length; i++) {
-          if (disequilibrium_syndrome_option[i].id == id) {
-            disequilibriumSyndromeOptionName = disequilibrium_syndrome_option[i].name
-          }
+      }
+      return disequilibriumSyndromeName
+    },
+ getDisequilibriumSyndromeOptionName: function (id) {
+      var disequilibrium_syndrome_option = this.$store.getters.disequilibrium_syndrome_option
+        var disequilibriumSyndromeOptionName = '';
+      for (let i = 0; i < disequilibrium_syndrome_option.length; i++) {
+        if (disequilibrium_syndrome_option[i].id == id) {
+          disequilibriumSyndromeOptionName = disequilibrium_syndrome_option[i].name
         }
-        return disequilibriumSyndromeOptionName
-      },getArterialTubeName:function (id) {
-        var arterial_tube = this.$store.getters.arterial_tube;
-        var arterialTubeName = "";
-        for (let i = 0; i < arterial_tube.length; i++) {
-          if (arterial_tube[i].id == id) {
-            arterialTubeName = arterial_tube[i].name
-          }
+      }
+      return disequilibriumSyndromeOptionName
+    }, 
+getArterialTubeName: function (id) {
+      var arterial_tube = this.$store.getters.arterial_tube
+        var arterialTubeName = '';
+      for (let i = 0; i < arterial_tube.length; i++) {
+        if (arterial_tube[i].id == id) {
+          arterialTubeName = arterial_tube[i].name
         }
-        return arterialTubeName
-
-      },getIntravenousTubeName:function (id) {
-        var intravenous_tube = this.$store.getters.intravenous_tube;
-        var intravenousTubeName = "";
-        for (let i = 0; i < intravenous_tube.length; i++) {
-          if (intravenous_tube[i].id == id) {
-            intravenousTubeName = intravenous_tube[i].name
-          }
+      }
+      return arterialTubeName
+    },
+ getIntravenousTubeName: function (id) {
+      var intravenous_tube = this.$store.getters.intravenous_tube
+        var intravenousTubeName = '';
+      for (let i = 0; i < intravenous_tube.length; i++) {
+        if (intravenous_tube[i].id == id) {
+          intravenousTubeName = intravenous_tube[i].name
         }
-        return intravenousTubeName
-
-      },getDialyzer:function (id) {
-        var dialyzer = this.$store.getters.dialyzer;
-        var dialyzerName = "";
-        for (let i = 0; i < dialyzer.length; i++) {
-          if (dialyzer[i].id == id) {
-            dialyzerName = dialyzer[i].name
-          }
+      }
+      return intravenousTubeName
+    },
+ getDialyzer: function (id) {
+      var dialyzer = this.$store.getters.dialyzer
+        var dialyzerName = '';
+      for (let i = 0; i < dialyzer.length; i++) {
+        if (dialyzer[i].id == id) {
+          dialyzerName = dialyzer[i].name
         }
-        return dialyzerName
-      }
-      // setRecord(record) {
-      //   if (record == null) {
-      //     this.info1[0].content = ""
-      //     this.info1[1].content = ""
-      //     this.info1[2].content = ""
-      //     this.info1[3].content = ""
-      //     this.info1[4].content = ""
-
-      //     this.info2[0].content = ""
-      //     this.info2[1].content = ""
-      //     this.info2[2].content = ""
-      //     this.info2[3].content = ""
-      //     this.info2[4].content = ""
-
-      //     this.info3[0].content = ""
-      //     this.info3[1].content = ""
-      //     this.info3[2].content = ""
-      //     this.info3[3].content = ""
-      //     this.info3[4].content = ""
-
-      //     this.note = ""
-
-      //   } else {
-      //     this.info1[0].content = record.weight_after
-      //     this.info1[1].content = record.systolic_blood_pressure
-      //     this.info1[2].content = record.actual_ultrafiltration
-      //     this.info1[3].content = record.cruor
-      //     // this.info1[4].content = record.systolic_blood_pressure
-
-      //     this.info2[0].content = record.weight_loss
-      //     this.info2[1].content = record.diastolic_blood_pressure
-      //     this.info2[2].content = record.actual_displacement
-      //     this.info2[3].content = record.symptom_after_dialysis
-      //     this.info2[4].content = record.catheter
-
-      //     this.info3[0].content = record.temperature
-      //     this.info3[1].content = record.pulse_frequency
-      //     this.info3[2].content = record.actual_treatment_hour
-      //     this.info3[3].content = record.dialysis_intakes_feed
-      //     this.info3[4].content = record.complication
-
-      //     this.note = record.remark
-      //   }
-      // }
+      }
+      return dialyzerName
     }
-  };
+    // setRecord(record) {
+    //   if (record == null) {
+    //     this.info1[0].content = ""
+    //     this.info1[1].content = ""
+    //     this.info1[2].content = ""
+    //     this.info1[3].content = ""
+    //     this.info1[4].content = ""
+
+    //     this.info2[0].content = ""
+    //     this.info2[1].content = ""
+    //     this.info2[2].content = ""
+    //     this.info2[3].content = ""
+    //     this.info2[4].content = ""
+
+    //     this.info3[0].content = ""
+    //     this.info3[1].content = ""
+    //     this.info3[2].content = ""
+    //     this.info3[3].content = ""
+    //     this.info3[4].content = ""
+
+    //     this.note = ""
+
+    //   } else {
+    //     this.info1[0].content = record.weight_after
+    //     this.info1[1].content = record.systolic_blood_pressure
+    //     this.info1[2].content = record.actual_ultrafiltration
+    //     this.info1[3].content = record.cruor
+    //     // this.info1[4].content = record.systolic_blood_pressure
+
+    //     this.info2[0].content = record.weight_loss
+    //     this.info2[1].content = record.diastolic_blood_pressure
+    //     this.info2[2].content = record.actual_displacement
+    //     this.info2[3].content = record.symptom_after_dialysis
+    //     this.info2[4].content = record.catheter
+
+    //     this.info3[0].content = record.temperature
+    //     this.info3[1].content = record.pulse_frequency
+    //     this.info3[2].content = record.actual_treatment_hour
+    //     this.info3[3].content = record.dialysis_intakes_feed
+    //     this.info3[4].content = record.complication
+
+    //     this.note = record.remark
+    //   }
+    // }
+  }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 </style>
-
-
-

src/pages/main/today/assessmentBefore.vue

           <span class="content">{{ catheter }}</span>
           <span class="unit"></span>
         </li>
+        <li v-if="isShow('衣物重')">
+          <label>衣物重 : </label>
+          <span class="content">{{ additional_weight?additional_weight:''}}</span>
+          <span class="unit">{{ additional_weight?'kg':''}}</span>
+        </li>
         <li v-if="isShow('干体重')">
           <label>干体重 : </label>
           <span class="content">{{ dry_weight?dry_weight:''}}</span>
           <span class="unit"></span>
         </li>
 
-
       <!-- </ul>
       <ul> -->
         <li v-if="isShow('体温')">
 <!--
       </ul>
 
-
-
       <ul > -->
         <li v-if="isShow('位置')">
           <label>位置:</label>
           <span class="content">{{this.record.ductus_arantii}}</span>
         </li>
 
-
-
         <li v-if="isShow('其他中心静脉导管')">
           <label>其他中心静脉导管:</label>
           <span class="content">{{ ductus_arantii_other }}</span>
           <span class="content" >{{emergency_treatment_other}}</span>
         </li>
 
-
-
         <li v-if="isShow('感染')">
           <label>感染:</label>
           <span class="content">{{this.record.is_infect == 1 ? '无' : '有' }}</span>
           <span class="unit"> </span>
         </li>
 
-
         <li v-if="isShow('其他感染情况')">
           <label>其他感染情况:</label>
           <span class="content">{{ infect_other }}</span>
           <span class="unit"> </span>
         </li>
 
-
         <li v-if="isShow('外露')">
           <label>外露:</label>
           <span class="content">{{this.record.exposed?this.record.exposed:''}}</span>
           <span class="unit">cm</span>
         </li>
 
-
         <li v-if="isShow('皮肤')">
           <label>皮肤:</label>
           <span class="content">{{getSkin(this.record.skin)}}</span>
           <span class="unit"> </span>
         </li>
 
-
       </ul>
 
     </div>
 </template>
 
 <script>
-  export default {
-    name: 'assessmentBefore',
-    data () {
-      return {
-        title: '透前评估 ',
-
+export default {
+  name: 'assessmentBefore',
+  data () {
+    return {
+      title: '透前评估 ',
+      template_id: 0
+    }
+  },
+  props: {
+    record: {
+      type: Object
+    },
+ dry_weights: {
+      type: Object
+    }
+  },
+  created () {
+    this.template_id = this.$store.getters.user.template_info.template_id
+  },
+  computed: {
+    machine_type: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
+      return this.record.machine_type
     },
-    props: {
-      record: {
-        type: Object
+    weight_before: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
       }
+      return this.record.weight_before
+    },
+    additional_weight: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.additional_weight
+    },
+    systolic_blood_pressure: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.systolic_blood_pressure
+    },
+    last_post_dialysis: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.last_post_dialysis
     },
-    computed: {
-      machine_type:function(){
-        if (this.record == null || this.record.id == '') {
-          return ''
-        }
-        return this.record.machine_type
 
-      },
-      weight_before: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.weight_before
-      },
-      systolic_blood_pressure: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
+    dry_weight: function () {
+      if (this.$store.getters.user.template_info.template_id == 6) {
+        if (this.dry_weights != null && this.dry_weights.id > 0) {
+          return this.dry_weights.dry_weight
+        } else{
+          if (this.record == null || this.record.id == '') {
+            return '-'
+          }
+          return this.record.dry_weight
         }
-        return this.record.systolic_blood_pressure
-      },
-      last_post_dialysis: function () {
+      }else {
         if (this.record == null || this.record.id == '') {
           return '-'
         }
-        return this.record.last_post_dialysis
-      },
 
-      dry_weight: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
         return this.record.dry_weight
-      },
-      diastolic_blood_pressure: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.diastolic_blood_pressure
-      },
-      dialysis_interphase: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.dialysis_interphase
-      },
-      catheter: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.catheter
-      },
-
-      temperature: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.temperature
-      },
-      pulse_frequency: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.pulse_frequency
-      },
-      breathing_rate: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.breathing_rate
-      },
-      symptom_before_dialysis: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.symptom_before_dialysis
-      },
-      complication: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.complication
-      },
-      internal_fistula: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.internal_fistula
-      },
-      is_hemorrhage: function () {
-        if (this.record == null || this.record.id == '') {
-          return false
-        }
-        return this.record.is_hemorrhage == 1
-      },
-      hemorrhage: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.hemorrhage
-      },
-      hemorrhage_other: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.hemorrhage_other
-      },
-
-      remark: function () {
-        if (this.record == null || this.record.id == '') {
-          return ''
-        }
-        return this.record.remark
-      }, dialysis_count: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.dialysis_count
-      }, internal_fistula_other: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.internal_fistula_other
-      },venous_catheterization_part_other:function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.venous_catheterization_part_other
-
-      },emergency_treatment_other:function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.emergency_treatment_other
-      },blood_access_internal_fistula:function () {
-
-        var name1 = ""
-        var name2 = ""
-
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        if(this.record.blood_access_internal_fistula == undefined){
-          name1 = ""
-        }else{
+      }
+    },
+    diastolic_blood_pressure: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.diastolic_blood_pressure
+    },
+    dialysis_interphase: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.dialysis_interphase
+    },
+    catheter: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.catheter
+    },
 
-          name1 = this.record.blood_access_internal_fistula+","
+    temperature: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.temperature
+    },
+    pulse_frequency: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.pulse_frequency
+    },
+    breathing_rate: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.breathing_rate
+    },
+    symptom_before_dialysis: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.symptom_before_dialysis
+    },
+    complication: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.complication
+    },
+    internal_fistula: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.internal_fistula
+    },
+    is_hemorrhage: function () {
+      if (this.record == null || this.record.id == '') {
+        return false
+      }
+      return this.record.is_hemorrhage == 1
+    },
+    hemorrhage: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.hemorrhage
+    },
+    hemorrhage_other: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.hemorrhage_other
+    },
 
-        }
-        if(this.record.internal_fistula_other == undefined){
-          name2 = ""
-        }else{
-          name2 = this.record.internal_fistula_other
-        }
+    remark: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
+      }
+      return this.record.remark
+    },
+dialysis_count: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.dialysis_count
+    },
+internal_fistula_other: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.internal_fistula_other
+    },
+ venous_catheterization_part_other: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.venous_catheterization_part_other
+    }, 
+emergency_treatment_other: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.emergency_treatment_other
+    }, 
+blood_access_internal_fistula: function () {
+      var name1 = ''
+      var name2 = ''
+
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      if (this.record.blood_access_internal_fistula == undefined) {
+        name1 = ''
+      } else{
+        name1 = this.record.blood_access_internal_fistula + ','
+      }
+      if (this.record.internal_fistula_other == undefined) {
+        name2 = ''
+      }else {
+        name2 = this.record.internal_fistula_other
+      }
 
-        return name1+name2
-      },infect_other:function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.infect_other
-      },skin_other:function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.skin_other
-      },ductus_arantii_other:function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
-        }
-        return this.record.ductus_arantii_other
+      return name1 + name2
+    },
+ infect_other: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.infect_other
+    }, 
+skin_other: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
       }
+      return this.record.skin_other
     },
-    methods: {
-      isShow(name){
-        var filedList = this.$store.getters.user.fileds
+ ductus_arantii_other: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.record.ductus_arantii_other
+    }
+  },
+  methods: {
+    isShow (name) {
+      var filedList = this.$store.getters.user.fileds
 
-        for (let i = 0; i < filedList.length; i++){
-          if(filedList[i].module == 3 && filedList[i].filed_name_cn == name&&filedList[i].is_show == 1){
-            return true
-          }
+      for (let i = 0; i < filedList.length; i++) {
+        if (filedList[i].module == 3 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+          return true
         }
-        return false
-      },
-      getBloodAccessInternalFistula: function (id) {
-        var BloodAccessInternalFistulaOptions = this.$store.getters.blood_access_internal_fistula;
-        var BloodAccessInternalFistulaName = "";
-        for (let i = 0; i < BloodAccessInternalFistulaOptions.length; i++){
-          if(BloodAccessInternalFistulaOptions[i].id == id){
-            BloodAccessInternalFistulaName =    BloodAccessInternalFistulaOptions[i].name
-          }
+      }
+      return false
+    },
+    getBloodAccessInternalFistula: function (id) {
+      var BloodAccessInternalFistulaOptions = this.$store.getters.blood_access_internal_fistula
+        var BloodAccessInternalFistulaName = '';
+      for (let i = 0; i < BloodAccessInternalFistulaOptions.length; i++) {
+        if (BloodAccessInternalFistulaOptions[i].id == id) {
+          BloodAccessInternalFistulaName = BloodAccessInternalFistulaOptions[i].name
         }
-        return BloodAccessInternalFistulaName
-      },
-      getBloodAccessNoise: function (id) {
-        var BloodAccessNoiseOptions = this.$store.getters.blood_access_noise;
-        var BloodAccessNoiseName = "";
-        for (let i = 0; i < BloodAccessNoiseOptions.length; i++){
-          if(BloodAccessNoiseOptions[i].id == id){
-            BloodAccessNoiseName =    BloodAccessNoiseOptions[i].name
-          }
+      }
+      return BloodAccessInternalFistulaName
+    },
+    getBloodAccessNoise: function (id) {
+      var BloodAccessNoiseOptions = this.$store.getters.blood_access_noise
+        var BloodAccessNoiseName = '';
+      for (let i = 0; i < BloodAccessNoiseOptions.length; i++) {
+        if (BloodAccessNoiseOptions[i].id == id) {
+          BloodAccessNoiseName = BloodAccessNoiseOptions[i].name
         }
-        return BloodAccessNoiseName
-      },getVenousCatheterization:function (id) {
-        var VenousCatheterizationOptions = this.$store.getters.venous_catheterization;
-        var VenousCatheterizationName = "";
-        for (let i = 0; i < VenousCatheterizationOptions.length; i++){
-          if(VenousCatheterizationOptions[i].id == id){
-            VenousCatheterizationName =    VenousCatheterizationOptions[i].name
-          }
+      }
+      return BloodAccessNoiseName
+    }, 
+getVenousCatheterization: function (id) {
+      var VenousCatheterizationOptions = this.$store.getters.venous_catheterization
+        var VenousCatheterizationName = '';
+      for (let i = 0; i < VenousCatheterizationOptions.length; i++) {
+        if (VenousCatheterizationOptions[i].id == id) {
+          VenousCatheterizationName = VenousCatheterizationOptions[i].name
         }
-        return VenousCatheterizationName
-      },getWay:function (id) {
-        var PunctureWayOptions = this.$store.getters.puncture_way;
-        var PunctureWayOptionsName = "";
-        for (let i = 0; i < PunctureWayOptions.length; i++){
-          if(PunctureWayOptions[i].id == id){
-            PunctureWayOptionsName =    PunctureWayOptions[i].name
-          }
+      }
+      return VenousCatheterizationName
+    },
+ getWay: function (id) {
+      var PunctureWayOptions = this.$store.getters.puncture_way
+        var PunctureWayOptionsName = '';
+      for (let i = 0; i < PunctureWayOptions.length; i++) {
+        if (PunctureWayOptions[i].id == id) {
+          PunctureWayOptionsName = PunctureWayOptions[i].name
         }
-        return PunctureWayOptionsName
-
-      },getVenousCatheterizationPart:function (id) {
-        var venousCatheterizationPartOptions = this.$store.getters.venous_catheterization_part;
-        var venousCatheterizationPartName = "";
-        for (let i = 0; i < venousCatheterizationPartOptions.length; i++){
-          if(venousCatheterizationPartOptions[i].id == id){
-            venousCatheterizationPartName =    venousCatheterizationPartOptions[i].name
-          }
+      }
+      return PunctureWayOptionsName
+    },
+ getVenousCatheterizationPart: function (id) {
+      var venousCatheterizationPartOptions = this.$store.getters.venous_catheterization_part
+        var venousCatheterizationPartName = '';
+      for (let i = 0; i < venousCatheterizationPartOptions.length; i++) {
+        if (venousCatheterizationPartOptions[i].id == id) {
+          venousCatheterizationPartName = venousCatheterizationPartOptions[i].name
         }
-        return venousCatheterizationPartName
-      },getDuctusArantii:function (id) {
-        var ductusArantiiOptions = this.$store.getters.ductus_arantii;
-        var ductusArantiiOptionsName = "";
-        for (let i = 0; i < ductusArantiiOptions.length; i++){
-          if(ductusArantiiOptions[i].id == id){
-            ductusArantiiOptionsName =    ductusArantiiOptions[i].name
-          }
+      }
+      return venousCatheterizationPartName
+    }, 
+getDuctusArantii: function (id) {
+      var ductusArantiiOptions = this.$store.getters.ductus_arantii
+        var ductusArantiiOptionsName = '';
+      for (let i = 0; i < ductusArantiiOptions.length; i++) {
+        if (ductusArantiiOptions[i].id == id) {
+          ductusArantiiOptionsName = ductusArantiiOptions[i].name
         }
-        return ductusArantiiOptionsName
-      },getEmergencyTreatment:function (id) {
-        var emergencyTreatmentOptions = this.$store.getters.emergency_treatment;
-        var emergencyTreatmentName = "";
-        for (let i = 0; i < emergencyTreatmentOptions.length; i++){
-          if(emergencyTreatmentOptions[i].id == id){
-            emergencyTreatmentName =    emergencyTreatmentOptions[i].name
-          }
+      }
+      return ductusArantiiOptionsName
+    }, 
+getEmergencyTreatment: function (id) {
+      var emergencyTreatmentOptions = this.$store.getters.emergency_treatment
+        var emergencyTreatmentName = '';
+      for (let i = 0; i < emergencyTreatmentOptions.length; i++) {
+        if (emergencyTreatmentOptions[i].id == id) {
+          emergencyTreatmentName = emergencyTreatmentOptions[i].name
         }
-        return emergencyTreatmentName
-
-      },getSkin:function (id) {
-        var skinOptions = this.$store.getters.skin;
-        var skinName = "";
-        for (let i = 0; i < skinOptions.length; i++){
-          if(skinOptions[i].id == id){
-            skinName =    skinOptions[i].name
-          }
+      }
+      return emergencyTreatmentName
+    },
+ getSkin: function (id) {
+      var skinOptions = this.$store.getters.skin
+        var skinName = '';
+      for (let i = 0; i < skinOptions.length; i++) {
+        if (skinOptions[i].id == id) {
+          skinName = skinOptions[i].name
         }
-        return skinName
-
-      }
-      // setRecord(record) {
-      //   if (record == null) {
-      //     this.info1[0].content = "0"
-      //     this.info1[1].content = "0"
-      //     this.info1[2].content = "0"
-      //     // this.info1[3].content = ""
-
-      //     this.info2[0].content = "0"
-      //     this.info2[1].content = "0"
-      //     this.info2[2].content = ""
-      //     this.info2[3].content = ""
-
-      //     this.info3[0].content = "0"
-      //     this.info3[1].content = "0"
-      //     this.info3[2].content = ""
-      //     this.info3[3].content = ""
-
-      //     this.note = ""
-
-      //   } else {
-      //     this.info1[0].content = record.weight_before
-      //     this.info1[1].content = record.systolic_blood_pressure
-      //     this.info1[2].content = record.last_post_dialysis
-      //     // this.info1[3].content = ""
-
-      //     this.info2[0].content = record.additional_weight
-      //     this.info2[1].content = record.diastolic_blood_pressure
-      //     this.info2[2].content = record.dialysis_interphase
-      //     this.info2[3].content = record.catheter
-
-      //     this.info3[0].content = record.temperature
-      //     this.info3[1].content = record.breathing_rate
-      //     this.info3[2].content = record.symptom_before_dialysis
-      //     this.info3[3].content = record.complication
-
-      //     this.note = record.remark
-      //   }
-      // }
+      }
+      return skinName
     }
+    // setRecord(record) {
+    //   if (record == null) {
+    //     this.info1[0].content = "0"
+    //     this.info1[1].content = "0"
+    //     this.info1[2].content = "0"
+    //     // this.info1[3].content = ""
+
+    //     this.info2[0].content = "0"
+    //     this.info2[1].content = "0"
+    //     this.info2[2].content = ""
+    //     this.info2[3].content = ""
+
+    //     this.info3[0].content = "0"
+    //     this.info3[1].content = "0"
+    //     this.info3[2].content = ""
+    //     this.info3[3].content = ""
+
+    //     this.note = ""
+
+    //   } else {
+    //     this.info1[0].content = record.weight_before
+    //     this.info1[1].content = record.systolic_blood_pressure
+    //     this.info1[2].content = record.last_post_dialysis
+    //     // this.info1[3].content = ""
+
+    //     this.info2[0].content = record.additional_weight
+    //     this.info2[1].content = record.diastolic_blood_pressure
+    //     this.info2[2].content = record.dialysis_interphase
+    //     this.info2[3].content = record.catheter
+
+    //     this.info3[0].content = record.temperature
+    //     this.info3[1].content = record.breathing_rate
+    //     this.info3[2].content = record.symptom_before_dialysis
+    //     this.info3[3].content = record.complication
+
+    //     this.note = record.remark
+    //   }
+    // }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 </style>
-
-
-

src/pages/main/today/detailsInfo.vue

-x<template>
+<template>
   <div class="info">
     <h2 class="plateTitle">
       <span class="line"></span>
 </template>
 
 <script>
-import { parseTime } from "@/utils";
+import { parseTime } from '@/utils'
 import { jsGetAge } from "@/utils/tools";
 
 export default {
-  name: "DetailsInfo",
-  data() {
+  name: 'DetailsInfo',
+  data () {
     return {
       // patient: {
       //   name: "",
       //   number: "",
       // },
       steps: [
-        { title: "透析处方" },
-        { title: "接诊评估" },
-        { title: "透前评估" },
-        { title: "临时医嘱" },
-        { title: "透析上机" },
-        { title: "双人查对" },
-        { title: "透析监测" },
-        { title: "透析下机" },
-        { title: "透后评估" },
-        { title: "治疗小结" }
+        { title: '透析处方' },
+        { title: '接诊评估' },
+        { title: '透前评估' },
+        { title: '临时医嘱' },
+        { title: '透析上机' },
+        { title: '双人查对' },
+        { title: '透析监测' },
+        { title: '透析下机' },
+        { title: '透后评估' },
+        { title: '治疗小结' }
       ]
-    };
+    }
   },
   props: {
     step_data: {
     },
     patient: {
       type: Object,
-      default: function() {
+      default: function () {
         return {
-          name: "",
+          name: '',
           gender: 1,
-          birthday: "",
-          dialysis_no: "",
+          birthday: '',
+          dialysis_no: '',
           // device_number: "",
-          source: "",
-          admission_number: ""
-        };
+          source: '',
+          admission_number: ''
+        }
       }
     },
     device_number: {
     }
   },
   computed: {
+<<<<<<< .mine
     dialysis_date: function() {
       return parseTime(this.$route.query.date, "{y}/{m}/{d}");
+=======
+    dialysis_date: function () {
+      return parseTime(this.$route.query.date, '{y}/{m}/{d}')
+>>>>>>> .theirs
     },
+<<<<<<< .mine
     age: function() {
       if (this.patient.age == 0) {
         return jsGetAge(parseTime(this.patient.birthday, "{y}-{m}-{d}"), "-");
       } else {
         return this.patient.age;
+=======
+    age: function () {
+      if (this.patient.age == 0) {
+        return jsGetAge(parseTime(this.patient.birthday, '{y}-{m}-{d}'), '-')
+      } else {
+        return this.patient.age
+>>>>>>> .theirs
       }
     },
-    source: function() {
-      return this.patient.source == 1 ? "门诊" : "住院";
+    source: function () {
+      return this.patient.source == 1 ? '门诊' : '住院'
     }
   },
   methods: {
     //   }
     // }
   },
-  created() {}
-};
+  created () {}
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   }
 }
 </style>
-

src/pages/main/today/dialysisComputer.vue

           <span class="content">{{stage}}</span>
         </li>
       </ul>
+<<<<<<< .mine
+
+=======
+
+>>>>>>> .theirs
     </div>
     <!-- <div class="note">处方医生 : {{doctor}}</div> -->
   </div>
 </template>
 
 <script>
+<<<<<<< .mine
 import { parseTime } from "@/utils";
+=======
+import {parseTime} from '@/utils'
+>>>>>>> .theirs
 
+<<<<<<< .mine
 export default {
   name: "DialysisComputer",
   data() {
     device_number: function() {
       if (this.record == null || this.record.id == "") {
         return "-";
+=======
+export default {
+  name: 'DialysisComputer',
+  data () {
+    return {
+      title: '透析上机 '
+    }
+  },
+  props: {
+    record: {
+      type: Object
+    },
+    admin_map: {
+      type: Object
+    },
+    device_number_map: {
+      type: Object
+    }
+  },
+  computed: {
+    device_number: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+>>>>>>> .theirs
       }
+<<<<<<< .mine
       return this.device_number_map[this.record.bed_id] == null
         ? ""
         : this.device_number_map[this.record.bed_id].number;
+=======
+      return this.device_number_map[this.record.bed_id] == null ? '' : this.device_number_map[this.record.bed_id].number
+
+
+>>>>>>> .theirs
     },
+<<<<<<< .mine
     nurse: function() {
       if (this.record == null || this.record.id == "") {
         return "-";
+=======
+    nurse: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+>>>>>>> .theirs
       }
+<<<<<<< .mine
       return this.admin_map[this.record.start_nurse] == null
         ? ""
         : this.admin_map[this.record.start_nurse].name;
+=======
+      return this.admin_map[this.record.start_nurse] == null ? '' : this.admin_map[this.record.start_nurse].name
+
+
+>>>>>>> .theirs
     },
+<<<<<<< .mine
     stage: function() {
       if (this.record == null || this.record.id == "") {
         return "未上机";
+=======
+    stage: function () {
+      if (this.record == null || this.record.id == '') {
+        return '未上机'
+>>>>>>> .theirs
       }
+<<<<<<< .mine
       return this.record.stage == 1 ? "已上机" : "已下机";
+=======
+      return this.record.stage == 1 ? '已上机' : '已下机'
+>>>>>>> .theirs
     },
+<<<<<<< .mine
     start_time: function() {
       if (this.record == null || this.record.id == "") {
         return "-";
   },
   methods: {}
 };
+=======
+start_time: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return parseTime(this.record.start_time, '{y}年{m}月{d}日 {h}时{i}分')
+    }, 
+puncture_nurse: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+      }
+      return this.admin_map[this.record.puncture_nurse] == null ? '' : this.admin_map[this.record.puncture_nurse].name
+    }
+  },
+  methods: {}
+}
+
+
+>>>>>>> .theirs
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 </style>
-
-
-

src/pages/main/today/dialysisMonitoring.vue

           <th width="76px">静脉压/动脉压(mmHg)</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmHg)</th>
-          <th v-if="isShow('超滤量')" width="76px">超滤量(L)</th>
+          <th v-if="isShow('超滤量') && template_id ==6" width="76px">超滤量(ml)</th>
+          <th v-if="isShow('超滤量') && template_id !=6" width="76px">超滤量(L)</th>
           <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">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量')"  width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
 </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: []
-    };
+    }
+  },
+  created () {
+    this.template_id = this.$store.getters.user.template_info.template_id
   },
   methods: {
-    isShow(name){
+    isShow (name) {
       var filedList = this.$store.getters.user.fileds
 
-      for (let i = 0; i < filedList.length; i++){
-        if(filedList[i].module == 4 && filedList[i].filed_name_cn == name&&filedList[i].is_show == 1){
+      for (let i = 0; i < filedList.length; i++) {
+        if (filedList[i].module == 4 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
           return true
         }
       }
       return false
     },
-    setRecords(records) {
+    setRecords (records) {
       if (records == null) {
-        records = [];
+        records = []
       }
-      this.tableDate.splice(0, this.tableDate.length);
-      this.tableDate.push(...records);
+      this.tableDate.splice(0, this.tableDate.length)
+      this.tableDate.push(...records)
     },
-    parseTime(time, layout) {
-      return parseTime(time, layout);
+    parseTime (time, layout) {
+      return parseTime(time, layout)
     },
-    addRecords(records) {
-      this.tableDate.push(...records);
+    addRecords (records) {
+      this.tableDate.push(...records)
     }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 
 }
 </style>
-
-
-

src/pages/main/today/dialysisOff.vue

 </template>
 
 <script>
+<<<<<<< .mine
 import { parseTime } from "@/utils";
+=======
+import { parseTime } from '@/utils';
+>>>>>>> .theirs
 
+<<<<<<< .mine
 export default {
   name: "DialysisComputer",
   data() {
+=======
+export default {
+  name: 'DialysisComputer',
+  data () {
+>>>>>>> .theirs
     return {
+<<<<<<< .mine
       title: "透析下机 "
     };
+=======
+      title: '透析下机 '
+    }
+>>>>>>> .theirs
   },
   props: {
     record: {
     }
   },
   computed: {
+<<<<<<< .mine
     stage: function() {
       if (this.record == null || this.record.id == "") {
         return "未上机";
+=======
+    stage: function () {
+      if (this.record == null || this.record.id == '') {
+        return '未上机'
+>>>>>>> .theirs
       }
+<<<<<<< .mine
       return this.record.stage == 1 ? "未下机" : "已下机";
+=======
+      return this.record.stage == 1 ? '未下机' : '已下机'
+>>>>>>> .theirs
     },
-    nurse: function() {
+    nurse: function () {
+<<<<<<< .mine
       if (this.record == null || this.record.id == "") {
         return "-";
+=======
+      if (this.record == null || this.record.id == '') {
+        return '-'
+>>>>>>> .theirs
       } else if (this.record.stage == 1) {
+<<<<<<< .mine
         return "-";
+=======
+        return '-'
+>>>>>>> .theirs
       } else {
+<<<<<<< .mine
         return this.admin_map[this.record.finish_nurse] == null
           ? ""
           : this.admin_map[this.record.finish_nurse].name;
+=======
+        return this.admin_map[this.record.finish_nurse] == null ? '' : this.admin_map[this.record.finish_nurse].name
+
+
+>>>>>>> .theirs
       }
+<<<<<<< .mine
     },
     end_time: function() {
       if (this.record == null || this.record.id == "") {
         return "-";
+=======
+    }, 
+end_time: function () {
+      if (this.record == null || this.record.id == '') {
+        return '-'
+>>>>>>> .theirs
       } else if (this.record.stage == 1) {
+<<<<<<< .mine
         return "-";
+=======
+        return '-'
+>>>>>>> .theirs
       } else {
-        return parseTime(this.record.end_time, "{y}年{m}月{d}日 {h}时{i}分");
+        return parseTime(this.record.end_time, '{y}年{m}月{d}日 {h}时{i}分')
       }
     }
   },
   methods: {}
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 </style>
-
-
-

src/pages/main/today/dialysisPrescription.vue

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

src/pages/main/today/doubleCheck.vue

 <template>
    <div class="plate-box">
-    <h2 class="title"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2> 
-    <div class="plate " >   
+    <h2 class="title"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2>
+    <div class="plate " >
         <ul>
              <li style="height: 0.6rem;">
                 <label>透析物品核查 : </label>
         </ul>
     </div>
     <!-- <div class="note">处方医生 : {{doctor}}</div> -->
-  </div>    
+  </div>
 </template>
 
 <script>
 export default {
-  name: "DoubleCheck",
-  data() {
+  name: 'DoubleCheck',
+  data () {
     return {
-      title: "双人查对 ",
+      title: '双人查对 '
       // note: "无明显异常",
       // doctor: "刘小军  医生",
       // info1: [
       // info3: [
       //   { value: "1", label: " ", content: "", unit: "" },
       // ]
-    };
+    }
   },
   props: {
     record: {
-      type: Object,
+      type: Object
     }
   },
   computed: {
-    dialysis_item_check: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    dialysis_item_check: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
-      return this.record.dialysis_item_check == 1 ? "正确" : "错误"
+      return this.record.dialysis_item_check == 1 ? '正确' : '错误'
     },
-    dialysis_parameter_check: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    dialysis_parameter_check: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
-      return this.record.dialysis_parameter_check == 1 ? "正确" : "错误"
+      return this.record.dialysis_parameter_check == 1 ? '正确' : '错误'
     },
-    vascular_access_verification: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    vascular_access_verification: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
-      return this.record.vascular_access_verification == 1 ? "正确" : "错误"
+      return this.record.vascular_access_verification == 1 ? '正确' : '错误'
     },
-    pipeline_connection_check: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    pipeline_connection_check: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
-      return this.record.pipeline_connection_check == 1 ? "正确" : "错误"
+      return this.record.pipeline_connection_check == 1 ? '正确' : '错误'
     },
-    dialysis_item_desc_title: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    dialysis_item_desc_title: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
-      return this.record.dialysis_item_check == 1 ? "" : "错误描述 : "
+      return this.record.dialysis_item_check == 1 ? '' : '错误描述 : '
     },
-    dialysis_parameter_desc_title: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    dialysis_parameter_desc_title: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
-      return this.record.dialysis_parameter_check == 1 ? "" : "错误描述 : "
+      return this.record.dialysis_parameter_check == 1 ? '' : '错误描述 : '
     },
-    vascular_access_desc_title: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    vascular_access_desc_title: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
-      return this.record.vascular_access_verification == 1 ? "" : "错误描述 : "
+      return this.record.vascular_access_verification == 1 ? '' : '错误描述 : '
     },
-    pipeline_connection_desc_title: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    pipeline_connection_desc_title: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
-      return this.record.pipeline_connection_check == 1 ? "" : "错误描述 : "
+      return this.record.pipeline_connection_check == 1 ? '' : '错误描述 : '
     },
 
-    dialysis_item_desc: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    dialysis_item_desc: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
-      return this.record.dialysis_item_check == 1 ? "" : this.record.dialysis_item_desc
+      return this.record.dialysis_item_check == 1 ? '' : this.record.dialysis_item_desc
     },
-    dialysis_parameter_desc: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    dialysis_parameter_desc: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
-      return this.record.dialysis_parameter_check == 1 ? "" : this.record.dialysis_parameter_desc
+      return this.record.dialysis_parameter_check == 1 ? '' : this.record.dialysis_parameter_desc
     },
-    vascular_access_desc: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    vascular_access_desc: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
-      return this.record.vascular_access_verification == 1 ? "" : this.record.vascular_access_desc
+      return this.record.vascular_access_verification == 1 ? '' : this.record.vascular_access_desc
     },
-    pipeline_connection_desc: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    pipeline_connection_desc: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
-      return this.record.pipeline_connection_check == 1 ? "" : this.record.pipeline_connection_desc
+      return this.record.pipeline_connection_check == 1 ? '' : this.record.pipeline_connection_desc
     }
   },
   methods: {
     //     this.info2[1].content = ""
     //     this.info2[2].content = ""
     //     this.info2[3].content = ""
-        
+
     //   } else {
     //     this.info1[0].content = record.dialysis_item_check == 1 ? "正确" : "错误"
     //     this.info1[1].content = record.dialysis_parameter_check == 1 ? "正确" : "错误"
     //   }
     // }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 
 </style>
-
-
-

src/pages/main/today/statOrder.vue

       <p>{{title}}</p>
       <span class="line"></span>
     </h2>
+<<<<<<< .mine
     <div class="newDiv">
       <table class="table">
         <tr>
               v-if="i == 0"
               :rowspan="group.advices.length"
             >{{doctor_map[advice.advice_doctor] != undefined ? doctor_map[advice.advice_doctor].name : ""}}</td>
+=======
+    <table class="table">
+      <tr>
+        <th width="12%">开嘱医生</th>
+        <th width="18%">开始时间</th>
+        <th width="31%">医嘱内容</th>
+        <th width="18.6%">执行时间</th>
+        <th width="10.5%">执行护士</th>
+        <th v-if="template_id != 6" width="9.4%">核对护士</th>
+      </tr>
+      <template v-for="(group) in advice_groups">
+        <tr v-for="(advice, i) in group.advices" :key="advice.id">
+            <td v-if="i == 0" :rowspan="group.advices.length">{{doctor_map[advice.advice_doctor] != undefined ? doctor_map[advice.advice_doctor].name : ""}}</td>
+
+
+
+
+>>>>>>> .theirs
 
             <td
               v-if="i == 0"
             <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
               <span>{{advice.advice_name }}</span>
               <!-- <span>{{advice.drug_spec}}{{advice.drug_spec_unit}} * {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span> -->
-              <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span>
+              <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
               <span
                 v-if="advice.prescribing_number"
               >{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
 </template>
 
 <script>
-import { parseTime } from "@/utils";
+import { parseTime } from '@/utils';
 
 export default {
-  name: "statOrder",
-  data() {
+  name: 'statOrder',
+  data () {
     return {
+<<<<<<< .mine
       title: "临时医嘱 ",
       tableDate: []
     };
+
+=======
+      title: '临时医嘱 ',
+      template_id: 0,
+      tableDate: []
+    }
+>>>>>>> .theirs
   },
   props: {
     doctor_map: {
       }
     }
   },
+  created () {
+    this.template_id = this.$store.getters.user.template_info.template_id
+  },
   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;
+            spliceIndex = index
             break;
           } else if (this.tableDate[index].id === row.parent_id) {
-            spliceIndex = index;
+            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);
+            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;
+          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;
         }
       }
     }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   overflow-x: auto;
 }
 </style>
-
-
-

src/pages/main/today/treatmentOf.vue

 <template>
    <div class="plate-box">
-    <h2 class="title"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2> 
-    <div class="plate " >   
+
+    <h2 class="title"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2>
+    <div class="plate " >
         <ul>
              <li>
                 <label>透后宣教 : </label>
         </ul>
     </div>
     <!-- <div class="note">处方医生 : {{doctor}}</div> -->
-  </div>    
+
+  </div>
 </template>
 
 <script>
 export default {
-  name: "DialysisPrescription",
-  data() {
+  name: 'DialysisPrescription',
+  data () {
     return {
-      title: "治疗小结  ",
-      doctor: "刘小花  护士",
+      title: '治疗小结  ',
+      doctor: '刘小花  护士'
       // info1: [
       //   { value: "1", label: "透后宣教 : ", content: "", unit: "" },
       //   { value: "1", label: "透析小结 : ", content: "", unit: "" }
       // ]
-    };
+    }
   },
   props: {
     record: {
-      type: Object,
+      type: Object
     }
   },
   computed: {
-    mission: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    mission: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
       return this.record.mission
     },
-    dialysis_summary: function() {
-      if (this.record == null || this.record.id == "") {
-        return ""
+    dialysis_summary: function () {
+      if (this.record == null || this.record.id == '') {
+        return ''
       }
       return this.record.dialysis_summary
-    },
+    }
   },
   methods: {
     // setRecord(record) {
     //   this.info1[1].content = record.dialysis_summary
     // }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 </style>
-
-
-

src/pages/waitingRoom/components/acceptsAssessment.vue

 <template>
   <div class="plate-box">
-    <h2 class="title"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2> 
-    <div class="plate " >   
+    <h2 class="title"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2>
+    <div class="plate " >
       <ul>
         <li style="height: 0.6rem;">
           <label>入室方式 : </label>
       </ul>
     </div>
     <!-- <div class="note">处方医生 : {{doctor}}</div> -->
-  </div>    
+  </div>
 </template>
 
 <script>
         "1": "清醒",
         "2": "嗜睡",
         "3": "昏迷",
+        "4": "模糊"
       },
       appetites: {
         "1": "正常",

src/pages/waitingRoom/components/dialog/acceptsAssessment.vue

           <el-radio v-model="receiveTreatmentAsses.consciousness" label="1">清醒</el-radio>
           <el-radio v-model="receiveTreatmentAsses.consciousness" label="2">嗜睡</el-radio>
           <el-radio v-model="receiveTreatmentAsses.consciousness" label="3">昏迷</el-radio>
+          <el-radio v-model="receiveTreatmentAsses.consciousness" label="4">模糊</el-radio>
+
 
         </div>
       </div>

src/router/index.js

     {
       path: '/main',
       name: 'main',
-      component: () => import('@/pages/main/index'),
+      component: () => import('@/pages/main/index')
     },
     {
       path: '/details',
       component: () => import('@/pages/main/DetailsPage')
     },
     {
-      path: "/monitoring",
-      name: "monitorPage",
-      component: () => import("@/pages/monitoring/index")
+      path: '/monitoring',
+      name: 'monitorPage',
+      component: () => import('@/pages/monitoring/index')
 
     },
     {
-      path: "/my",
-      name: "my",
-      component: () => import("@/pages/personal/index")
+      path: '/my',
+      name: 'my',
+      component: () => import('@/pages/personal/index')
     },
     {
-      path: "/advice",
-      name: "doctorAdvice",
-      component: () => import("@/pages/advice/index")
+      path: '/advice',
+      name: 'doctorAdvice',
+      component: () => import('@/pages/advice/index')
     },
     {
-      path: "/EditPersonal",
-      name: "EditPersonal",
-      component: () => import("@/pages/personal/EditPersonal")
+      path: '/EditPersonal',
+      name: 'EditPersonal',
+      component: () => import('@/pages/personal/EditPersonal')
     },
     {
-      path: "/ElectronicSignature",
-      name: "ElectronicSignature",
-      component: () => import("@/pages/personal/ElectronicSignature")
+      path: '/ElectronicSignature',
+      name: 'ElectronicSignature',
+      component: () => import('@/pages/personal/ElectronicSignature')
     },
     {
-      path: "/Print",
-      name: "Print",
-      component: () => import("@/pages/main/PrintIndex")
+      path: '/Print',
+      name: 'Print',
+      component: () => import('@/pages/main/PrintIndex')
     },
     {
-      path: "/add_urgent_schedule",
-      name: "AddUrgentSchedule",
-      component: () => import("@/pages/main/add_urgent_schedule")
+      path: '/add_urgent_schedule',
+      name: 'AddUrgentSchedule',
+      component: () => import('@/pages/main/add_urgent_schedule')
     },
     {
-      path: "/Prints",
-      name: "Prints",
-      component: () => import("@/pages/main/Print")
+      path: '/Prints',
+      name: 'Prints',
+      component: () => import('@/pages/main/Print')
     }
   ]
 })

src/store/index.js

 Vue.use(Vuex)
 
 const getters = {
+  requestScheduals: state => state.user.requestScheduals,
+  requestDialysisScheduals: state => state.user.requestDialysisScheduals,
+  scheduals: state => state.user.scheduals,
+  waitscheduals: state => state.user.waitscheduals,
   patient_types: state => state.global_config.patient_types,
   partitions: state => state.global_config.partitions,
   marital_options: state => state.global_config.marital_options,

src/store/user/user.js

 
 const user = {
   state: {
+
     role_type: 1, // 1.医生 2.护士
+    requestScheduals: {},
+    requestDialysisScheduals: {},
+    waitscheduals: {},
+    scheduals: {},
     user: {
       id: 0,
-      mobile: "",
-      avatar: "",
-      user_name: "",
-      intro: "",
+      mobile: '',
+      avatar: '',
+      user_name: '',
+      intro: '',
       user_type: 0,
-      user_title: 0,
+      user_title: 0
     },
     org: {
       id: 0,
-      org_short_name: "",
-      org_name: "",
-      org_intro: "",
-      org_logo: "",
-      address: "",
+      org_short_name: '',
+      org_name: '',
+      org_intro: '',
+      org_logo: '',
+      address: '',
       province: 0,
       city: 0,
-      district: 0,
+      district: 0
     },
-    serve:{
-      state:0,
-      status:1,
-      start:0,
-      end:0,
+    serve: {
+      state: 0,
+      status: 1,
+      start: 0,
+      end: 0
     },
     subscibe: {
       id: 0,
-			period_start: 0,
-			period_end: 0,
-			state: 3,
+      period_start: 0,
+      period_end: 0,
+      state: 3
     },
-    template_info:{
+    template_info: {
       id: 0,
-      org_id:0,
-      template_id:0,
+      org_id: 0,
+      template_id: 0
     },
-    fileds:[],
+    fileds: []
 
   },
 
       state.fileds = payload.fileds
       console.log(payload.fileds)
       console.log(state.fileds)
-
     },
     SET_USER: (state, user) => {
       state.user.id = user.id
     SET_ROLE_TYPE: (state, type) => {
       state.role_type = type
     },
-    SET_ORG_SERVE:(state, serve)=>{
+    SET_ORG_SERVE: (state, serve) => {
       state.serve.state = serve.state
       state.serve.status = serve.status
       state.serve.start = serve.start
       state.serve.end = serve.end
-    },SET_TEMPLATE:(state, template_info) =>{
+    },
+    // eslint-disable-next-line camelcase
+    SET_TEMPLATE: (state, template_info) => {
       state.template_info.id = template_info.id
       state.template_info.org_id = template_info.org_id
       state.template_info.template_id = template_info.template_id
+    },
+    SET_REQUESTSCHEDUALS: (state, requestScheduals) => {
+      state.requestScheduals = requestScheduals
+    },
+    SET_REQUESTDIALYSISSCHEDUALS: (state, requestDialysisScheduals) => {
+      state.requestDialysisScheduals = requestDialysisScheduals
+    },
+    SET_SCHEDUALS: (state, scheduals) => {
+      state.scheduals = scheduals
+    },
+    SET_WAITSCHEDUALS: (state, waitscheduals) => {
+      state.waitscheduals = waitscheduals
     }
   },
 
   actions: {
-    InitUserInfo({commit}, userInfo) {
+    InitUserInfo ({commit}, userInfo) {
       var user = userInfo.user
       var org = userInfo.org
       var subscibe = userInfo.subscibe
+      // eslint-disable-next-line camelcase
       var template_info = userInfo.template_info
 
       var fileds = userInfo.filed_list
       console.log(userInfo.filed_list)
       console.log(fileds)
 
-      commit("SET_USER", user)
-      commit("SET_ORG", org)
-      commit("SET_SUBSCIBE", subscibe)
-      commit("SET_TEMPLATE", template_info)
+      commit('SET_USER', user)
+      commit('SET_ORG', org)
+      commit('SET_SUBSCIBE', subscibe)
+      commit('SET_TEMPLATE', template_info)
       commit('SET_FILEDS', {
         fileds
       })
-
-
-
-
     },
-    SwitchRoleTypeToDoctor({commit}) {
-      commit("SET_ROLE_TYPE", 1)
+    SwitchRoleTypeToDoctor ({commit}) {
+      commit('SET_ROLE_TYPE', 1)
+    },
+    SetRequestScheduals ({commit}, requestScheduals) {
+      commit('SET_REQUESTSCHEDUALS', requestScheduals)
+    },
+    SetRequestDialysisScheduals ({commit}, requestDialysisScheduals) {
+      commit('SET_REQUESTDIALYSISSCHEDUALS', requestDialysisScheduals)
+    },
+    SetScheduals ({commit}, scheduals) {
+      commit('SET_SCHEDUALS', scheduals)
+    },
+    SetWaitScheduals ({commit}, waitscheduals) {
+      commit('SET_WAITSCHEDUALS', waitscheduals)
     }
   }
 }

src/styles/style.scss

         line-height: 0.62rem;
         float: left;
         width: 5.2rem;
-        @media only screen and (max-width: 415px) {
+        @media only screen and (min-width: 376px) and (max-width: 415px) {
           width: 4.2rem;
         }
         .content {