Merge branch 'update' of http://git.shengws.com/zhangbj/xt_pad into update

src/pages/main/dialog/LongDialog.vue

@@ -231,9 +231,9 @@
 </template>
 
 <script>
-import LongDialogMenu from './subMenu/LongDialogMenu';
-import { createPatientDialysisSolution } from '@/api/patient';
-import { Toast } from 'vant';
+import LongDialogMenu from './subMenu/LongDialogMenu'
+import { createPatientDialysisSolution } from '@/api/patient'
+import { Toast } from 'vant'
 
 export default {
   name: 'LongDialog',
@@ -393,7 +393,7 @@ export default {
       for (let index = 0; index < this.dialyserList.length; index++) {
         if (machine == this.dialyserList[index].id) {
           this.dialysisSolution.hemodialysis_machine_name = this.dialyserList[index].name
-          break;
+          break
         }
       }
     },
@@ -405,7 +405,7 @@ export default {
       for (let index = 0; index < this.perfusion_apparatus.length; index++) {
         if (apparatus == this.perfusion_apparatus[index].id) {
           this.dialysisSolution.perfusion_apparatus_name = this.perfusion_apparatus[index].name
-          break;
+          break
         }
       }
     },
@@ -417,7 +417,7 @@ export default {
       for (let index = 0; index < this.replacementWays.length; index++) {
         if (way == this.replacementWays[index].id) {
           this.dialysisSolution.replacement_way_name = this.replacementWays[index].name
-          break;
+          break
         }
       }
     }

src/pages/main/dialog/OrdersDialog.vue

@@ -78,8 +78,8 @@
                 >
                   <div class="txt">
                     <span>{{advice.advice_name }}</span>
-                    <span v-if="advice.advice_desc">{{ advice.advice_desc }}{{advice.drug_spec_unit}}</span>
-                    <span v-if="advice.prescribing_number && template_id != 6">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                    <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
+                    <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}})</span>
                     <span v-if="advice.single_dose && template_id != 6" >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
                     <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
                     <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>

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

