更新

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

         <span class="success" @click="comfirmAction">完成</span>
       </div>
       <div class="yzNav" style="width:100%;">
-<<<<<<< .mine
-            <span @click="addOrderByTemplateAction">选择医嘱模板</span>
-            <span @click="addNewOrderAction">新增医嘱内容</span>
-            <span @click="modifyOrderAction">修改医嘱内容</span>
-            <span @click="deleteOrderAction">删除医嘱内容</span>
-=======
         <span class="newSpan" @click="addOrderByTemplateAction">选择模板</span>
         <span class="newSpan" @click="addNewOrderAction">新增内容</span>
         <span class="newSpan" @click="modifyOrderAction">修改内容</span>
         <span class="newSpan" @click="deleteOrderAction">删除内容</span>
->>>>>>> .theirs
       </div>
-<<<<<<< .mine
-      <div class="DialogContent choose" style="height: 6.2rem;" >
-        <div class="content clearfix">
-          <div style="overflow: hidden;">
-            <div class="cell" style="margin-top: 0;">
-              <label>医嘱类型</label>
-              <el-input ref="advice_type" value="临时" disabled></el-input>
-            </div>
-            <div class="cell" style="margin-top: 0;">
-              <label>开始时间</label>
-              <el-input :value="start_time_str" readonly @focus="selectStartTimeAction"></el-input>
-            </div>
-=======
       <div class="content clearfix backgroundColor">
         <div style="overflow: hidden;">
           <div class="cell" style="margin-top: 0;">
             <label>医嘱类型</label>
-            <el-input
-              class="typeInput"
-              ref="advice_type"
-              value="临时"
-              disabled
-            ></el-input>
-
->>>>>>> .theirs
+            <el-input class="typeInput" ref="advice_type" value="临时" disabled></el-input>
           </div>
-<<<<<<< .mine
-          <div style="overflow: hidden;margin-top: 15px" >
-            <div class="cell" style="margin-top: 0;">
-              <label>开嘱医生: {{$store.getters.user.user.user_name}}</label>
-            </div>
-            <div class="cell" style="margin-top: 0;">
-              <label>开嘱时间 {{record_date_str}}</label>
-            </div>
-
-=======
           <div class="cell" style="margin-top: 0;">
             <label>开始时间</label>
             <el-input
               readonly
               @focus="selectStartTimeAction"
             ></el-input>
->>>>>>> .theirs
           </div>
           <table class="table">
             <tr>
                   style="text-align: left; padding-left: 5px; padding-right: 5px;"
                 >{{ advice.title }}</td>
                 <td v-if="advice.advice_desc">{{ advice.advice_desc }}{{advice.drug_spec_unit}}</td>
-                <td v-if="advice.prescribing_number">{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
+                <td
+                  v-if="advice.prescribing_number"
+                >{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
                 <td v-else></td>
                 <td v-if="advice.single_dose">{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
                 <td v-else></td>
                   style="text-align: left; padding-right: 5px; padding-left: 25px;"
                 >{{ subdrug.title }}</td>
                 <td>{{ subdrug.advice_desc }} {{subdrug.drug_spec_unit}}</td>
-                <td><span v-if="subdrug.prescribing_number">{{ subdrug.prescribing_number }}{{ subdrug.prescribing_number_unit }}</span></td>
-                <td><span v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</span></td>
+                <td>
+                  <span
+                    v-if="subdrug.prescribing_number"
+                  >{{ subdrug.prescribing_number }}{{ subdrug.prescribing_number_unit }}</span>
+                </td>
+                <td>
+                  <span
+                    v-if="subdrug.single_dose"
+                  >{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</span>
+                </td>
                 <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
                 <td></td>
                 <td></td>
     },
     drug_spec_unit_options: {
       type: Array,
-      default: function () {
+      default: function() {
         return [];
       }
     },
           prescribing_number_unit: advice.prescribing_number_unit,
           delivery_way: advice.delivery_way,
           execution_frequency: advice.execution_frequency,
-          remark : advice.remark,
+          remark: advice.remark,
           subdrugs: []
         };
         for (let s_i = 0; s_i < advice.subdrugs.length; s_i++) {
     },
     didSelectTemplateAdvice: function(resp_advices) {
       this.show_dialog_key = 0;
-      var advices = []
+      var advices = [];
       for (let index = 0; index < resp_advices.length; index++) {
         const adv = resp_advices[index];
         if (adv.parent_id == 0) {
             prescribing_number: adv.prescribing_number,
             prescribing_number_unit: adv.prescribing_number_unit,
             subdrugs: []
-          })
+          });
         }
       }
       for (let r_a_i = 0; r_a_i < resp_advices.length; r_a_i++) {
           advice.prescribing_number = order.prescribing_number;
           advice.prescribing_number_unit = order.prescribing_number_unit;
           advice.remark = order.remark;
-
         } else {
           var subdrug = advice.subdrugs[this.selecting_subdrug_index];
           subdrug.title = order.title;
 <style style="stylesheet/scss" lang="scss" scoped>
 .table {
   width: 100%;
-<<<<<<< .mine
-
-
-
-
-
-=======
   // overflow: auto;
 }
 .table {
   width: 1200px;
   overflow-x: scroll;
->>>>>>> .theirs
   // margin-top: 0rem;
   @media only screen and (max-width: 767px) {
     width: 1000px;
   }
 
   .row-class-active > td {
-    background: #badcff!important;
+    background: #badcff !important;
   }
 }
 .newSpan {