修改样式2

src/pages/main/DetailsPage.vue

@@ -27,33 +27,8 @@
         <!-- <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">
@@ -74,19 +49,11 @@
             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";
@@ -97,21 +64,9 @@ import { parseTime } from "@/utils";
 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,
@@ -121,38 +76,32 @@ export default {
     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();
     },
@@ -162,19 +111,7 @@ export default {
         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)
@@ -190,55 +127,17 @@ export default {
           // 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
+    toMyPatients() {
+      var patient_id = this.$route.query.patient_id;
+      this.$router.push("/mypatients/" + patient_id);
     }
   }
-}
+};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>

src/pages/main/DialysisArea.vue

@@ -515,7 +515,7 @@ export default {
 }
 </style>
 
-<style>
+<style style="stylesheet/scss" lang="scss">
 .picker-toolbar {
   height: 60px;
 }

src/pages/main/PatientBox.vue

@@ -55,7 +55,6 @@
 </template>
 
 <script>
-<<<<<<< .mine
 import { parseTime } from "@/utils";
 import { jsGetAge } from "@/utils/tools";
 import { setDialysisOrWaitSelectedConfig } from "@/utils/data_config";
@@ -107,6 +106,10 @@ export default {
         return "gray";
       } else if (state == 3) {
         return "red";
+      } else if (state == 5) {
+        return "green1";
+      } else if (state == 6) {
+        return "green2";
       } else {
         return "blue";
       }
@@ -137,175 +140,46 @@ export default {
         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.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
+      if (
+        schedual.assessment_before_dislysis == null ||
+        schedual.assessment_before_dislysis.weight_before == 0
       ) {
-        // 监测中
-        return 3;
-      } else {
-        return 1;
-      }
-    },
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
-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
+        return 5;
       }
       if (schedual.prescription == null || schedual.prescription.creater == 0) {
         // 未确认处方
-        return 6
+        return 6;
       }
 
       if (schedual.dialysis_order == null) {
         // 未上机
-        return 4
+        return 4;
       } else if (schedual.dialysis_order.stage == 2) {
         // 已下机
-        return 2
+        return 2;
       } else if (
         schedual.dialysis_order.stage == 1 &&
-          schedual.monitoring_records != null &&
-          schedual.monitoring_records.length > 1
+        schedual.monitoring_records != null &&
+        schedual.monitoring_records.length > 1
       ) {
         // 监测中
-        return 3
+        return 3;
       } else {
-        return 1
+        return 1;
       }
     },
->>>>>>> .theirs
 
