修改

src/pages/main/today/TodayTab.vue

@@ -833,6 +833,7 @@ export default {
 
                   initGroupBlock(group, advice);
                   group.advices.push(advice);
+                  
                   this.advice_groups.push(group);
                   group = this.newAdviceGroupObject();
 

src/pages/main/today/statOrder.vue

@@ -1,3 +1,4 @@
+<<<<<<< .mine
 <template>
   <div class="plate-box">
     <h2 class="title border">
@@ -9,12 +10,12 @@
     <!-- <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 v-if="template_id != 6" width="9.4%">核对护士</th>
+          <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">
@@ -36,7 +37,7 @@
               <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.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>
@@ -57,15 +58,15 @@
       <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
     </div>-->
     <el-table :data="statOrderdate" border style="width: 100%">
-      <el-table-column fixed label="开嘱医生" width="100">
+      <el-table-column fixed label="羲翊瓟汜" width="100">
         <template
           slot-scope="scope"
         >{{doctor_map[scope.row.advice_doctor] != undefined ? doctor_map[scope.row.advice_doctor].name : ""}}</template>
       </el-table-column>
-      <el-table-column label="开始时间" width="100" type="index">
+      <el-table-column label="羲宎奀潔" width="100" type="index">
         <template slot-scope="scope">{{parseTime(scope.row.start_time, "{m}-{d} {h}:{i}")}}</template>
       </el-table-column>
-      <el-table-column label="医嘱内容" width="100">
+      <el-table-column label="瓟翊囀⺍" width="100">
         <template slot-scope="scope">
           <span>{{scope.row.advice_name }}</span>
           <!-- <span>{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}} * {{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}}</span> -->
@@ -75,16 +76,16 @@
           >{{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}}</span>
           <span
             v-if="scope.row.single_dose"
-          >单次用量{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</span>
+          >等棒蚚講{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</span>
           <span v-if="scope.row.parent_id == 0">{{scope.row.delivery_way}}</span>
           <span v-if="scope.row.parent_id == 0">{{scope.row.execution_frequency}}</span>
           <!-- <span v-if="scope.row.parent_id == 0&&scope.row.remark.length > 0">({{scope.row.remark}})</span> -->
         </template>
       </el-table-column>
-      <el-table-column label="执行时间" width="100">
+      <el-table-column label="硒俴奀潔" width="100">
         <template slot-scope="scope">{{parseTime(scope.row.execution_time, "{m}-{d} {h}:{i}")}}</template>
       </el-table-column>
-      <el-table-column label="执行护士" width="200">
+      <el-table-column label="硒俴誘尪" width="200">
         <template
           slot-scope="scope"
         >{{scope.row.checker != 0 ? (doctor_map[scope.row.checker] != undefined ? doctor_map[scope.row.checker].name : "") : ""}}</template>
@@ -100,7 +101,7 @@ export default {
   name: "statOrder",
   data() {
     return {
-      title: "临时医嘱 ",
+      title: "還奀瓟翊 ",
       template_id: 0,
       tableDate: [],
       statOrderdate: []
@@ -256,3 +257,263 @@ export default {
   padding: 6px 0;
 }
 </style>
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs