添加透析耗材和生命之源配置

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.16"
-}
+  "version": "1.0.20"
+}

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/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

@@ -1,5 +1,7 @@
 <template>
   <div>
+    <div v-loading="loading">
+
     <div class="screening">
       <ul>
         <el-popover
@@ -53,9 +55,18 @@
         <h2 class="title">{{item.zone_name}}</h2>
         <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
       </div>
-      <div class="NoData" v-show="filtedScheduals.length == 0">
+      <div class="NoData" v-if="filtedScheduals.length == 0&&networkStates">
         <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt>
       </div>
+      <div class="NoData" v-if="!networkStates" style="display: block;text-align: center">
+        <p  style="margin-top: 100px;font-size: 18px">网络异常，请点击重新加载</p>
+
+
+        <!--<img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/no_network.jpg" alt="">-->
+        <van-button  slot="button" size="normal" type="info" style="display:block;margin:0 auto"  @click="reloads()">重新加载
+        </van-button>
+      </div>
+
     </div>
     <mt-datetime-picker
       v-model="selected_date"
@@ -67,6 +78,8 @@
       @confirm="handleScheduleDateChange"
     ></mt-datetime-picker>
   </div>
+  </div>
+
 </template>
 
 <script>
@@ -75,6 +88,7 @@ import { Popover } from "vux";
 import { Datetime } from "vux";
 import { parseTime } from "@/utils/index";
 import { getDialysisScheduals } from "@/api/dialysis";