-<<<<<<< .mine
     orderState: function(schedual) {
       if (schedual.dialysis_order == null) {
         // 未上机
@@ -354,58 +228,7 @@ export default {
       } 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}");
@@ -430,34 +253,7 @@ export default {
       } 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({
@@ -466,29 +262,11 @@ export default {
           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>
@@ -593,6 +371,12 @@ export default {
       .green {
         background: #5bd18b;
       }
+      .green1 {
+        background: #e6a23c;
+      }
+      .green2 {
+        background: #7930c3;
+      }
       .gray {
         background: #a8b3ba;
       }
@@ -618,105 +402,7 @@ export default {
   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;

src/pages/main/PrintIndex.vue

@@ -18,7 +18,6 @@
         <!--&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"
@@ -34,23 +33,12 @@
         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
+      <DialysisPrintOrderSix
+        style="margin-top:60px;"
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id ==6"
+      ></DialysisPrintOrderSix>
     </div>
     <side-bar :active_index="0" v-if="isShow == true"></side-bar>
   </div>
@@ -67,7 +55,7 @@ import LabelBox from "./printItem/LabelBox";
 import DialysisPrintOrderOne from "./template/DialysisPrintOrderOne";
 import DialysisPrintOrderTwo from "./template/DialysisPrintOrderTwo";
 import DialysisPrintOrderFive from "./template/DialysisPrintOrderFive";
-import DialysisPrintOrderSix from './template/DialysisPrintOrderSix'
+import DialysisPrintOrderSix from "./template/DialysisPrintOrderSix";
 
 export default {
   name: "PrintIndex",

src/pages/main/RecordPage.vue

@@ -98,37 +98,19 @@
 </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
     }
@@ -151,82 +133,19 @@ export default {
     // 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();
@@ -234,21 +153,8 @@ export default {
     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>

src/pages/main/dialog/LongDialog.vue

@@ -296,52 +296,52 @@
 </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
         }
-      })
+      });
     }
   },
 
@@ -354,14 +354,14 @@ export default {
     },
     machines_prop: {
       type: Array,
-      default: function () {
-        return new Array()
+      default: function() {
+        return new Array();
       }
     }
   },
-  data () {
+  data() {
     return {
-      doctor: '',
+      doctor: "",
       showObj: {
         mode_show: {
           0: false,
@@ -384,160 +384,113 @@ export default {
 
       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
         }
       }
     }
@@ -558,36 +511,31 @@ export default {
   //   }
 
   // },
-  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
@@ -609,7 +557,7 @@ export default {
   //     this.show_two_menu = true;
   //   }
   // }
-}
+};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>

src/pages/main/dialog/OrdersDialog.vue

@@ -21,7 +21,8 @@
           @click="modifyExecAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0) }"
         >修改执行医嘱</span>
-        <span v-if="template_id != 6"
+        <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>
@@ -83,27 +84,16 @@
                 >
                   <div class="txt">
                     <span>{{advice.advice_name }}</span>
-<<<<<<< .mine
                     <span
                       v-if="advice.advice_desc"
-                    >{{ advice.advice_desc }}{{advice.drug_spec_unit}}</span>
+                    >({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
                     <span
                       v-if="advice.prescribing_number"
-                    >{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                    >&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}})</span>
                     <span
-                      v-if="advice.single_dose"
+                      v-if="advice.single_dose && template_id != 6"
                     >单次用量{{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
@@ -246,6 +236,7 @@ export default {
   data() {
     return {
       isShowDialog: true,
+      template_id: 0,
       isShowExce: true,
       isShowMofifyExce: false,
       title: "临时医嘱",
@@ -276,11 +267,11 @@ export default {
     };
   },
   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);
 
-<<<<<<< .mine
     var y = newDate.getFullYear();
     var m = newDate.getMonth() + 1;
     var d = newDate.getDate();
@@ -293,79 +284,12 @@ export default {
     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];
@@ -407,12 +331,13 @@ export default {
 
   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();
-      }
+      // if(!this.isPremission){
+      //   Toast.fail('你没有权限修改医嘱！')
+      // }else{
+      this.nowExecTime = new Date(this.currentAdvices[0].start_time * 1000);
+      this.$refs.mofify_exec_time.open();
+
+      // }
     },
     didCreateAdvices: function(advices) {
       if (advices.length == 0) {
@@ -422,26 +347,13 @@ export default {
         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/index.vue

@@ -10,6 +10,8 @@
 </template>
 
 
+
+
 <script>
 import RecordPage from "./RecordPage";
 import SideBar from "@/pages/layout/SideBar";
@@ -37,312 +39,120 @@ export default {
   },
   methods: {
     requestScheduals() {
-      var date = parseTime(Date.parse(new Date()), "{y}-{m}-{d}");
-      getWaitingScheduals({ date: date }).then(rs => {
-        var resp = rs.data;
-        // 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++) {
+      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]);
               }
             }
           }
-
-          const sorted = this.groupBy(doctorAdvice, function(item) {
-            return [item.groupno];
-          });
-
-          this.unReadWaitNum = sorted.length;
-        } else {
-          this.$toast({
-            message: resp.msg
-          });
         }
-      });
-    },
-<<<<<<< .mine
-    requestDialysisScheduals() {
-      var date = this.$store.getters.app.dialysis_area.schedule_date;
-      var type = 0;
-      getDialysisScheduals({ type: type, date: parseTime(date, "{y}-{m}-{d}") })
-        .then(rs => {
+
+        const sorted = this.groupBy(doctorAdvice, function(item) {
+          return [item.groupno];
+        });
+        this.unReadWaitNum = sorted.length;
+      } 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 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]);
-=======
-    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])
-                    }
+            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;
+            this.unReadWaitNum = sorted.length;
           } else {
             this.$toast({
               message: resp.msg
             });
           }
-        })
-        .catch(v => {});
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+        });
+      }
+    },
+    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]);
+            }
+          }
+        }
 
-=======
-        } 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);
+        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
-              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])
-                    }
+              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.unReadWaitNum = sorted.length
+              const sorted = this.groupBy(doctorAdvice, function(item) {
+                return [item.groupno];
+              });
 
+              this.unReadDialysisNum = 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()
+          .catch(v => {});
       }
