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/DialysisPrintOrderThirtyFour.vue

@@ -178,9 +178,13 @@
                     <div class="inline_block" style="flex:1;">
                         透析时间：
                         <div class="under_line" style="width: 50px;text-align: center">
-                        {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "/" }}
+                        {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "" }}
                         </div>
                         小时
+                        <div class="under_line" style="width: 50px;text-align: center">
+                        {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "" }}
+                        </div>
+                        分钟
                     </div>
                     <div class="inline_block" style="margin-left:20px;flex:1;">
                         血流量：
@@ -351,28 +355,32 @@
                             {{ afterdialysis.actual_treatment_hour ? afterdialysis.actual_treatment_hour : "" }}
                             </div>
                             小时
+                            <div class="under_line" style="width: 30px;text-align: center">
+                            {{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : "" }}
+                            </div>
+                            分钟
                         </div>
-                        <div class="inline_block" style="margin-left:20px;">
+                        <div class="inline_block" style="margin-left:10px;">
                             实际脱水量：
                             <div class="under_line" style="width: 70px;text-align: center">
                             {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "" }}
                             </div>
                             ml
                         </div>
-                        <div class="inline_block" style="margin-left:20px;">
+                        <div class="inline_block" style="margin-left:10px;">
                             透后体重：
                             <div class="under_line" style="width: 70px;text-align: center">
                             {{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }}
                             </div>
                             kg
                         </div>
-                        <div class="inline_block" style="margin-left:20px;">
+                        <div class="inline_block" style="margin-left:10px;">
                             透析器级别
                             <div class="under_line" style="width: 100px;text-align: center">
                                 {{ afterdialysis.cruor ? afterdialysis.cruor : '' }}
                             </div>
                         </div>
-                        <div class="inline_block" style="margin-left:20px;">
+                        <div class="inline_block" style="margin-left:10px;">
                             离科时间
                             <div class="under_line" style="width: 70px;text-align: center">
                                 {{ dialysisOrder ? getTime(dialysisOrder.end_time, "{h}:{i}") : '' }}

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -1,5 +1,6 @@
 <template>
     <div id="list-print" class="list-print">
+        <div v-for='(i,index) in pageArr.length' :key="index">
         <div class="listTitle">翁源沅胜透析中心费用清单</div>
         <div class="listInfo">
 
@@ -35,6 +36,7 @@
             <div class="tableBottomOne">制表日期：{{ getNowTime()}}</div>
             <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
         </div>
+        </div>
     </div>
 </template>
 
@@ -64,7 +66,14 @@
           return {};
         }
       },
-    },methods:{
+    },
+    data(){
+        return{
+            page:1,
+            pageArr:[]
+        }
+    },
+    methods:{
       getNowTime: function () {
         let dateTime
         let yy = new Date().getFullYear()
@@ -83,6 +92,21 @@
       getTimes(time) {
         return uParseTime(time, '{y}-{m}-{d}')
       },
+      getPage(){
+            
+        if(this.list <= 13){
+            this.page = 1
+        }else if(this.list > 13){
+            this.page = parseInt(this.list / 13)
+            let num = this.list % 13
+            for (var i=0;i<this.page;i++){ 
+                this.pageArr.push(13)
+            }
+            if(num != 0){
+                this.pageArr.push(num)
+            }
+        }
+      }
 
     }
   }

src/xt_pages/outpatientCharges/summary.vue

@@ -40,7 +40,11 @@
           <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
         </div>
         <div>
+<<<<<<< HEAD
+          <el-popover
+=======
         <el-popover
+>>>>>>> d3b7e304402742c1d1973613d211171842d623fe
             placement="bottom"
             width="210"
             trigger="click">
@@ -122,7 +126,24 @@
       <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
     <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
     </el-dialog>
+<<<<<<< HEAD
+    <el-dialog
+      class="centerDialog"
+      width="900px"
+      title="打印"
+      :visible.sync="listVisible">
+      <listPrint></listPrint>
+    </el-dialog>
+    <el-dialog
+      class="centerDialog"
+      width="900px"
+      title="打印"
+      :visible.sync="allListVisible">
+      <allListPrint :paramsObj='paramsObj'></allListPrint>
+    </el-dialog>
+=======
 
+>>>>>>> d3b7e304402742c1d1973613d211171842d623fe
 
 
   </div>