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

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -64,7 +64,7 @@
         this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
         const style =
-        '@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}';
+        '@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}';
         printJS({
             printable: "prescription-print",
             type: "html",

src/xt_pages/outpatientCharges/newTreatTemplate/printOne.vue

@@ -234,9 +234,12 @@
 
       },
       getPage(){
+        this.page = 1
+        this.pageArr = []
         if(this.info.name_arr.length <= 13){
             this.page = 1
             this.pageArr.push(this.info.name_arr.length)
+            console.log('this.pageArr',this.pageArr)
         }else if(this.info.name_arr.length > 13){
             this.page = parseInt(this.info.name_arr.length / 13)
             let num = this.info.name_arr.length % 13
@@ -258,7 +261,8 @@
         handler(newVal) {
             this.getPage()
         },
-        deep: true
+        deep: true,
+        immediate:true
       }
     }