+import {Toast} from 'vant'
 
 export default {
   name: "DialysisArea",
@@ -83,8 +97,12 @@ export default {
     Popover,
     Datetime
   },
+  inject: ['reload'],
   data() {
     return {
+      loading:false,
+
+      networkStates:true,
       timer:null,
       selected_date: this.$store.getters.app.dialysis_area.schedule_date, //new Date(),
       schedual_types: [
@@ -203,6 +221,9 @@ export default {
     this.timer = null;
   },
   methods: {
+    reloads:function(){
+      this.reload()
+    },
     handletimeType: function(index) {
       this.sch_type_options_visible = false;
       this.schedual_type_selected = index;
@@ -237,11 +258,18 @@ export default {
     },
 
     requestDialysisScheduals() {
+      // this.$toast.loading({forbidClick: true, duration: 0})
+      this.loading = true
       var type = 0;
       getDialysisScheduals({ type: type, date: this.selected_date_str })
         .then(rs => {
+          this.networkStates = true
           var resp = rs.data;
           if (resp.state == 1) {
+            this.loading = false
+
+
+
             // console.log(resp.data)
             var scheduals = resp.data.scheduals;
             var zoneMap = {};
@@ -286,12 +314,38 @@ export default {
             }
             this.dialysis_scheduals = dialysis_scheduals;
           } else {
+            this.loading = false
+
+
             this.$toast({
               message: resp.msg
             });
           }
         })
-        .catch(v => {});
+        .catch(error => {
+          this.loading = false
+
+
+
+          //超时之后在这里捕抓错误信息.
+          if (error.response) {
+            this.networkStates = false
+
+
+            console.log('error.response')
+            console.log(error.response);
+          } else if (error.request) {
+            this.networkStates = false
+
+            // if(error.request.readyState == 4 && error.request.status == 0){
+            //   //我在这里重新请求
+            //   this.networkStates = false
+            // }
+          } else {
+
+            this.networkStates = false
+          }
+        });
     },
     openPicker() {
       this.$refs.picker.open();
@@ -341,6 +395,18 @@ export default {
   }
 }
 
+  .shadow{
+  width:100%;
+  height:100%;
+  position:absolute;
+  left:0;
+  top:0;
+  z-index:998;
+  background-color:#000;
+  opacity:0.6;
+  display:none;
+  }
+
 </style>
 
 <style>

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/WaitingArea.vue

@@ -1,8 +1,10 @@
 <template>
   <div>
+    <div v-loading="loading">
+
     <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>
@@ -48,11 +50,20 @@
         <h2 class="title">{{item.zone_name}}</h2>
         <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
       </div>
-      <div class="NoData" v-show="filtedScheduals.length == 0"><img style="margin-top: 50px; margin-bottom: 50px"
+      <div class="NoData" v-if="filtedScheduals.length == 0&&networkStates"><img style="margin-top: 50px; margin-bottom: 50px"
                                                                     src="@/assets/login/data.jpg" alt=""></div>
 
+      <div class="NoData" v-if="!networkStates" style="display: block;text-align: center;">
+        <!--<img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/no_network.jpg" alt="">-->
+        <p  style="margin-top: 100px;font-size: 18px">网络异常，请点击重新加载</p>
+        <van-button  slot="button" size="normal" type="info" style="display:block;margin:0 auto"  @click="reloads()">重新加载
+        </van-button>
+      </div>
+
     </div>
   </div>
+  </div>
+
 </template>
 
 <script>
@@ -60,6 +71,8 @@
   import {getWaitingScheduals} from '@/api/dialysis'
   import {parseTime} from '@/utils'
   import {Popover} from 'vux'
+  import {Toast} from 'vant'
+
   import {
     getSelectedAreaDataConfigList,
     getSelectedTimesDataConfigList,
@@ -75,8 +88,10 @@
       PatientBox,
       Popover
     },
+    inject: ['reload'],
     data () {
       return {
+        loading:false,
         menuList: [
           {value: '1', label: '全部', count: 0},
           {value: '3', label: '待开处方', count: 0},
@@ -86,7 +101,7 @@
         select_index: 0,
         zone_selected: 0,
         time_selected: 0,
-
+        networkStates:true,
         scheduals: [],
 
         zone_options: [{value: 0, text: '全部分区'}],
@@ -251,16 +266,13 @@
       }
       if(type != null){
         this.select_index = parseInt(type)
-
       }
-
       this.requestScheduals()
     },
     mounted () {
       this.timer = window.setInterval(() => {
         setTimeout(this.requestScheduals(), 0)
       }, 30000)
-
     },
     beforeDestroy () {
       clearInterval(this.timer)
@@ -270,6 +282,10 @@
       // })
     },
     methods: {
+      reloads:function(){
+        this.reload()
+
+      },
       handleAllChange: function (tabIndex) {
         this.select_index = tabIndex
         this.zone_selected = 0
@@ -283,8 +299,6 @@
         setSelectedAreaDataConfigList(this.zone_selected)
         setSelectedTimesDataConfigList(this.time_selected)
         setWaitTypeSelectedConfig(tabIndex)
-
-
       },
       handleZoneChange: function (index) {
         this.zone_options_visible = false
@@ -299,12 +313,13 @@
       },
 
       requestScheduals () {
-
+        this.loading = true
         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) {
+            this.loading = false
+
             var scheduals = resp.data.scheduals
             var totalCount = scheduals.length
             var prescription_count = 0
@@ -325,11 +340,29 @@
             this.zone_options = this.makeZones(scheduals)
             this.zone_scheduals = this.processScheduals(scheduals)
           } else {
+            this.loading = false
+
             this.$toast({
               message: resp.msg
             })
           }
-        })
+        }).catch(error => {
+          this.loading = false
+
+          //超时之后在这里捕抓错误信息.
+          if (error.response) {
+            this.networkStates = false
+
+          } else if (error.request) {
+            this.networkStates = false
+            // if(error.request.readyState == 4 && error.request.status == 0){
+            //   //我在这里重新请求
+            //   this.networkStates = false
+            // }
+          } else {
+            this.networkStates = false
+          }
+        });
       },
       makeZones: function (scheduals) {
         var zoneMap = {}
@@ -446,5 +479,16 @@
   display: inline-block;
   }
   }
+  .shadow{
+  width:100%;
+  height:100%;
+  position:absolute;
+  left:0;
+  top:0;
+  z-index:998;
+  background-color:#000;
+  opacity:0.6;
+  display:none;
+  }
 </style>
 

src/pages/main/dialog/AcceptsDialog.vue

@@ -65,12 +65,12 @@
 
           </el-form-item>
 
-          <el-form-item label="跌倒风险预防措施: " v-if="isShow('跌倒风险预防措施')">
-            <el-radio v-model="receiveTreatmentAsses.precaution" label="1">镇定剂</el-radio>
-            <el-radio v-model="receiveTreatmentAsses.precaution" label="2">约束带</el-radio>
-            <el-radio v-model="receiveTreatmentAsses.precaution" label="3">床栏</el-radio>
-            <el-radio v-model="receiveTreatmentAsses.precaution" label="4">加强宣教</el-radio>
-          </el-form-item>
+          <el-form-item label-width="155px" label="跌倒风险预防措施: " v-if="isShow('跌倒风险预防措施')">
+          <el-radio v-model="receiveTreatmentAsses.precaution" label="1">镇定剂</el-radio>
+          <el-radio v-model="receiveTreatmentAsses.precaution" label="2">约束带</el-radio>
+          <el-radio v-model="receiveTreatmentAsses.precaution" label="3">床栏</el-radio>
+          <el-radio v-model="receiveTreatmentAsses.precaution" label="4">加强宣教</el-radio>
+        </el-form-item>
           <el-form-item label-width="100dp" label="其他跌倒风险预防措施 : "
                         v-if="isShow('其他跌倒风险预防措施')">
             <el-input v-model="receiveTreatmentAsses.precaution_other"></el-input>

src/pages/main/dialog/AssessmentDialog.vue

@@ -270,7 +270,7 @@
         <div class="item" ref="skin_other" v-if="isShow('其他感染情况')">
           <h2 class="name">其他感染情况</h2>
           <div class="content">
-            <input @focus="inputFocus" v-model="formValue.skin_other"/>
+            <input @focus="inputFocus" v-model="formValue.infect_other"/>
           </div>
         </div>
 

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"
@@ -337,7 +341,6 @@
         if (advices.length == 0) {
           return
         }
-
         for (let i = 0; i < advices.length; i++) {
           advices[i]['is_selected'] = 0
         }
@@ -368,6 +371,8 @@
           this.advice_groups.splice(insertIndex, 0, new_group)
         }
         this.index = 0
+        this.advice_groups.sort((a, b) => a.start_time - b.start_time)
+
       },
       didModifyAdvice: function (advice) {
         Toast.loading({forbidClick: true, duration: 0})
@@ -377,7 +382,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 +403,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),
@@ -435,6 +440,9 @@
                   advices.is_selected = 0
                 }
               }
