Просмотр исходного кода

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

see999 3 лет назад
Родитель
Сommit
227fe8d421

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue Просмотреть файл

328
                   <div class="inline_block" style="flex:1;">
328
                   <div class="inline_block" style="flex:1;">
329
                     灌流器:
329
                     灌流器:
330
                     <div class="under_line" style="width: 70px;text-align: center">
330
                     <div class="under_line" style="width: 70px;text-align: center">
331
-                      /
331
+                      {{ prescription.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
332
                     </div>
332
                     </div>
333
                   </div>
333
                   </div>
334
                   <div class="inline_block" style="flex:1;">
334
                   <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
        //统计透析总量