@@ -91,7 +91,7 @@
 
 <script>
 export default {
-  name: "SelectAdviceTemplate",
+  name: 'SelectAdviceTemplate',
   props: {
     visibility: {
       type: Boolean,
@@ -100,166 +100,166 @@ export default {
     templates: {
       type: Array,
       default: () => {
-        return [];
+        return []
       }
     }
   },
-  data() {
+  data () {
     return {
       fold_template_ids: [],
       selecting_advice_ids: []
-    };
+    }
   },
   methods: {
-    backAction: function() {
-      this.$emit("back");
+    backAction: function () {
+      this.$emit('back')
     },
-    foldTemplateAction: function(template_id) {
+    foldTemplateAction: function (template_id) {
       for (let index = 0; index < this.fold_template_ids.length; index++) {
         if (this.fold_template_ids[index] == template_id) {
-          this.fold_template_ids.splice(index, 1);
-          return;
+          this.fold_template_ids.splice(index, 1)
+          return
         }
       }
-      this.fold_template_ids.push(template_id);
+      this.fold_template_ids.push(template_id)
     },
-    selectAdviceAction: function(template, advice) {
-      var isCancelSelect = false;
+    selectAdviceAction: function (template, advice) {
+      var isCancelSelect = false
       for (let index = 0; index < this.selecting_advice_ids.length; index++) {
         if (this.selecting_advice_ids[index].advice_id == advice.id) {
-          this.selecting_advice_ids.splice(index, 1);
-          isCancelSelect = true;
-          break;
+          this.selecting_advice_ids.splice(index, 1)
+          isCancelSelect = true
+          break
         }
       }
       if (!isCancelSelect) {
         this.selecting_advice_ids.push({
           template_id: template.id,
           advice_id: advice.id
-        });
+        })
       }
     },
-    selectTemplateAllAdviceAction: function(template) {
+    selectTemplateAllAdviceAction: function (template) {
       for (
         let index = 0;
         index < template.DoctorAdviceTemplate.length;
         index++
       ) {
-        const advice = template.DoctorAdviceTemplate[index];
+        const advice = template.DoctorAdviceTemplate[index]
         if (advice.parent_id > 0) {
-          continue;
+          continue
         }
-        var didSelect = false;
+        var didSelect = false
         for (
           let s_a_index = 0;
           s_a_index < this.selecting_advice_ids.length;
           s_a_index++
         ) {
           if (this.selecting_advice_ids[s_a_index].advice_id == advice.id) {
-            didSelect = true;
-            break;
+            didSelect = true
+            break
           }
         }
         if (!didSelect) {
           this.selecting_advice_ids.push({
             template_id: template.id,
             advice_id: advice.id
-          });
+          })
         }
       }
     },
-    cancelSelectTemplateAllAdviceAction: function(template) {
+    cancelSelectTemplateAllAdviceAction: function (template) {
       for (
         let index = this.selecting_advice_ids.length - 1;
         index >= 0;
         index--
       ) {
         if (this.selecting_advice_ids[index].template_id == template.id) {
-          this.selecting_advice_ids.splice(index, 1);
+          this.selecting_advice_ids.splice(index, 1)
         }
       }
     },
-    submitAction: function() {
-      var advices = [];
+    submitAction: function () {
+      var advices = []
       // WAIN: 效率低，可以通过在 selecting_advice_ids 加上 template_index 和 advice_index 字段来消除 this.templates 的循环
       for (let t_a_i = 0; t_a_i < this.selecting_advice_ids.length; t_a_i++) {
-        const tpl_advice = this.selecting_advice_ids[t_a_i];
+        const tpl_advice = this.selecting_advice_ids[t_a_i]
         for (let t_i = 0; t_i < this.templates.length; t_i++) {
-          const tpl = this.templates[t_i];
+          const tpl = this.templates[t_i]
           if (tpl.id == tpl_advice.template_id) {
-            var child_begin = false;
+            var child_begin = false
             for (let a_i = 0; a_i < tpl.DoctorAdviceTemplate.length; a_i++) {
-              const adv = tpl.DoctorAdviceTemplate[a_i];
+              const adv = tpl.DoctorAdviceTemplate[a_i]
               if (adv.id == tpl_advice.advice_id) {
-                advices.push(adv);
-                child_begin = true;
+                advices.push(adv)
+                child_begin = true
               } else if (child_begin == true) {
                 if (adv.parent_id == tpl_advice.advice_id) {
-                  advices.push(adv);
+                  advices.push(adv)
                 } else {
-                  break;
+                  break
                 }
               }
             }
           }
         }
       }
-      this.$emit("finish", advices);
+      this.$emit('finish', advices)
 
       this.$nextTick(() => {
-        this.fold_template_ids = [];
-        this.selecting_advice_ids = [];
-      });
+        this.fold_template_ids = []
+        this.selecting_advice_ids = []
+      })
     },
 
-    isFold: function(template_id) {
+    isFold: function (template_id) {
       for (let index = 0; index < this.fold_template_ids.length; index++) {
         if (this.fold_template_ids[index] == template_id) {
-          return true;
+          return true
         }
       }
-      return false;
+      return false
     },
-    isAdviceSelecting: function(advice_id) {
+    isAdviceSelecting: function (advice_id) {
       for (let index = 0; index < this.selecting_advice_ids.length; index++) {
         if (this.selecting_advice_ids[index].advice_id == advice_id) {
-          return true;
+          return true
         }
       }
-      return false;
+      return false
     },
-    isTemplateSelectingAllAdvices: function(template) {
-      var count = 0;
+    isTemplateSelectingAllAdvices: function (template) {
+      var count = 0
       for (let t_a_i = 0; t_a_i < this.selecting_advice_ids.length; t_a_i++) {
         if (this.selecting_advice_ids[t_a_i].template_id == template.id) {
-          count++;
+          count++
         }
       }
 
-      var p_advice_count = 0;
+      var p_advice_count = 0
       for (
         let index = 0;
         index < template.DoctorAdviceTemplate.length;
         index++
       ) {
         if (template.DoctorAdviceTemplate[index].parent_id == 0) {
-          p_advice_count++;
+          p_advice_count++
         }
       }
       if (count < p_advice_count) {
-        return false;
+        return false
       } else {
-        return true;
+        return true
       }
     }
   }
-};
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
 .optionsBox {
   background: #fff;
-  max-height: 10.6rem;
+  max-height: 9.6rem;
   min-height: 5rem;
   overflow-y: scroll;
   @media only screen and (max-width: 812px) {

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

@@ -27,7 +27,7 @@
         <div class="item">
           <label class="name" for="txms">干体重（kg）</label>
           <div class="content">
-            <span class="text" id="txms">{{predialysis.dry_weight}}</span>
+            <span class="text" id="txms">{{last_predialysis.dry_weight}}</span>
             
           </div>
         </div>
@@ -41,7 +41,7 @@
         <div class="item">
           <label class="name" for="txms">体重增加（kg）</label>
           <div class="content">
-            <span class="text" id="txms">{{predialysis.weight_before - predialysis.weight_after_last_transparency}}</span>
+            <span class="text" id="txms">{{add_weight}}</span>
             
           </div>
         </div>
@@ -76,12 +76,16 @@
   export default {
     name: 'LongAdviceSubMenu',
     created () {
+      if (predialysis.weight_before > 0 && predialysis.weight_after_last_transparency > 0) {
+        add_weight = parseFloat(predialysis.weight_before - predialysis.weight_after_last_transparency).toFixed(2)
+      }
     },
     data () {
       return {
         result: [],
         id: 0,
-        selectName: ''
+        selectName: '',
+        add_weight:0
       }
     },
     props: {

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

@@ -28,14 +28,14 @@
 
 <script>
 export default {
-  name: "newCheckBoxSubMenu",
-  created() {},
-  data() {
+  name: 'newCheckBoxSubMenu',
+  created () {},
+  data () {
     return {
       result: [],
       id: 0,
-      selectName: ""
-    };
+      selectName: ''
+    }
   },
   props: {
     propsForm: {
@@ -47,45 +47,45 @@ export default {
     }
   },
   methods: {
-    cancle: function() {
-      this.$emit("menu-cancle");
+    cancle: function () {
+      this.$emit('menu-cancle')
     },
-    comfirm: function() {
-      this.$emit("menu-comfirm", this.getValue());
+    comfirm: function () {
+      this.$emit('menu-comfirm', this.getValue())
     },
-    getValue: function() {
-      let form = {};
+    getValue: function () {
+      let form = {}
       if (this.propsForm.isMultiple == 2) {
-        form["type"] = this.propsForm.type;
-        form["result"] = this.propsForm.result;
+        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['type'] = this.propsForm.type
+        form['selectId'] = this.propsForm.selectId
         // form["click_ref"] = this.propsForm.click_ref
       }
-      return form;
+      return form
     },
-    itemClick: function(id) {
+    itemClick: function (id) {
       if (id == -2) {
-        this.$emit("menu-empty", this.getValue());
+        this.$emit('menu-empty', this.getValue())
       }
-      this.propsForm.selectId = id;
-      this.$emit("menu-comfirm", this.getValue());
+      this.propsForm.selectId = id
+      this.$emit('menu-comfirm', this.getValue())
     }
   },
   watch: {
-    visibility(val) {
-      //初始化数据操作
+    visibility (val) {
+      // 初始化数据操作
     }
   }
-};
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
 .optionsBox {
   background: #fff;
-  max-height: 10.6rem;
+  max-height: 9.6rem;
   min-height: 5rem;
   overflow-y: scroll;
   @media only screen and (max-width: 812px) {

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -322,7 +322,10 @@
                   </div>
                   <div class="inline_block" style="margin-left:20px;">
                   维持：
-                    <div class="under_line" style="width: 50px;text-align: center;">
+                    <div v-if="prescription.anticoagulant == 1" class="under_line" style="width: 50px;text-align: center;">
+                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:'/'}}
+                    </div>
+                    <div v-if="prescription.anticoagulant != 1" class="under_line" style="width: 50px;text-align: center;">
                       {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:0}}
                     </div>
                     lu