+              console.log(this.advice_groups)
+
+              this.advice_groups.sort((a, b) => a.advices[0].start_time - b.advices[0].start_time)
 
               this.$refs.modify_advice_form.dismiss()
               Toast.clear()
@@ -487,7 +495,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 +1140,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 +1168,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 +1188,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

@@ -165,7 +165,7 @@
             <input type="tel" @focus="inputFocus" id="dtl" v-model="dialysisPrescription.conductivity"/>
           </div>
         </div>
-        <div class="item" v-if="isShow('透析器/灌流器')">
+        <div class="item" v-if="isShow('透析器/灌流器')&&config.is_open != 1">
           <label class="name" for="dtl">透析器/灌流器</label>
           <div class="content">
 
@@ -248,8 +248,7 @@
         <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="text" id="knjaa"></span>
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
@@ -305,6 +304,9 @@
 
 
 
+
+
+
   </div>
 </template>
 
@@ -965,7 +967,6 @@
       }
     },
     created() {
-
       if (this.$store.getters.user.user.user_type == 2) {
         this.isShowSign = true;
 

src/pages/main/dialog/ThorougDialog.vue

@@ -998,6 +998,10 @@
             }else if(val.selectId == 2){
               this.formValue.puncture_point_oozing_blood = val.selectId
               this.puncture_point_oozing_blood_state = false
+            }else{
+
+              this.formValue.puncture_point_oozing_blood =0
+
             }
 
             break;
@@ -1008,6 +1012,8 @@
             }else if(val.selectId == 2){
               this.formValue.puncture_point_haematoma = val.selectId
               this.puncture_point_haematoma_state = false
+            }else{
+              this.formValue.puncture_point_haematoma = 0
             }
             break;
           case 22:
@@ -1017,6 +1023,8 @@
             }else if(val.selectId == 2){
               this.formValue.is_eat = val.selectId
               this.eat_state = false
+            }else{
+              this.formValue.is_eat = 0
             }
             break;
         }

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

@@ -22,8 +22,8 @@
             </div>
             <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 class="inputBox" style="width:62.5%" v-model="order.advice_desc">
+              <!--<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,15 +114,15 @@
       option_label_key="name"
     ></single-option-dialog>
 
-    <!-- <single-option-dialog
+    <single-option-dialog
       :visibility="sub_dialog_key == 5"