-
->>>>>>> .theirs
     },
     groupBy(array, f) {
       const groups = {};

src/pages/main/today/acceptsAssessment.vue

@@ -59,11 +59,7 @@
           <span class="content">{{this.record.sick_condition_other}}</span>
         </li>
 
-<<<<<<< .mine
-        <li v-if="isShow('摄入量')">
-=======
-        <li style="height: 0.6rem;"  v-if="isShow('摄入量')">
->>>>>>> .theirs
+        <li style="height: 0.6rem;" v-if="isShow('摄入量')">
           <label>摄入量:</label>
           <span class="content">{{intakes}}</span>
         </li>
@@ -88,76 +84,42 @@
           <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
+        "3": "昏迷",
+        "4": "模糊"
       },
       appetites: {
-<<<<<<< .mine
         "1": "正常",
         "2": "减退",
         "3": "恶心",
         "4": "呕吐",
         "5": "腹泻"
-=======
-        '1': '正常',
-        '2': '减退',
-        '3': '恶心',
-        '4': '呕吐',
-        '5': '腹泻'
->>>>>>> .theirs
       },
       postures: {
-<<<<<<< .mine
         "1": "自动体位",
         "2": "平卧位",
         "3": "半卧位",
@@ -192,46 +154,8 @@ export default {
         "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: {
@@ -239,233 +163,100 @@ precautionss: {
     }
   },
   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
@@ -473,28 +264,13 @@ psychologicalAssessment: function () {
           : 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 &&
@@ -502,28 +278,12 @@ psychologicalAssessment: function () {
           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>

src/pages/main/today/detailsInfo.vue

@@ -58,12 +58,12 @@
 </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: "",
@@ -78,18 +78,18 @@ export default {
       //   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: {
@@ -97,16 +97,16 @@ export default {
     },
     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: {
@@ -114,31 +114,18 @@ export default {
     }
   },
   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: {
@@ -162,8 +149,8 @@ export default {
     //   }
     // }
   },
-  created () {}
-}
+  created() {}
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

src/pages/main/today/dialysisComputer.vue

@@ -31,24 +31,14 @@
           <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() {
@@ -71,78 +61,25 @@ export default {
     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 "-";
@@ -160,25 +97,6 @@ export default {
   },
   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>

src/pages/main/today/dialysisOff.vue

@@ -25,29 +25,14 @@
 </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: {
@@ -58,71 +43,35 @@ export default {
     }
   },
   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 () {
-<<<<<<< .mine
+    nurse: function() {
       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>

src/pages/main/today/statOrder.vue

@@ -5,24 +5,6 @@
       <p>{{title}}</p>
       <span class="line"></span>
     </h2>
-<<<<<<< .mine
-    <div class="newDiv">
-      <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 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>
-=======
     <table class="table">
       <tr>
         <th width="12%">开嘱医生</th>
@@ -34,64 +16,54 @@
       </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>
-
-
+          <td
+            v-if="i == 0"
+            :rowspan="group.advices.length"
+          >{{doctor_map[advice.advice_doctor] != undefined ? doctor_map[advice.advice_doctor].name : ""}}</td>
 
+          <td
+            v-if="i == 0"
+            :rowspan="group.advices.length"
+          >{{parseTime(advice.start_time, "{m}-{d} {h}:{i}")}}</td>
 
->>>>>>> .theirs
+          <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.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+            <span
+              v-if="advice.prescribing_number"
+            >{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+            <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+            <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
+            <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
+            <span v-if="advice.parent_id == 0&&advice.remark.length > 0">({{advice.remark}})</span>
+          </td>
 
-            <td
-              v-if="i == 0"
-              :rowspan="group.advices.length"
-            >{{parseTime(advice.start_time, "{m}-{d} {h}:{i}")}}</td>
+          <td>{{parseTime(advice.execution_time, "{m}-{d} {h}:{i}")}}</td>
 
-            <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.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
-              <span
-                v-if="advice.prescribing_number"
-              >{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-              <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
-              <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
-              <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
-              <span v-if="advice.parent_id == 0&&advice.remark.length > 0">({{advice.remark}})</span>
-            </td>
+          <td>{{advice.execution_staff != 0 ? (doctor_map[advice.execution_staff] != undefined ? doctor_map[advice.execution_staff].name : "") : ""}}</td>
 
-            <td>{{parseTime(advice.execution_time, "{m}-{d} {h}:{i}")}}</td>
-
-            <td>{{advice.execution_staff != 0 ? (doctor_map[advice.execution_staff] != undefined ? doctor_map[advice.execution_staff].name : "") : ""}}</td>
-
-            <td>{{advice.checker != 0 ? (doctor_map[advice.checker] != undefined ? doctor_map[advice.checker].name : "") : ""}}</td>
-          </tr>
-        </template>
-      </table>
-      <div class="NoData" v-show="advice_groups.length == 0">
-        <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
-      </div>
+          <td>{{advice.checker != 0 ? (doctor_map[advice.checker] != undefined ? doctor_map[advice.checker].name : "") : ""}}</td>
+        </tr>
+      </template>
+    </table>
+    <div class="NoData" v-show="advice_groups.length == 0">
+      <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
     </div>
   </div>
 </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: {
@@ -104,87 +76,87 @@ export default {
       }
     }
   },
-  created () {
-    this.template_id = this.$store.getters.user.template_info.template_id
+  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>