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

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -322,7 +322,9 @@
                   <div class="inline_block" style="flex:1;">
                     透析(滤)器：
                     <div class="under_line" style="width: 100px;text-align: center">
-                      {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }}
+                      <!-- {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }} -->
+
+                      {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "/" }}
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">

src/xt_pages/qcd/basicInformationAnalysis.vue

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