浏览代码

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

XMLWAN 3 年前
父节点
当前提交
e043bf9657

+ 3 - 0
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue 查看文件

1837
         // 入口
1837
         // 入口
1838
         var pre = pre
1838
         var pre = pre
1839
         this.dialysisPrescription.mode_id = this.$route.query.mode_id ? this.$route.query.mode_id : this.mode_id
1839
         this.dialysisPrescription.mode_id = this.$route.query.mode_id ? this.$route.query.mode_id : this.mode_id
1840
+        if(pre.id > 0){
1841
+          this.dialysisPrescription.mode_id = pre.mode_id
1842
+        }
1840
         console.log('this.dialysisPrescription.mode_id',this.dialysisPrescription.mode_id)
1843
         console.log('this.dialysisPrescription.mode_id',this.dialysisPrescription.mode_id)
1841
         if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || this.schedual.mode_id == 2 || this.schedual.mode_id == 5 || this.schedual.mode_id == 12) {
1844
         if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || this.schedual.mode_id == 2 || this.schedual.mode_id == 5 || this.schedual.mode_id == 12) {
1842
           this.zhiShow = true
1845
           this.zhiShow = true

+ 1 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue 查看文件

112
           <div class="widthLength25">实际进食量:{{ afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '' }} g</div>
112
           <div class="widthLength25">实际进食量:{{ afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '' }} g</div>
113
           <div class="widthLength25">透后体重:{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }} Kg</div>
113
           <div class="widthLength25">透后体重:{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }} Kg</div>
114
           <div class="widthLength25">脉搏:{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }} 次/分</div>
114
           <div class="widthLength25">脉搏:{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }} 次/分</div>
115
+          <div class="widthLength25"></div>
115
       </div>
116
       </div>
116
       <div class="lineHeight">治疗方案:</div>
117
       <div class="lineHeight">治疗方案:</div>
117
       <div class="lineHeight">
118
       <div class="lineHeight">