修改

src/pages/advice/DialysisAdviceTable.vue

@@ -94,6 +94,8 @@
               <span v-if="advice.single_dose"> 单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
               <span >{{advice.delivery_way}}</span>
               <span >{{advice.execution_frequency}}</span>
+              <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{advice.remark}})</span>
+
             </td>
             <td>{{ advice.parent_id == 0 ? parseTime(advice.execution_time, "{m}-{d} {h}:{i}") : "" }}</td>
             <td>{{ advice.parent_id == 0 ? getName(advice.execution_staff) : "" }}</td>

src/pages/main/dialog/OrdersDialog.vue

@@ -73,6 +73,8 @@
                     >单次用量{{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>
+
                   </div>
                 </td>
 
@@ -286,6 +288,7 @@
         EditDoctorAdvice(advice.id, {
           advice_name: advice.title,
           advice_desc: advice.advice_desc,
+          remark:advice.remark,
           // drug_spec: String(advice.drug_spec),
           // drug_spec_unit: advice.drug_spec_unit,
           delivery_way: advice.delivery_way,
@@ -305,6 +308,8 @@
                 if (advice.id == resp_advice.id) {
                   advice.advice_name = resp_advice.advice_name;
                   advice.advice_desc = resp_advice.advice_desc;
+                  advice.remark = resp_advice.remark;
+
                   // advice.drug_spec = resp_advice.drug_spec;
                   // (advice.drug_spec_unit = resp_advice.drug_spec_unit),
                   (advice.delivery_way = resp_advice.delivery_way),
@@ -837,6 +842,7 @@
             parent_id: advice.parent_id,
             title: advice.advice_name,
             advice_desc: advice.advice_desc,
+            remark: advice.remark,
             // drug_spec: advice.drug_spec,
             // drug_spec_unit: advice.drug_spec_unit,
             delivery_way: advice.delivery_way,
@@ -855,6 +861,8 @@
               parent_id: advice.parent_id,
               title: advice.advice_name,
               advice_desc: advice.advice_desc,
+              remark: advice.remark,
+
               // drug_spec: advice.drug_spec,
               // drug_spec_unit: advice.drug_spec_unit,
               delivery_way: advice.delivery_way,

src/pages/main/dialog/modify_order/ModifyAdviceGroup.vue

@@ -266,8 +266,7 @@ export default {
       EditDoctorAdvice(advice.id, {
         advice_name: advice.title,
         advice_desc: advice.advice_desc,
-        // drug_spec: String(advice.drug_spec),
-        // drug_spec_unit: advice.drug_spec_unit,
+        remark:advice.remark,
         delivery_way: advice.delivery_way,
         execution_frequency: advice.execution_frequency,
         single_dose: String(advice.single_dose),
@@ -281,8 +280,7 @@ export default {
           this.current_advice
           this.current_advice.advice_name = resp_advice.advice_name
           this.current_advice.advice_desc = resp_advice.advice_desc
-          // this.current_advice.drug_spec = resp_advice.drug_spec
-          // this.current_advice.drug_spec_unit = resp_advice.drug_spec_unit,
+          this.current_advice.remark = resp_advice.remark
           this.current_advice.delivery_way = resp_advice.delivery_way,
           this.current_advice.execution_frequency = resp_advice.execution_frequency,
           this.current_advice.single_dose = resp_advice.single_dose,

src/pages/main/dialog/modify_order/modify_order_form.vue

@@ -83,6 +83,15 @@
                 @focus="selectExecFrequencyAction"
               ></el-input>
             </div>
+
+            <div class="cell" v-show="order.parent_id == 0">
+              <label>医嘱嘱托</label>
+              <input
+                class="inputBox"
+                style="width:100%"
+                v-model="order.remark"
+              >
+            </div>
           </div>
         </div>
       </div>
@@ -196,6 +205,7 @@ export default {
         advice_desc: "",
         // drug_spec: "",
         // drug_spec_unit: "",
+        remark:"",
         delivery_way: "",
         execution_frequency: "",
         single_dose: "",
@@ -221,6 +231,8 @@ export default {
       this.order.parent_id = order.parent_id;
       this.order.title = order.title;
       this.order.advice_desc = order.advice_desc;
+      this.order.remark = order.remark;
+
       // this.order.drug_spec = order.drug_spec;
       // this.order.drug_spec_unit = order.drug_spec_unit;
       this.order.delivery_way =
@@ -258,8 +270,7 @@ export default {
           parent_id: this.order.parent_id,
           title: this.order.title,
           advice_desc: this.order.advice_desc,
-          // drug_spec: this.order.drug_spec,
-          // drug_spec_unit: this.order.drug_spec_unit,
+          remark:this.order.remark,
           delivery_way: this.order.delivery_way,
           execution_frequency: this.order.execution_frequency,
           single_dose: this.order.single_dose,

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

@@ -15,7 +15,7 @@
             <span @click="deleteOrderAction">删除医嘱内容</span>
       </div>
       <div class="DialogContent choose" style="height: 6.2rem;" >
-        <div class="content clearfix">  
+        <div class="content clearfix">
           <div style="overflow: hidden;">
             <div class="cell" style="margin-top: 0;">
               <label>医嘱类型</label>
@@ -283,6 +283,7 @@ export default {
           prescribing_number_unit: advice.prescribing_number_unit,
           delivery_way: advice.delivery_way,
           execution_frequency: advice.execution_frequency,
+          remark : advice.remark,
           subdrugs: []
         };
         for (let s_i = 0; s_i < advice.subdrugs.length; s_i++) {
@@ -445,6 +446,7 @@ export default {
       this.show_dialog_key = 0;
       order.id = 0;
       order.subdrugs = [];
+      console.log(order)
       this.advices.push(order);
     },
     didModifyOrder: function(order) {

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

@@ -63,6 +63,9 @@
               >
             </div>
 
+
+
+
             <div class="cell" v-show="order.parent_id == 0">
               <label>给药途径</label>
               <el-input
@@ -83,6 +86,16 @@
                 @focus="selectExecFrequencyAction"
               ></el-input>
             </div>
+
+            <div class="cell" v-show="order.parent_id == 0">
+              <label>医嘱嘱托</label>
+              <input
+                class="inputBox"
+                style="width:100%"
+                v-model="order.remark"
+              >
+            </div>
+
           </div>
         </div>
       </div>
@@ -198,6 +211,7 @@ export default {
         single_dose_unit: "",
         prescribing_number: "",
         prescribing_number_unit: "",
+        remark:"",
 
         // 在新增子药才用到的字段
         parent_id: 0, // 父医嘱ID
@@ -232,6 +246,8 @@ export default {
       this.order.single_dose_unit = "";
       this.order.prescribing_number = "";
       this.order.prescribing_number_unit = "";
+      this.order.remark = "";
+
     },
     showWithEdit: function(order) {
       this.mode = 2;
@@ -247,6 +263,8 @@ export default {
       this.order.single_dose_unit = order.single_dose_unit;
       this.order.prescribing_number = order.prescribing_number;
       this.order.prescribing_number_unit = order.prescribing_number_unit;
+      this.order.remark = order.remark;
+
     },
     showWithNewSubDrug: function(
       parent_id,
@@ -263,6 +281,8 @@ export default {
       this.order.start_time = parent_start_time;
       this.order.title = "";
       this.order.advice_desc = "";
+      this.order.remark = "";
+
       // this.order.drug_spec = "";
       // this.order.drug_spec_unit = "";
       this.order.delivery_way =
@@ -298,14 +318,13 @@ export default {
         this.$emit("did-create-new", {
           title: this.order.title,
           advice_desc: this.order.advice_desc,
-          // drug_spec: this.order.drug_spec,
-          // drug_spec_unit: this.order.drug_spec_unit,
           delivery_way: this.order.delivery_way,
           execution_frequency: this.order.execution_frequency,
           single_dose: this.order.single_dose,
           single_dose_unit: this.order.single_dose_unit,
           prescribing_number: this.order.prescribing_number,
-          prescribing_number_unit: this.order.prescribing_number_unit
+          prescribing_number_unit: this.order.prescribing_number_unit,
+          remark: this.order.remark
         });
       } else if (this.mode == 2) {
         this.$emit("did-modify", {
@@ -318,7 +337,9 @@ export default {
           single_dose: this.order.single_dose,
           single_dose_unit: this.order.single_dose_unit,
           prescribing_number: this.order.prescribing_number,
-          prescribing_number_unit: this.order.prescribing_number_unit
+          prescribing_number_unit: this.order.prescribing_number_unit,
+          remark: this.order.remark
+
         });
       } else if (this.mode == 3) {
         this.$emit("did-create-subdrug", {

src/pages/main/today/statOrder.vue

@@ -26,8 +26,10 @@
               <span>{{advice.advice_desc}}</span>
               <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
               <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
-              <span>{{advice.delivery_way}}</span>
-              <span>{{advice.execution_frequency}}</span>
+              <span v-if="advice.parent_id == 0">{{advice.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>{{parseTime(advice.execution_time, "{m}-{d} {h}:{i}")}}</td>