-      title="用药规格"
+      title="药品规格"
       @did-selected="didSelectDrugSpecUnit"
       @back="didCloseSingleOptionDialog"
       :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
           ? ""
@@ -271,7 +271,7 @@ export default {
         order.execution_frequency == undefined ||
         order.execution_frequency == null
           ? ""
-          : order.execution_frequency;
+          :                                                                                                                                                                order.execution_frequency;
       this.order.single_dose = order.single_dose;
       this.order.single_dose_unit = order.single_dose_unit;
       this.order.prescribing_number = order.prescribing_number;
@@ -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,
 
         });
       }
@@ -315,24 +316,40 @@ export default {
       this.sub_dialog_key = 1;
     },
     didSelectSingleDoseUnit: function(index) {
+      if (index == -1){
+        this.order.single_dose_unit = '';
+      }else{
+        this.order.single_dose_unit = this.single_dose_unit_options[index].name;
+
+      }
+
       this.didCloseSingleOptionDialog();
-      this.order.single_dose_unit = this.single_dose_unit_options[index].name;
     },
     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) {
+
+      if (index == -1){
+        this.order.drug_spec_unit = '';
+      }else{
+        this.order.drug_spec_unit = this.drug_spec_unit_options[index].name;
+      }
+
+      this.didCloseSingleOptionDialog();
+    },
     selectPrescribingNumUnitAction: function() {
       this.sub_dialog_key = 2;
     },
     didSelectPrescribingNumUnit: function(index) {
+      if (index == -1){
+        this.order.prescribing_number_unit = '';
+      }else{
+        this.order.prescribing_number_unit = this.prescribing_number_unit_options[index].name;
+      }
+
       this.didCloseSingleOptionDialog();
-      this.order.prescribing_number_unit = this.prescribing_number_unit_options[
-        index
-      ].name;
+
     },
     selectDeliveryWayAction: function() {
       this.sub_dialog_key = 3;

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:62.5%" 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,15 +112,15 @@
       option_label_key="name"
     ></single-option-dialog>
 
-    <!-- <single-option-dialog
+    <single-option-dialog
       :visibility="sub_dialog_key == 5"
-      title="用药规格"
+      title="药品规格"
       @did-selected="didSelectDrugSpecUnit"
       @back="didCloseSingleOptionDialog"
       :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,
@@ -366,23 +369,40 @@ export default {
     },
     didSelectSingleDoseUnit: function(index) {
       this.didCloseSingleOptionDialog();
-      this.order.single_dose_unit = this.single_dose_unit_options[index].name;
+      if(index == -1){
+        this.order.single_dose_unit = '';
+
+      }else{
+        this.order.single_dose_unit = this.single_dose_unit_options[index].name;
+      }
+
     },
     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) {
+      if(index == -1){
+        this.order.drug_spec_unit = '';
+
+      }else{
+        this.order.drug_spec_unit = this.drug_spec_unit_options[index].name;
+      }
+
+      this.didCloseSingleOptionDialog();
+    },
     selectPrescribingNumUnitAction: function() {
       this.sub_dialog_key = 2;
     },
     didSelectPrescribingNumUnit: function(index) {
       this.didCloseSingleOptionDialog();
-      this.order.prescribing_number_unit = this.prescribing_number_unit_options[
-        index
-      ].name;
+
+      if(index == -1){
+        this.order.prescribing_number_unit = '';
+
+      }else{
+        this.order.prescribing_number_unit = this.prescribing_number_unit_options[index].name;
+      }
+
     },
     selectDeliveryWayAction: function() {
       this.sub_dialog_key = 3;

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

@@ -71,7 +71,6 @@ export default {
 <style style="stylesheet/scss" lang="scss" scoped>
 .optionsBox {
   background: #fff;
-  max-height: 10.6rem;
   min-height: 5rem;
   ul {
   overflow-y: scroll;

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

@@ -97,9 +97,8 @@ 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;

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

@@ -250,38 +250,54 @@
           case 1:
             if (val.selectId != -2) {
               this.dialysisPrescription.niprocart = val.selectId
+            }else{
+              this.dialysisPrescription.niprocart = 0
+
             }
             break
           case 2:
             if (val.selectId != -2) {
               this.dialysisPrescription.jms = val.selectId
+            }else{
+              this.dialysisPrescription.jms = 0
             }
             break
           case 3:
             if (val.selectId != -2) {
               this.dialysisPrescription.fistula_needle_set = val.selectId
+            }else{
+              this.dialysisPrescription.fistula_needle_set = 0
+
             }
             break
           case 4:
             if (val.selectId != -2) {
 
               this.dialysisPrescription.fistula_needle_set_16 = val.selectId
+            }else{
+              this.dialysisPrescription.fistula_needle_set_16 = 0
+
             }
             break
           case 5:
             if (val.selectId != -2) {
-
               this.dialysisPrescription.hemoperfusion = val.selectId
+            }else{
+              this.dialysisPrescription.hemoperfusion = 0
             }
             break
           case 6:
             if (val.selectId != -2) {
               this.dialysisPrescription.dialyser_sterilised = val.selectId
+            }else{
+              this.dialysisPrescription.dialyser_sterilised = 0
             }
             break
           case 7:
             if (val.selectId != -2) {
               this.dialysisPrescription.filtryzer = val.selectId
+            }else{
+              this.dialysisPrescription.filtryzer = 0
             }
             break
         }

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

@@ -832,7 +832,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
@@ -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

@@ -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/acceptsAssessment.vue

@@ -42,7 +42,7 @@
 
         <li style="height: 0.6rem;" v-if="isShow('跌倒风险预防措施')">
           <label>跌倒风险预防措施:</label>
-          <span class="content">{{posture}}</span>
+          <span class="content">{{precautions}}</span>
         </li>
 
         <li style="height: 0.6rem;" v-if="isShow('其他跌倒风险预防措施')">
@@ -82,10 +82,7 @@
           <label>其他心理评估:</label>
           <span class="content">{{this.record.psychological_other}}</span>
         </li>
-        <li style="height: 0.6rem;" v-if="isShow('其他病情')">
-          <label>其他病情 </label>
-          <span class="content">{{this.record.sick_condition_other}} </span>
-        </li>
+
       </ul>
 
 
@@ -209,7 +206,7 @@ export default {
       } else {
         return this.danger_level[this.record.danger_level] == undefined ? "" : this.danger_level[this.record.danger_level] + ""
       }
-    },precaution: function() {
+    },precautions: function() {
       if (this.record == null || this.record.id == "") {
         return ""
       } else {

src/pages/main/today/assessmentBefore.vue

@@ -150,7 +150,7 @@
 
         <li style="height: 0.6rem;" v-if="isShow('感染')">
           <label>感染:</label>
-          <span class="content">{{ is_infect ? '有' : '无' }}</span>
+          <span class="content">{{this.record.is_infect == 1 ? '有' : '无' }}</span>
           <span class="unit"> </span>
         </li>
 
@@ -164,7 +164,7 @@
 
         <li style="height: 0.6rem;" v-if="isShow('外露')">
           <label>外露:</label>
-          <span class="content">{{exposed?exposed:''}}</span>
+          <span class="content">{{this.record.exposed?exposed:''}}</span>
           <span class="unit">cm</span>
         </li>
 

src/pages/main/today/dialysisMonitoring.vue

@@ -6,9 +6,9 @@
         <tr>
           <th v-if="isShow('监测时间')" width="124px">时间</th>
           <th v-if="isShow('体温')" width="80px">体温(℃)</th>
+          <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
           <th v-if="isShow('脉搏')" width="80px">脉率(次/分)</th>
           <th v-if="isShow('呼吸频率')" width="110px">呼吸频率(次/分)</th>
-          <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
           <th width="76px">静脉压/动脉压(mmHg)</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmHg)</th>

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/store/index.js

@@ -47,6 +47,8 @@ const getters = {
   venous_catheterization_part: state => state.global_config.venous_catheterization_part,
   ductus_arantii: state => state.global_config.ductus_arantii,
   emergency_treatment: state => state.global_config.emergency_treatment,
+  skin: state => state.global_config.skin,
+
 
 
   dialysis_process: state => state.global_config.dialysis_process,

src/utils/request.js

@@ -6,6 +6,7 @@ const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
   timeout: 30000, // request timeout
   withCredentials: true
+
 })
 
 // respone interceptor
@@ -34,11 +35,7 @@ service.interceptors.response.use(
     }
   },
   error => {
-    console.log('err' + error) // for debug
-    Toast({
-      message: error.message,
-      duration: 2 * 1000
-    })
+
     return Promise.reject(error)
   })