添加规格名称单位

src/App.vue

@@ -1,13 +1,32 @@
 <template>
   <div id="app">
     <!-- <img src="./assets/logo.png"> -->
-    <router-view/>
+    <router-view  v-if="isRouterAlive" />
   </div>
 </template>
 
 <script>
 export default {
-  name: "App"
+  name: "App",
+  provide () {
+    return {
+      reload: this.reload
+    }
+  },
+  data () {
+    return {
+      isRouterAlive: true
+    }
+  },
+  methods: {
+    reload () {
+      this.isRouterAlive = false
+      this.$nextTick(function () {
+        this.isRouterAlive = true
+      })
+    }
+  }
+
 };
 </script>
 

src/api/stock.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+export function getWarehouseGoodInfo(type_id){
+  return request({
+    url:'/m/api/warehouse/query?type_id='+type_id,
+    method:'get',
+  })
+}

src/pages/advice/DialysisAdviceTable.vue

@@ -112,7 +112,7 @@
                 </td>
                 <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
                   <span>{{advice.advice_name }}</span>
-                  <span>{{advice.advice_desc}}</span>
+                  <span>{{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>

src/pages/advice/NormalAdviceTable.vue

@@ -91,7 +91,7 @@
               <td>{{ advice.parent_id == 0 ? parseTime(advice.start_time, "{m}-{d} {h}:{i}") : "" }}</td>
               <td>
                 <span >{{advice.advice_name }}</span>
-                <span >{{advice.advice_desc}}</span>
+                <span >{{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>

src/pages/main/DialysisArea.vue

@@ -304,7 +304,7 @@ export default {
 .screening {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
-  top: 63px;
+  top: 1.6rem;
   right: 0;
   z-index: 66;
   left: 1.58rem;

src/pages/main/Print.vue

@@ -1585,7 +1585,7 @@
               <td class="advice-name">
                 <span v-if="advice[0].parent_id>0">└</span>
                 <span>{{advice[0].advice_name }}</span>
-                <span>{{advice[0].advice_desc}}</span>
+                <span>{{advice[0].advice_desc}} {{advice[0].drug_spec_unit}}</span>
                 <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span>
                 <span v-if="advice[0].prescribing_number">* {{advice[0].prescribing_number}}{{advice[0].prescribing_number_unit}}</span>
                 <span v-if="advice[0].single_dose">单次用量 {{advice[0].single_dose}}{{advice[0].single_dose_unit}}</span>

src/pages/main/RecordPage.vue

@@ -6,7 +6,7 @@
           <span class="title"> {{ $store.getters.user.org.org_short_name }} </span>
         </div>
       </van-col>
-      <van-col :span="6">
+      <van-col :span="11">
         <div class="department">
           <ul>
             <li style="position: relative;" :class="index == 0? 'active':'' " @click="ClickTab(0)">

src/pages/main/WaitingArea.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
     <div class="screening">
+      <!--<div @click="reloads()">刷新</div>-->
       <ul>
-
         <li v-for="(item,i) in menuList" :class="select_index == i ? 'active' : ''" @click="menuTabClick(i)"
             :key="i">{{ item.label + (item.count > 0 ? '(' + item.count + ')' : '') }}
         </li>
@@ -75,6 +75,7 @@
       PatientBox,
       Popover
     },
+    inject: ['reload'],
     data () {
       return {
         menuList: [
@@ -270,6 +271,10 @@
       // })
     },
     methods: {
+      reloads:function(){
+        this.reload()
+
+      },
       handleAllChange: function (tabIndex) {
         this.select_index = tabIndex
         this.zone_selected = 0
@@ -399,7 +404,7 @@
   .screening {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
-  top: 63px;
+  top: 1.6rem;
   right: 0;
   z-index: 66;
   left: 1.58rem;

src/pages/main/dialog/OrdersDialog.vue

@@ -78,7 +78,7 @@
                 >
                   <div class="txt">
                     <span>{{advice.advice_name }}</span>
-                    <span>{{ advice.advice_desc }}</span>
+                    <span>{{ 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>
@@ -118,6 +118,7 @@
       v-show="index==1&&isShowDialog"
       @back-action="index = 0"
       :patient_id="patient.id"
+      :drug_spec_unit_options="unitsOption"
       :delivery_way_options="deliveryWayOptions"
       :execution_frequency_options="executionFrequencyOptions"
       :single_dose_unit_options="unitsOption"
@@ -132,12 +133,14 @@
       @did-create-subdrug="didAddSubdrug"
       :single_dose_unit_options="unitsOption"
       :prescribing_number_unit_options="unitsOption"
+      :drug_spec_unit_options="unitsOption"
     ></advice-form>
 
     <modify-advice-form
       ref="modify_advice_form"
       @back="index = 0"
       @did-modify="didModifyAdvice"
+      :drug_spec_unit_options="unitsOption"
       :delivery_way_options="deliveryWayOptions"
       :execution_frequency_options="executionFrequencyOptions"
       :single_dose_unit_options="unitsOption"
@@ -151,6 +154,7 @@
       :delivery_way_options="deliveryWayOptions"
       :execution_frequency_options="executionFrequencyOptions"
       :single_dose_unit_options="unitsOption"
+      :drug_spec_unit_options="unitsOption"
       :prescribing_number_unit_options="unitsOption"
       :advice_templates="adviceTemplates"
       @did-create-advices="didCreateAdvices"
@@ -377,7 +381,7 @@
           remark: advice.remark,
           start_time: advice.start_time,
           // drug_spec: String(advice.drug_spec),
-          // drug_spec_unit: advice.drug_spec_unit,
+          drug_spec_unit: advice.drug_spec_unit,
           delivery_way: advice.delivery_way,
           execution_frequency: advice.execution_frequency,
           single_dose: String(advice.single_dose),
@@ -398,7 +402,7 @@
                     advice.remark = resp_advice.remark;
                     advice.start_time = resp_advice.start_time;
                     // advice.drug_spec = resp_advice.drug_spec;
-                    // (advice.drug_spec_unit = resp_advice.drug_spec_unit),
+                    (advice.drug_spec_unit = resp_advice.drug_spec_unit),
                     (advice.delivery_way = resp_advice.delivery_way),
                       (advice.execution_frequency =
                         resp_advice.execution_frequency),
@@ -487,7 +491,7 @@
           advice_name: subdrug.title,
           advice_desc: subdrug.advice_desc,
           // drug_spec: String(subdrug.drug_spec),
-          // drug_spec_unit: subdrug.drug_spec_unit,
+          drug_spec_unit: subdrug.drug_spec_unit,
           single_dose: String(subdrug.single_dose),
           single_dose_unit: subdrug.single_dose_unit,
           prescribing_number: String(subdrug.prescribing_number),
@@ -1132,7 +1136,7 @@
             advice_desc: advice.advice_desc,
             remark: advice.remark,
             // drug_spec: advice.drug_spec,
-            // drug_spec_unit: advice.drug_spec_unit,
+            drug_spec_unit: advice.drug_spec_unit,
             delivery_way: advice.delivery_way,
             execution_frequency: advice.execution_frequency,
             single_dose: advice.single_dose,
@@ -1160,7 +1164,7 @@
             remark: advice.remark,
             start_time: advice.start_time,
             // drug_spec: advice.drug_spec,
-            // drug_spec_unit: advice.drug_spec_unit,
+            drug_spec_unit: advice.drug_spec_unit,
             delivery_way: advice.delivery_way,
             execution_frequency: advice.execution_frequency,
             single_dose: advice.single_dose,
@@ -1180,7 +1184,7 @@
               remark: advice.remark,
 
               // drug_spec: advice.drug_spec,
-              // drug_spec_unit: advice.drug_spec_unit,
+              drug_spec_unit: advice.drug_spec_unit,
               delivery_way: advice.delivery_way,
               execution_frequency: advice.execution_frequency,
               single_dose: advice.single_dose,

src/pages/main/dialog/PrescriptionDialog.vue

@@ -240,15 +240,14 @@
 
 
 
-        <!--<div @click="showSubMenu('consumable_material')" class="item" ref="consumable_material" v-if="config.is_open == 1">-->
-          <!--<label class="name" for="knj">透析耗材</label>-->
-          <!--<div class="content">-->
-            <!--<span class="text" id="knjaa">去配置</span>-->
-            <!--<span class="iconfont">&#xe6f9;</span>-->
-          <!--</div>-->
-        <!--</div>-->
-
-
+        <div @click="dialysisGoodsClick()" class="item" ref="consumable_material" v-if="config.is_open == 1">
+          <label class="name" for="knj">透析耗材</label>
+          <div class="content">
+            <span class="text" id="knjaa" v-if="this.prescription_prop.id > 0">去修改</span>
+            <!--<span class="text" id="knjaa" v-else-if="this.prescription_prop.id.length == 0">去配置</span>-->
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
 
 
         <div class="item" style="display: none">
@@ -285,8 +284,9 @@
     </div>
     <!--<two-menu title="二级菜单" v-show="isShowModeSubMenu"></two-menu>-->
     <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm"  v-on:menu-empty="menuEmpty"
-                        :propsForm="propForm"></check-box-sub-menu>
+                        :propsForm="propForm" ></check-box-sub-menu>
     <!--<multiple-sub-menu :goodTypes="types" :visibility="is_show" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" :propsForm="propForm"></multiple-sub-menu>-->
+    <multiple-sub-menu :goodTypes="types" :info="info" :visibility="is_show"  v-on:menu-cancel-two="menuCancleTwo" v-on:menu-comfirm-two="menuComfirmTwo" :propsForm="propForm" :dialysisPrescription="dialysisPrescription"></multiple-sub-menu>
 
     <mt-datetime-picker
       ref="picker"
@@ -300,15 +300,12 @@
 
 
 
-
-
-
   </div>
 </template>
 
 <script>
   import CheckBoxSubMenu from "./subMenu/checkBoxSubMenu";
-  // import MultipleSubMenu from "./subMenu/multipleSubMenu"
+  import MultipleSubMenu from "./subMenu/multipleSubMenu"
   import {commitDialysisPrescription, postSign, postSolution} from "@/api/dialysis";
   import {Toast} from 'vant';
   import {getDataConfig} from '@/utils/data';
@@ -338,6 +335,12 @@
           return new Array();
         }
       },
+      info:{
+        type:Array,
+        default: function () {
+          return new Array();
+        }
+      },
       prescription_prop: {
         type: Object,
       },
@@ -363,7 +366,7 @@
         displaceLiquiPartOptions:[],
         bloodAccessOptions:[],
 
-
+        is_show:false,
 
         perfusion_apparatus: {},
         replacementWays: [],
@@ -416,6 +419,13 @@
           blood_access:"",
           ultrafiltration:"",
           body_fluid_other:"",
+          niprocart:'',
+          jms:'',
+          fistula_needle_set:'',
+          fistula_needle_set_16:'',
+          hemoperfusion:'',
+          dialyser_sterilised:'',
+          filtryzer:'',
         },
         anticoagulant: {
           id: 0,
@@ -928,10 +938,28 @@
         } else {
           return '0.0';
         }
+      },dialysisGoodsClick:function () {
+        this.isShowDialog = false
+        this.is_show = true
+      },menuCancleTwo:function () {
+        this.isShowDialog = true
+        this.is_show = false
+
+      },menuComfirmTwo:function (dialysisPrescription) {
+        this.isShowDialog = true
+        this.is_show = false
+        this.dialysisPrescription.niprocart = dialysisPrescription.niprocart
+        this.dialysisPrescription.jms = dialysisPrescription.jms
+        this.dialysisPrescription.fistula_needle_set = dialysisPrescription.fistula_needle_set
+        this.dialysisPrescription.fistula_needle_set_16 = dialysisPrescription.fistula_needle_set_16
+        this.dialysisPrescription.hemoperfusion = dialysisPrescription.hemoperfusion
+        this.dialysisPrescription.dialyser_sterilised = dialysisPrescription.dialyser_sterilised
+        this.dialysisPrescription.filtryzer = dialysisPrescription.filtryzer
 
       }
     },
     created() {
+
       if (this.$store.getters.user.user.user_type == 2) {
         this.isShowSign = true;
 
@@ -1020,6 +1048,7 @@
     },
 
     components: {
+      MultipleSubMenu,
       // MultipleSubMenu,
       CheckBoxSubMenu
     }

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

@@ -44,7 +44,7 @@
             </tr>
             <tr v-for="(advice, index) in advices" :key="index" :class="{ 'row-class-active': index == current_advice_index }" @click="selectAdviceAction(index, advice)">
               <td :class="{ 'advice_name': advice.parent_id == 0, 'subdrug_name': advice.parent_id > 0 }">{{ advice.advice_name }}</td>
-              <td>{{ advice.advice_desc }}</td>
+              <td>{{ advice.advice_desc }}{{advice.drug_spec_unit}}</td>
               <td>{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
               <td>{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
               <td>{{ advice.parent_id == 0 ? advice.delivery_way : "" }}</td>
@@ -63,6 +63,7 @@
       :execution_frequency_options="execution_frequency_options"
       :single_dose_unit_options="single_dose_unit_options"
       :prescribing_number_unit_options="prescribing_number_unit_options"
+      :drug_spec_unit_options="drug_spec_unit_options"
     ></modify-advice-form>
 
     <mt-datetime-picker
@@ -77,6 +78,7 @@
       @back-action="sub_dialog_key = 0"
       :patient_id="patient_id"
       :group_no="group_no"
+      :drug_spec_unit_options="drug_spec_unit_options"
       :delivery_way_options="delivery_way_options"
       :execution_frequency_options="execution_frequency_options"
       :single_dose_unit_options="single_dose_unit_options"
@@ -114,12 +116,12 @@ export default {
         return [];
       }
     },
-    // drug_spec_unit_options: {
-    //   type: Array,
-    //   default: function() {
-    //     return [];
-    //   }
-    // },
+    drug_spec_unit_options: {
+      type: Array,
+      default: function() {
+        return [];
+      }
+    },
     delivery_way_options: {
       type: Array,
       default: function() {
@@ -224,7 +226,7 @@ export default {
           title: this.current_advice.advice_name,
           advice_desc: this.current_advice.advice_desc,
           // drug_spec: this.current_advice.drug_spec,
-          // drug_spec_unit: this.current_advice.drug_spec_unit,
+          drug_spec_unit: this.current_advice.drug_spec_unit,
           delivery_way: this.current_advice.delivery_way,
           execution_frequency: this.current_advice.execution_frequency,
           single_dose: this.current_advice.single_dose,
@@ -267,12 +269,14 @@ export default {
         advice_name: advice.title,
         advice_desc: advice.advice_desc,
         remark:advice.remark,
+        drug_spec_unit:advice.drug_spec_unit,
         delivery_way: advice.delivery_way,
         execution_frequency: advice.execution_frequency,
         single_dose: String(advice.single_dose),
         single_dose_unit: advice.single_dose_unit,
         prescribing_number: String(advice.prescribing_number),
-        prescribing_number_unit: advice.prescribing_number_unit
+        prescribing_number_unit: advice.prescribing_number_unit,
+        drug_spec_unit:advice.drug_spec_unit
       }).then(rs => {
         if (rs.data.state == 1) {
           var resp_advice = rs.data.data.advice
@@ -280,6 +284,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_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,

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

@@ -23,7 +23,7 @@
             <div class="cell">
               <label>药品规格</label>
               <input class="inputBox" style="width:100%" v-model="order.advice_desc">
-              <!-- <input type="number" onclick="this.select()" class="inputBox" style="width:60%" v-model="order.drug_spec">
+              <!--<input type="number" onclick="this.select()" class="inputBox" style="width:60%" v-model="order.drug_spec">-->
               <input
                 type="text"
                 placeholder="单位"
@@ -32,7 +32,7 @@
                 style="width:35%"
                 v-model="order.drug_spec_unit"
                 @focus="selectDrugSpecUnitAction"
-              > -->
+              >
             </div>
 
             <div class="cell">
@@ -114,7 +114,7 @@
       option_label_key="name"
     ></single-option-dialog>
 
-    <!-- <single-option-dialog
+    <single-option-dialog
       :visibility="sub_dialog_key == 5"
       title="用药规格"
       @did-selected="didSelectDrugSpecUnit"
@@ -122,7 +122,7 @@
       :options="drug_spec_unit_options"
       option_key="id"
       option_label_key="name"
-    ></single-option-dialog> -->
+    ></single-option-dialog>
 
     <single-option-dialog
       :visibility="sub_dialog_key == 2"
@@ -174,12 +174,12 @@ export default {
     SingleOptionDialog
   },
   props: {
-    // drug_spec_unit_options: {
-    //   type: Array,
-    //   default: function() {
-    //     return [];
-    //   }
-    // },
+    drug_spec_unit_options: {
+      type: Array,
+      default: function() {
+        return [];
+      }
+    },
     delivery_way_options: {
       type: Array,
       default: function() {
@@ -220,7 +220,7 @@ export default {
         title: "",
         advice_desc: "",
         // drug_spec: "",
-        // drug_spec_unit: "",
+        drug_spec_unit: "",
         remark:"",
         delivery_way: "",
         execution_frequency: "",
@@ -262,7 +262,7 @@ export default {
       this.start_time_str = parseTime(order.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
 
       // this.order.drug_spec = order.drug_spec;
-      // this.order.drug_spec_unit = order.drug_spec_unit;
+      this.order.drug_spec_unit = order.drug_spec_unit;
       this.order.delivery_way =
         order.delivery_way == undefined || order.delivery_way == null
           ? ""
@@ -305,7 +305,8 @@ export default {
           single_dose_unit: this.order.single_dose_unit,
           prescribing_number: this.order.prescribing_number,
           prescribing_number_unit: this.order.prescribing_number_unit,
-          start_time:this.start_time_str
+          start_time:this.start_time_str,
+          drug_spec_unit:this.order.drug_spec_unit,
 
         });
       }
@@ -321,10 +322,10 @@ export default {
     selectDrugSpecUnitAction: function() {
       this.sub_dialog_key = 5;
     },
-    // didSelectDrugSpecUnit: function(index) {
-    //   this.didCloseSingleOptionDialog();
-    //   this.order.drug_spec_unit = this.drug_spec_unit_options[index].name;
-    // },
+    didSelectDrugSpecUnit: function(index) {
+      this.didCloseSingleOptionDialog();
+      this.order.drug_spec_unit = this.drug_spec_unit_options[index].name;
+    },
     selectPrescribingNumUnitAction: function() {
       this.sub_dialog_key = 2;
     },

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

@@ -52,7 +52,7 @@
                 <td
                   style="text-align: left; padding-left: 5px; padding-right: 5px;"
                 >{{ advice.title }}</td>
-                <td>{{ advice.advice_desc }}</td>
+                <td>{{ advice.advice_desc }}{{advice.drug_spec_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>
@@ -69,7 +69,7 @@
                 <td
                   style="text-align: left; padding-right: 5px; padding-left: 25px;"
                 >{{ subdrug.title }}</td>
-                <td>{{ subdrug.advice_desc }}</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 v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
@@ -104,6 +104,7 @@
       @back="show_dialog_key = 0"
       @did-create-new="didAddNewOrder"
       @did-modify="didModifyOrder"
+      :drug_spec_unit_options="drug_spec_unit_options"
       :delivery_way_options="delivery_way_options"
       :execution_frequency_options="execution_frequency_options"
       :single_dose_unit_options="single_dose_unit_options"
@@ -151,12 +152,12 @@ export default {
         return [];
       }
     },
-    // drug_spec_unit_options: {
-    //   type: Array,
-    //   default: function () {
-    //     return [];
-    //   }
-    // },
+    drug_spec_unit_options: {
+      type: Array,
+      default: function () {
+        return [];
+      }
+    },
     delivery_way_options: {
       type: Array,
       default: function() {
@@ -276,7 +277,7 @@ export default {
           advice_name: advice.title,
           advice_desc: advice.advice_desc,
           // drug_spec: String(advice.drug_spec),
-          // drug_spec_unit: advice.drug_spec_unit,
+          drug_spec_unit: advice.drug_spec_unit,
           single_dose: String(advice.single_dose),
           single_dose_unit: advice.single_dose_unit,
           prescribing_number: String(advice.prescribing_number),
@@ -292,7 +293,7 @@ export default {
             advice_name: subdrug.title,
             advice_desc: subdrug.advice_desc,
             // drug_spec: String(subdrug.drug_spec),
-            // drug_spec_unit: subdrug.drug_spec_unit,
+            drug_spec_unit: subdrug.drug_spec_unit,
             single_dose: String(subdrug.single_dose),
             single_dose_unit: subdrug.single_dose_unit,
             prescribing_number: String(subdrug.prescribing_number),
@@ -344,7 +345,7 @@ export default {
             title: adv.advice_name,
             advice_desc: adv.advice_desc,
             // drug_spec: adv.drug_spec,
-            // drug_spec_unit: adv.drug_spec_unit,
+            drug_spec_unit: adv.drug_spec_unit,
             delivery_way: adv.delivery_way,
             execution_frequency: adv.execution_frequency,
             single_dose: adv.single_dose,
@@ -366,7 +367,7 @@ export default {
                 title: resp_adv.advice_name,
                 advice_desc: resp_adv.advice_desc,
                 // drug_spec: resp_adv.drug_spec,
-                // drug_spec_unit: resp_adv.drug_spec_unit,
+                drug_spec_unit: resp_adv.drug_spec_unit,
                 delivery_way: resp_adv.delivery_way,
                 execution_frequency: resp_adv.execution_frequency,
                 single_dose: resp_adv.single_dose,
@@ -446,7 +447,6 @@ export default {
       this.show_dialog_key = 0;
       order.id = 0;
       order.subdrugs = [];
-      console.log(order)
       this.advices.push(order);
     },
     didModifyOrder: function(order) {
@@ -458,7 +458,7 @@ export default {
           advice.title = order.title;
           advice.advice_desc = order.advice_desc;
           // advice.drug_spec = order.drug_spec;
-          // advice.drug_spec_unit = order.drug_spec_unit;
+          advice.drug_spec_unit = order.drug_spec_unit;
           advice.delivery_way = order.delivery_way;
           advice.execution_frequency = order.execution_frequency;
           advice.single_dose = order.single_dose;
@@ -472,7 +472,7 @@ export default {
           subdrug.title = order.title;
           subdrug.advice_desc = order.advice_desc;
           // subdrug.drug_spec = order.drug_spec;
-          // subdrug.drug_spec_unit = order.drug_spec_unit;
+          subdrug.drug_spec_unit = order.drug_spec_unit;
           subdrug.single_dose = order.single_dose;
           subdrug.single_dose_unit = order.single_dose_unit;
           subdrug.prescribing_number = order.prescribing_number;

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

@@ -18,7 +18,9 @@
             </div>
             <div class="cell">
               <label>药品规格</label>
-              <!-- <input type="number" class="inputBox" style="width:62.5%" v-model="order.drug_spec">
+              <input class="inputBox" style="width:100%" v-model="order.advice_desc">
+
+              <!--<input type="number" class="inputBox" style="width:62.5%" v-model="order.drug_spec">-->
               <input
                 type="text"
                 placeholder="单位"
@@ -27,8 +29,7 @@
                 style="width:35%"
                 v-model="order.drug_spec_unit"
                 @focus="selectDrugSpecUnitAction"
-              > -->
-              <input class="inputBox" style="width:100%" v-model="order.advice_desc">
+              >
             </div>
 
             <div class="cell">
@@ -111,7 +112,7 @@
       option_label_key="name"
     ></single-option-dialog>
 
-    <!-- <single-option-dialog
+    <single-option-dialog
       :visibility="sub_dialog_key == 5"
       title="用药规格"
       @did-selected="didSelectDrugSpecUnit"
@@ -119,7 +120,7 @@
       :options="drug_spec_unit_options"
       option_key="id"
       option_label_key="name"
-    ></single-option-dialog> -->
+    ></single-option-dialog>
 
     <single-option-dialog
       :visibility="sub_dialog_key == 2"
@@ -163,12 +164,12 @@ export default {
     SingleOptionDialog
   },
   props: {
-    // drug_spec_unit_options: {
-    //   type: Array,
-    //   default: function() {
-    //     return [];
-    //   }
-    // },
+    drug_spec_unit_options: {
+      type: Array,
+      default: function() {
+        return [];
+      }
+    },
     delivery_way_options: {
       type: Array,
       default: function() {
@@ -204,7 +205,7 @@ export default {
         title: "",
         advice_desc: "",
         // drug_spec: "",
-        // drug_spec_unit: "",
+        drug_spec_unit: "",
         delivery_way: "",
         execution_frequency: "",
         single_dose: "",
@@ -239,7 +240,7 @@ export default {
       this.order.title = "";
       this.order.advice_desc = "";
       // this.order.drug_spec = "";
-      // this.order.drug_spec_unit = "";
+      this.order.drug_spec_unit = "";
       this.order.delivery_way = "";
       this.order.execution_frequency = "";
       this.order.single_dose = "";
@@ -256,7 +257,7 @@ export default {
       this.order.title = order.title;
       this.order.advice_desc = order.advice_desc;
       // this.order.drug_spec = order.drug_spec;
-      // this.order.drug_spec_unit = order.drug_spec_unit;
+      this.order.drug_spec_unit = order.drug_spec_unit;
       this.order.delivery_way = order.delivery_way;
       this.order.execution_frequency = order.execution_frequency;
       this.order.single_dose = order.single_dose;
@@ -284,7 +285,7 @@ export default {
       this.order.remark = "";
 
       // this.order.drug_spec = "";
-      // this.order.drug_spec_unit = "";
+      this.order.drug_spec_unit = "";
       this.order.delivery_way =
         parent_delivery_way == undefined || parent_delivery_way == null
           ? ""
@@ -324,7 +325,9 @@ export default {
           single_dose_unit: this.order.single_dose_unit,
           prescribing_number: this.order.prescribing_number,
           prescribing_number_unit: this.order.prescribing_number_unit,
-          remark: this.order.remark
+          remark: this.order.remark,
+          drug_spec_unit: this.order.drug_spec_unit,
+
         });
       } else if (this.mode == 2) {
         this.$emit("did-modify", {
@@ -332,7 +335,7 @@ export default {
           title: this.order.title,
           advice_desc: this.order.advice_desc,
           // drug_spec: this.order.drug_spec,
-          // drug_spec_unit: this.order.drug_spec_unit,
+          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,
@@ -350,7 +353,7 @@ export default {
           title: this.order.title,
           advice_desc: this.order.advice_desc,
           // drug_spec: this.order.drug_spec,
-          // drug_spec_unit: this.order.drug_spec_unit,
+          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,
@@ -371,10 +374,10 @@ export default {
     selectDrugSpecUnitAction: function() {
       this.sub_dialog_key = 5;
     },
-    // didSelectDrugSpecUnit: function(index) {
-    //   this.didCloseSingleOptionDialog();
-    //   this.order.drug_spec_unit = this.drug_spec_unit_options[index].name;
-    // },
+    didSelectDrugSpecUnit: function(index) {
+      this.didCloseSingleOptionDialog();
+      this.order.drug_spec_unit = this.drug_spec_unit_options[index].name;
+    },
     selectPrescribingNumUnitAction: function() {
       this.sub_dialog_key = 2;
     },

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

@@ -25,14 +25,14 @@
                         <div v-show="isFold(template.id)" class="advice" v-for="(advice, index) in template.DoctorAdviceTemplate" :key="index">
                             <span v-if="advice.parent_id > 0" class="subdrug_info">
                               <span> {{ advice.advice_name }}</span>
-                              <span> {{ advice.advice_desc }} </span>
+                              <span> {{ 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>
                             <van-checkbox v-else class="advice_info" :value="isAdviceSelecting(advice.id)" @click="selectAdviceAction(template, advice)">
                               <span> {{ advice.advice_name }}</span>
-                              <span> {{ advice.advice_desc }} </span>
+                              <span> {{ 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> {{ advice.delivery_way }} </span>
@@ -226,7 +226,7 @@ export default {
 
   .template {
       border-bottom: 1px #e5e5e5 solid;
-      
+
       .template_name {
         height: 1rem;
         line-height: 1rem;
@@ -248,7 +248,7 @@ export default {
             width: 80%;
         }
       }
-      
+
       .advice {
           border-top: 1px #e5e5e5 solid;
           margin-left: 0.38rem;

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

@@ -17,7 +17,8 @@
             v-for="(option, index) in options"
             :key="option_key != null && option_key.length > 0 ? option[option_key] : index"
             :class="select_index == index ? 'tick' : ''"
-          >{{ option_label_key != null && option_label_key.length > 0 ? option[option_label_key] : option }}</li>
+          >{{ option_label_key != null && option_label_key.length > 0 ? option[option_label_key] : option }}
+          </li>
         </ul>
       </div>
     </div>
@@ -25,89 +26,90 @@
 </template>
 
 <script>
-export default {
-  name: "SingleOptionDialogContent",
-  data() {
-    return {
-      select_index: -1
-    };
-  },
-  props: {
-    visibility: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      default: ""
-    },
-    options: {
-      type: Array,
-      required: true
-    },
-    option_key: {
-      // 如果 options 是Object数组，选项唯一标识的 key，可不传
-      type: String,
-      default: ""
+  export default {
+    name: 'SingleOptionDialogContent',
+    data () {
+      return {
+        select_index: -1
+      }
     },
-    option_label_key: {
-      // 如果 options 是Object数组，选项显示文本的object 的 key，否则不传则显示 options 元素
-      type: String,
-      default: ""
-    }
-  },
-  methods: {
-    backAction: function() {
-      this.$emit("back");
+    props: {
+      visibility: {
+        type: Boolean,
+        default: false
+      },
+      title: {
+        type: String,
+        default: ''
+      },
+      options: {
+        type: Array,
+        required: true
+      },
+      option_key: {
+        // 如果 options 是Object数组，选项唯一标识的 key，可不传
+        type: String,
+        default: ''
+      },
+      option_label_key: {
+        // 如果 options 是Object数组，选项显示文本的object 的 key，否则不传则显示 options 元素
+        type: String,
+        default: ''
+      }
     },
-    itemClick: function(index) {
-      this.select_index = index;
-      this.$emit("did-selected", this.select_index);
+    methods: {
+      backAction: function () {
+        this.$emit('back')
+      },
+      itemClick: function (index) {
+        this.select_index = index
+        this.$emit('did-selected', this.select_index)
+      }
     }
   }
-};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-.optionsBox {
+  .optionsBox {
   background: #fff;
-  max-height: 10.6rem;
   min-height: 5rem;
-  overflow-y: scroll;
+  max-height: 10.0rem;
   ul {
-    li {
-      height: 1rem;
-      line-height: 1rem;
-      border-bottom: 1px #e5e5e5 solid;
-      padding: 0 0.38rem;
-    }
-    .tick {
-      position: relative;
-      &::before {
-        content: "";
-        display: inline-block;
-        border: 2px solid $main-color;
-        border-top-width: 0;
-        border-right-width: 0;
-        width: 0.3rem;
-        height: 0.15rem;
-        -webkit-transform: rotate(-50deg);
-        position: absolute;
-        top: 0.38rem;
-        right: 0.44rem;
-      }
-    }
+  overflow-y: scroll;
+  max-height: 9.0rem;
+  li {
+  height: 1rem;
+  line-height: 1rem;
+  border-bottom: 1px #e5e5e5 solid;
+  padding: 0 0.38rem;
+  }
+  .tick {
+  position: relative;
+  &::before {
+  content: "";
+  display: inline-block;
+  border: 2px solid $main-color;
+  border-top-width: 0;
+  border-right-width: 0;
+  width: 0.3rem;
+  height: 0.15rem;
+  -webkit-transform: rotate(-50deg);
+  position: absolute;
+  top: 0.38rem;
+  right: 0.44rem;
+  }
+  }
   }
-}
-.CheckBox {
+  }
+  .CheckBox {
   background: #fff;
   max-height: 6.8rem;
   min-height: 5rem;
   overflow-y: scroll;
   ul {
-    li {
-      line-height: 1rem;
-    }
+  li {
+  line-height: 1rem;
+  }
+  }
   }
-}
 </style>

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

@@ -97,10 +97,11 @@ export default {
 <style style="stylesheet/scss" lang="scss" scoped>
 .optionsBox {
   background: #fff;
-  max-height: 10.6rem;
+  max-height: 10.0rem;
   min-height: 5rem;
-  overflow-y: scroll;
   ul {
+  overflow-y: scroll;
+  max-height: 9.0rem;
     li {
       height: 1.1rem;
       line-height: 1.1rem;

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

@@ -1,44 +1,295 @@
-<!--<template>-->
-  <!--<div class="Dialog">-->
-    <!--<div class="DialogTit">-->
-      <!--<span class="iconfont" @click="closeDialog()">&#xe720; 返回</span>-->
-      <!--<h1 class="name">透析耗材</h1>-->
-      <!--<span class="success">完成</span>-->
-    <!--</div>-->
-
-    <!--<div class="item"  v-for="item in goodTypes" :key="item.id" value="item" @click="itemClick(item.id)">-->
-      <!--<label class="name" for="knj">{{item.type_name}}</label>-->
-      <!--<div class="content">-->
-        <!--<span class="text" id="knjaa"></span>-->
-        <!--<span class="iconfont">&#xe6f9;</span>-->
-      <!--</div>-->
-    <!--</div>-->
-  <!--</div>-->
-
-  <!--<check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm"  v-on:menu-empty="menuEmpty"-->
-                      <!--:propsForm="propForm"></check-box-sub-menu>-->
-
-<!--</template>-->
-
-<!--<script>-->
-  <!--export default {-->
-    <!--name: 'multipleSubMenu',-->
-    <!--props: {-->
-      <!--goodTypes: {-->
-        <!--type: Array,-->
-        <!--default: function () {-->
-          <!--return new Array();-->
-        <!--}-->
-      <!--}-->
-    <!--},methods:{-->
-      <!--itemClick(type_id){-->
-
-      <!--}-->
-
-    <!--}-->
-  <!--}-->
-<!--</script>-->
-
-<!--<style scoped>-->
-
-<!--</style>-->
+<template>
+  <div>
+    <div v-if="visibility" class="Dialog">
+      <div class="DialogTit">
+        <span class="iconfont" @click="closeDialog()">&#xe720; 返回</span>
+        <h1 class="name">透析耗材</h1>
+        <span class="success">完成</span>
+      </div>
+      <div class="DialogContent" id="dialogTop">
+        <div class="item" value="item" @click="itemClick(83,'niprocart')" ref="niprocart">
+          <label class="name">血液透析干粉</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.niprocart)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+        <div class="item" value="item" @click="itemClick(80,'jms')" ref="jms">
+          <label class="name">一次性使用动静脉穿刺针</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.jms)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+        <div class="item" value="item" @click="itemClick(81,'fistula_needle_set')" ref="fistula_needle_set">
+          <label class="name">内瘘管翼状针</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.fistula_needle_set)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+        <div class="item" value="item" @click="itemClick(82,'fistula_needle_set_16')" ref="fistula_needle_set_16">
+          <label class="name">内瘘管翼状针16G</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.fistula_needle_set_16)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+        <div class="item" value="item" @click="itemClick(85,'hemoperfusion')" ref="hemoperfusion">
+          <label class="name">一次性使用血液灌流器</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.hemoperfusion)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+        <div class="item" value="item" @click="itemClick(84,'dialyser_sterilised')" ref="dialyser_sterilised">
+          <label class="name">空心纤维血液透析器</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.dialyser_sterilised)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+        <div class="item" value="item" @click="itemClick(79,'filtryzer')" ref="filtryzer">
+          <label class="name">中空纤维透析器</label>
+          <div class="content">
+            <span class="text" id="knjaa">{{getValue(this.dialysisPrescription.filtryzer)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <new-check-box-sub-menu :show="is_show" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm"
+                            v-on:menu-empty="menuEmpty"
+                            :propsForm="propForm"></new-check-box-sub-menu>
+  </div>
+</template>
+
+<script>
+  import {getWarehouseGoodInfo} from '@/api/stock'
+
+  import NewCheckBoxSubMenu from './newCheckBoxSubMenu'
+
+  export default {
+    name: 'multipleSubMenu',
+    components: {NewCheckBoxSubMenu},
+    data () {
+      return {
+        is_show: false,
+        propForm: {
+          title: '',
+          list: [],
+          optionList: [],
+          isMultiple: 2,
+          result: [], //选中的值
+          type: 1, //用来区分不同子菜单，方便对返回值进行赋值
+          selectId: 0
+        }
+      }
+    },
+
+    props: {
+      dialysisPrescription: {
+        type: Object,
+      },
+      info: {
+        type: Array,
+        default: function () {
+          return new Array()
+        }
+      },
+      visibility: {
+        type: Boolean,
+        default: false
+      }
+    }, methods: {
+      success: function () {
+        this.$emit('menu-comfirm-two', this.dialysisPrescription)
+      }, closeDialog () {
+        this.$emit('menu-cancel-two')
+      },
+      itemClick (type_id, name) {
+        getWarehouseGoodInfo(type_id).then(response => {
+          if (response.data.state == 0) {
+            Toast.fail(response.data.msg)
+            return false
+          } else {
+            switch (name) {
+              case 'niprocart':
+                this.propForm.type = 1
+                this.propForm.title = '血液透析干粉'
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.niprocart
+                this.propForm.click_ref = 'niprocart'
+                this.is_show = true
+                this.visibility = false
+
+                break
+              case 'jms':
+                this.propForm.type = 2
+                this.propForm.title = '一次性使用动静脉穿刺针'
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.jms
+                this.propForm.click_ref = 'jms'
+                this.is_show = true
+                this.visibility = false
+
+                break
+
+              case 'fistula_needle_set':
+                this.propForm.type = 3
+                this.is_show = true
+                this.visibility = false
+                this.propForm.title = '内瘘管翼状针'
+
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.fistula_needle_set
+                this.propForm.click_ref = 'perfusion_apparatus'
+
+                break
+              case 'fistula_needle_set_16':
+                this.propForm.type = 4
+                this.is_show = true
+                this.visibility = false
+                this.propForm.title = '内瘘管翼状针16G'
+
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.fistula_needle_set_16
+                this.propForm.click_ref = 'fistula_needle_set_16'
+
+                break
+
+              case 'hemoperfusion':
+                this.propForm.type = 5
+
+                this.propForm.title = '一次性使用血液灌流器'
+                this.is_show = true
+                this.visibility = false
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.hemoperfusion
+                this.propForm.click_ref = 'hemoperfusion'
+                break
+              case 'dialyser_sterilised':
+                this.propForm.type = 6
+
+                this.propForm.title = '空心纤维血液透析器'
+                this.is_show = true
+                this.visibility = false
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.dialyser_sterilised
+                this.propForm.click_ref = 'dialyser_sterilised'
+                break
+              case 'filtryzer':
+                this.propForm.type = 7
+                this.is_show = true
+                this.visibility = false
+                this.propForm.title = '中空纤维透析器'
+                this.propForm.list = []
+                this.propForm.optionList = []
+                this.propForm.optionList = response.data.data.list
+                this.propForm.isMultiple = 1
+                this.propForm.selectId = this.dialysisPrescription.filtryzer
+                this.propForm.click_ref = 'filtryzer'
+                break
+
+            }
+          }
+        })
+      }, getValue (id) {
+        if (id == 0 || id == '') {
+          return ''
+        }
+        for (let i = 0; i < this.info.length; i++) {
+          if (this.info[i].id == id) {
+            return this.info[i].specification_name
+          }
+        }
+      }, menuCancle: function () {
+        this.is_show = false
+        this.visibility = true
+      }, menuComfirm: function (val) {
+        this.is_show = false
+        this.visibility = true
+        this.$nextTick(() => {
+          if (this.$refs[this.propForm.click_ref] != undefined && this.$refs[this.propForm.click_ref] != null) {
+            this.$refs[this.propForm.click_ref].scrollIntoView()
+          }
+        })
+        switch (val.type) {
+          case 1:
+            if (val.selectId != -2) {
+              this.dialysisPrescription.niprocart = val.selectId
+            }
+            break
+          case 2:
+            if (val.selectId != -2) {
+              this.dialysisPrescription.jms = val.selectId
+            }
+            break
+          case 3:
+            if (val.selectId != -2) {
+              this.dialysisPrescription.fistula_needle_set = val.selectId
+            }
+            break
+          case 4:
+            if (val.selectId != -2) {
+
+              this.dialysisPrescription.fistula_needle_set_16 = val.selectId
+            }
+            break
+          case 5:
+            if (val.selectId != -2) {
+
+              this.dialysisPrescription.hemoperfusion = val.selectId
+            }
+            break
+          case 6:
+            if (val.selectId != -2) {
+              this.dialysisPrescription.dialyser_sterilised = val.selectId
+            }
+            break
+          case 7:
+            if (val.selectId != -2) {
+              this.dialysisPrescription.filtryzer = val.selectId
+            }
+            break
+        }
+      },
+
+    }
+  }
+</script>
+
+<style style="stylesheet/scss" scoped>
+  .DialogContent {
+  // padding-bottom:2rem !important;
+
+  .textarea {
+  width: 100%;
+  height: 2.4rem;
+  line-height: 0.6rem;
+  color: $pgh-color;
+  font-size: 0.28rem;
+  padding-left: 0.36rem;
+  border: none;
+  border-bottom: 1px #e5e5e5 solid;
+  }
+  }
+</style>

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

@@ -0,0 +1,123 @@
+<template>
+  <div v-if="show" class="Dialog">
+    <div class="DialogTit">
+      <div class="back" @click="cancle()"><span class="iconfont" >&#xe720; </span>返回</div>
+      <h1 class="name">{{propsForm.title}}</h1>
+      <span  @click="comfirm" class="success">  </span>
+    </div>
+    <div  class="optionsBox">
+      <div class="list">
+        <ul>
+          <li  @click="itemClick(-2)"  :key="-2" value="-2" >请选择</li>
+          <li  @click="itemClick(item.id)"  v-for="item in propsForm.optionList" :key="item.id" value="item" :class="propsForm.selectId == item.id? 'tick':'' ">{{item.name}}</li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</template>
+
+
+<script>
+
+  export default {
+    name: "newCheckBoxSubMenu",
+    created() {},
+    data() {
+      return {
+        result: [],
+        id: 0,
+        selectName: ""
+      };
+    },
+    props: {
+      propsForm: {
+        type: Object
+      },
+      show: {
+        type: Boolean,
+        default: false
+      }
+    },
+    methods: {
+      cancle: function() {
+        this.$emit("menu-cancle");
+      },
+      comfirm: function() {
+        this.$emit("menu-comfirm", this.getValue());
+      },
+      getValue: function() {
+        let form = {};
+        if (this.propsForm.isMultiple == 2) {
+          form["type"] = this.propsForm.type;
+          form["result"] = this.propsForm.result;
+          // form["click_ref"] = this.propsForm.click_ref
+        } else {
+          form["type"] = this.propsForm.type;
+          form["selectId"] = this.propsForm.selectId;
+          // form["click_ref"] = this.propsForm.click_ref
+        }
+        return form;
+      },
+      itemClick: function(id) {
+        if(id == -2){
+          this.$emit("menu-empty", this.getValue());
+        }
+        this.propsForm.selectId = id;
+        this.$emit("menu-comfirm", this.getValue());
+      }
+    },
+    watch: {
+      visibility(val) {
+        //初始化数据操作
+      }
+    }
+  };
+
+</script>
+
+<style style="stylesheet/scss" lang="scss" scoped>
+  .optionsBox {
+  background: #fff;
+  max-height: 10.6rem;
+  min-height: 5rem;
+  overflow-y: scroll;
+  ul {
+  li {
+  height: 1.1rem;
+  line-height: 1.1rem;
+  border-bottom: 1px #e5e5e5 solid;
+  padding: 0 0.38rem;
+  font-size: 0.36rem;
+  color:$title-color;
+  }
+  .tick {
+  position: relative;
+  &::before {
+  content: "";
+  display: inline-block;
+  border: 2px solid $main-color;
+  border-top-width: 0;
+  border-right-width: 0;
+  width: 0.3rem;
+  height: 0.15rem;
+  -webkit-transform: rotate(-50deg);
+  position: absolute;
+  top: 0.38rem;
+  right: 0.44rem;
+  }
+  }
+  }
+  }
+  .CheckBox {
+  background: #fff;
+  max-height: 6.8rem;
+  min-height: 5rem;
+  overflow-y: scroll;
+
+  ul {
+  li {
+  line-height: 1rem;
+  }
+  }
+  }
+</style>

src/pages/main/dialysis/AdviceTable.vue

@@ -108,7 +108,7 @@
 
             <td v-if="advice_index == 0" :rowspan="group.advices.length">{{ parseTime(advice.start_time, "{m}-{d} {h}:{i}") }}</td>
             <td :class="{ 'advice_name': advice.parent_id == 0, 'subdrug_name': advice.parent_id > 0 }">{{ advice.advice_name }}</td>
-            <td>{{ advice.advice_desc }}</td>
+            <td>{{ advice.advice_desc }}{{advice.drug_spec_unit}}</td>
             <td ><span v-if="advice.prescribing_number">{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span></td>
             <td ><span v-if="advice.single_dose">{{ advice.single_dose }} {{ advice.single_dose_unit }}</span></td>
             <td>{{ advice.parent_id == 0 ? advice.delivery_way : "" }}</td>
@@ -221,7 +221,7 @@
         :single_dose_unit_options="unitsOption"
         :prescribing_number_unit_options="unitsOption"
       ></advice-form>
-      
+
       <modify-advice-form
         ref="modify_advice_form"
         @back="showPopup = false"
@@ -731,8 +731,9 @@ export default {
           parent_id: advice.parent_id,
           title: advice.advice_name,
           advice_desc: advice.advice_desc,
+
           // drug_spec: advice.drug_spec,
-          // drug_spec_unit: advice.drug_spec_unit,
+          drug_spec_unit: advice.drug_spec_unit,
           delivery_way: advice.delivery_way,
           execution_frequency: advice.execution_frequency,
           single_dose: advice.single_dose,
@@ -748,7 +749,7 @@ export default {
         advice_name: advice.title,
         advice_desc: advice.advice_desc,
         // drug_spec: String(advice.drug_spec),
-        // drug_spec_unit: advice.drug_spec_unit,
+        drug_spec_unit: advice.drug_spec_unit,
         delivery_way: advice.delivery_way,
         execution_frequency: advice.execution_frequency,
         single_dose: String(advice.single_dose),
@@ -771,7 +772,7 @@ export default {
           advice.advice_name = resp_advice.advice_name
           advice.advice_desc = resp_advice.advice_desc
           // advice.drug_spec = resp_advice.drug_spec
-          // advice.drug_spec_unit = resp_advice.drug_spec_unit,
+          advice.drug_spec_unit = resp_advice.drug_spec_unit,
           advice.delivery_way = resp_advice.delivery_way,
           advice.execution_frequency = resp_advice.execution_frequency,
           advice.single_dose = resp_advice.single_dose,
@@ -867,7 +868,7 @@ export default {
         advice_name: subdrug.title,
         advice_desc: subdrug.advice_desc,
         // drug_spec: String(subdrug.drug_spec),
-        // drug_spec_unit: subdrug.drug_spec_unit,
+        drug_spec_unit: subdrug.drug_spec_unit,
         single_dose: String(subdrug.single_dose),
         single_dose_unit: subdrug.single_dose_unit,
         prescribing_number: String(subdrug.prescribing_number),
@@ -1282,7 +1283,7 @@ export default {
                     advice_groups.push(group)
                     group = newGroupObject()
                   }
-                    
+
                   initGroupBlock(group, advice)
                   group.advices.push(advice)
                   advice_groups.push(group)
@@ -1386,12 +1387,12 @@ export default {
 
 <style style="stylesheet/scss" lang="scss"  scoped>
 .fixedTop{
-  padding-top:52px; 
+  padding-top:52px;
   background: #fff;
   min-height: calc(100vh - 200px);
 .choice {
   border-bottom: 1px #e5e5e5 solid;
-  
+
   ul {
     @include display-flex;
     @include align-items-center;
@@ -1407,7 +1408,7 @@ export default {
       @include text-align;
       @include justify-content-between;
       padding: 0.3rem 0;
-    
+
       .iconfont {
         margin: 0 0.1rem;
       }
@@ -1531,7 +1532,7 @@ export default {
   }
 }
 .AdviceTable{
-  padding-top:0; 
+  padding-top:0;
   background: #fff;
   min-height: calc(100vh - 230px);
 }

src/pages/main/template/DialysisPrintOrderOne.vue

@@ -898,7 +898,7 @@
               </td>
               <td class="advice-name" v-if="advice[1] != undefined">
                 <span>{{advice[1].advice_name }}</span>
-                <span>{{advice[1].advice_desc}}</span>
+                <span>{{advice[1].advice_desc}}{{advice[1].drug_spec_unit}}</span>
                 <!-- <span v-if="advice[1].drug_spec">{{advice[1].drug_spec}}{{advice[1].drug_spec_unit}}</span> -->
                 <span v-if="advice[1].prescribing_number">* {{advice[1].prescribing_number}}{{advice[1].prescribing_number_unit}}</span>
                 <span
@@ -910,8 +910,7 @@
                   <div>▲</div>
                   <div>
                     <span>{{child.advice_name }}</span>
-                    <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span>{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>

src/pages/main/template/DialysisPrintOrderTwo.vue

@@ -77,7 +77,7 @@
                   <check-box text="昏迷" :checked="receiverTreatmentAccess.consciousness==3?true:false"></check-box>
                 </div>
                 <div class="inline_block"  style="margin-left: 20px;">
-                  出血：
+                  活动性出血：
                   <check-box text="无" :checked="predialysis.is_hemorrhage==2?true:false"></check-box>
                   <check-box text="异常" :checked="predialysis.is_hemorrhage==1?true:false"></check-box>
                   （&nbsp;
@@ -870,7 +870,7 @@
               </td>
               <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                 <span >{{advice.advice_name }}</span>
-                <span>{{advice.advice_desc}}</span>
+                <span>{{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 != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                 <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.delivery_way}}</span>
@@ -971,7 +971,7 @@
                 </td>
                 <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                   <span >{{advice.advice_name }}</span>
-                  <span>{{advice.advice_desc}}</span>
+                  <span>{{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 != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                   <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.delivery_way}}</span>

src/pages/main/today/TodayTab.vue

@@ -107,7 +107,7 @@
 
     <van-popup title="透析处方" v-model="menuList[1].showPopup" :overlay="true" :close-on-click-overlay="false">
       <prescription-dialog :patient_prop="patient" :solution_prop="solution" :machines_prop="devices" :config="config"
-                           :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators" :types="goodTypes"
+                           :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators" :types="goodTypes" :info="goodInfos"
                            @close="closePrescriptionDialog" @prescription="prescriptionFunc" @longSolution="longSolutionFunc" ref="prescription_dialog"></prescription-dialog>
     </van-popup>
 
@@ -289,6 +289,7 @@ export default {
       scrollTop: "",
       goTopShow: false,
       goodTypes:[],
+      goodInfos:[],
     };
   },
   computed: {

src/pages/main/today/statOrder.vue

@@ -23,7 +23,7 @@
             <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>{{advice.advice_desc}}</span>
+              <span>{{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>

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

@@ -32,7 +32,7 @@
                     </td>
                     <td>
                       <span >{{advice.advice_name }}</span>
-                      <span >{{advice.advice_desc}}</span>
+                      <span >{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
                       <span v-if="advice.single_dose">{{advice.single_dose}}{{advice.single_dose_unit}}</span>
                       <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                       <span >{{advice.delivery_way}}</span>

src/pages/waitingRoom/components/dialysisContent.vue

@@ -68,7 +68,7 @@ export default {
           { value: 0, text: "全部分区" }
         ]
       },
-      
+
       selected_date: new Date(),
 
       dialysis_scheduals: [],
@@ -81,7 +81,7 @@ export default {
     filtedScheduals: function() {
       if (this.selected_zone[0].value == 0) {
         return this.dialysis_scheduals
-        
+
       } else {
         var zone_name = this.selected_zone[0].text
         for (let index = 0; index < this.dialysis_scheduals.length; index++) {
@@ -193,6 +193,7 @@ export default {
     @include display-flex;
     @include justify-content-center;
     @include text-align;
+    /*overflow-y:scroll;*/
     width: 60%;
     margin: 0 auto;
     .list {

src/utils/request.js

@@ -35,8 +35,9 @@ service.interceptors.response.use(
   },
   error => {
     console.log('err' + error) // for debug
+
     Toast({
-      message: error.message,
+      message: "网络错误",
       duration: 2 * 1000
     })
     return Promise.reject(error)