瀏覽代碼

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

see999 3 年之前
父節點
當前提交
63e2953800

+ 3 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue 查看文件

322
                   <div class="inline_block" style="flex:1;">
322
                   <div class="inline_block" style="flex:1;">
323
                     透析(滤)器:
323
                     透析(滤)器:
324
                     <div class="under_line" style="width: 100px;text-align: center">
324
                     <div class="under_line" style="width: 100px;text-align: center">
325
-                      {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }}
325
+                      <!-- {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }} -->
326
+
327
+                      {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "/" }}
326
                     </div>
328
                     </div>
327
                   </div>
329
                   </div>
328
                   <div class="inline_block" style="flex:1;">
330
                   <div class="inline_block" style="flex:1;">

+ 1 - 1
src/xt_pages/qcd/basicInformationAnalysis.vue 查看文件

710
       //本月的结束时间
710
       //本月的结束时间
711
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
711
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
712
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
712
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
713
-        console.log("本月最后一天",timeEnd)
713
+        // console.log("本月最后一天",timeEnd)
714
       //本月
714
       //本月
715
       if(state == 0){
715
       if(state == 0){
716
        //统计透析总量
716
        //统计透析总量