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

@@ -13,12 +13,12 @@
     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215" >
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4" >
             <printOne v-if="org_id != 10088" :paramsObj="invoiceParams"></printOne>
             <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
-          <printFour v-if="org_id == 10215" :paramsObj="invoiceParams"></printFour>
+          <printFour v-if="org_id == 10215 || org_id == 4" :paramsObj="invoiceParams"></printFour>
         </div>
     </div>
   </div>
@@ -74,7 +74,7 @@ export default {
     },
     printThisPage() {
         const style =
-        '@media print {#invoice-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.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}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
+        '@media print {#invoice-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.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}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
         printJS({
             printable: "invoice-print",
             type: "html",

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

@@ -1,141 +1,141 @@
 <template>
-    <div id='invoice-print' style="font-size:16px;">
+    <div id='invoice-print' style="font-size:14px;">
         <div style="display:flex;">
-            <div style="position: absolute;top:80px;left:70px;">{{ list.order_number }}</div>
+            <div style="position: absolute;top:65px;left:60px;">{{ list.order_number }}</div>
             <!-- <div>{{ list.id_card_no }}</div> -->
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:80px;left:320px">{{ list.id_card_no }}</div>
+            <div  style="position: absolute;top:65px;left:280px">{{ list.id_card_no }}</div>
             <div></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:110px;left:70px">门诊</div>
+            <div  style="position: absolute;top:85px;left:90px">门诊</div>
             <div></div>
-            <div  style="position: absolute;top:110px;left:300px">{{ list.number }}</div>
-            <div  style="position: absolute;left:650px;top:110px;">
+            <div  style="position: absolute;top:85px;left:240px">{{ list.number }}</div>
+            <div  style="position: absolute;left:480px;top:85px;">
                 <span>{{ printDate.slice(0,4) }}</span>
             </div>
-            <div  style="position: absolute;left:700px;top:110px;">
+            <div  style="position: absolute;left:530px;top:85px;">
                 <span>{{ printDate.slice(5,7) }}</span>
             </div>
-            <div  style="position: absolute;left:720px;top:110px;">
+            <div  style="position: absolute;left:580px;top:85px;">
                 <span>{{ printDate.slice(8,11) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:130px;left:120px;"> {{ paramsObj.name }}</div>
-            <div style="position: absolute;top:130px;left:240px;">√</div>
+            <div style="position: absolute;top:100px;left:120px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:100px;left:200px;">√</div>
             <!-- <div>{{ list.pay_way }}</div> -->
-            <div style="position: absolute;top:130px;left:620px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
-            <div style="position: absolute;top:130px;left:720px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:100px;left:400px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:100px;left:580px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
-            <div v-if="paramsObj.gend == 1" style="position: absolute;top:160px;left:80px;">√</div>
-            <div v-else style="position: absolute;top:160px;left:120px;">√</div>
-            <div style="position: absolute;top:160px;left:340px;">{{ totalPrice - list.psn_cash_money }}</div>
-            <div style="position: absolute;top:160px;left:540px;">{{ list.psn_cash_money }}</div>
-            <div style="position: absolute;top:160px;left:720px;">现金</div>
+            <div v-if="paramsObj.gend == 1" style="position: absolute;top:120px;left:60px;">√</div>
+            <div v-else style="position: absolute;top:120px;left:100px;">√</div>
+            <div style="position: absolute;top:130px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
+            <div style="position: absolute;top:130px;left:420px;">{{ list.psn_cash_money }}</div>
+            <div style="position: absolute;top:130px;left:580px;">现金</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:220px;left:40px">西药</div>
-            <div style="position: absolute;top:220px;left:130px">{{ list.westernMedicineCostTotal }}</div>
-            <div style="position: absolute;top:220px;left:240px">检查费</div>
-            <div style="position: absolute;top:220px;left:320px">{{ list.checkCostTotal }}</div>
-            <div style="position: absolute;top:220px;left:440px">治疗费</div>
-            <div style="position: absolute;top:220px;left:540px">{{ list.treatCostTotal }}</div>
-            <div style="position: absolute;top:220px;left:620px">床位费</div>
-            <div style="position: absolute;top:220px;left:720px">{{ list.bedCostTotal }}</div>
+            <div style="position: absolute;top:165px;left:50px">西药</div>
+            <div style="position: absolute;top:165px;left:130px">{{ list.westernMedicineCostTotal }}</div>
+            <div style="position: absolute;top:165px;left:210px">检查费</div>
+            <div style="position: absolute;top:165px;left:280px">{{ list.checkCostTotal }}</div>
+            <div style="position: absolute;top:165px;left:340px">治疗费</div>
+            <div style="position: absolute;top:165px;left:420px">{{ list.treatCostTotal }}</div>
+            <div style="position: absolute;top:165px;left:480px">床位费</div>
+            <div style="position: absolute;top:165px;left:580px">{{ list.bedCostTotal }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:250px;left:40px">中成药</div>
-            <div style="position: absolute;top:250px;left:130px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
-            <div style="position: absolute;top:250px;left:240px">化验费</div>
-            <div style="position: absolute;top:250px;left:320px">{{ list.laboratoryCostTotal }}</div>
-            <div style="position: absolute;top:250px;left:440px">手术费</div>
-            <div style="position: absolute;top:250px;left:540px">{{ list.operationCostTotal }}</div>
-            <div style="position: absolute;top:250px;left:620px">其他费</div>
-            <div style="position: absolute;top:250px;left:720px">{{ list.otherCostTotal }}</div>
+            <div style="position: absolute;top:185px;left:50px">中成药</div>
+            <div style="position: absolute;top:185px;left:130px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:185px;left:210px">化验费</div>
+            <div style="position: absolute;top:185px;left:280px">{{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:185px;left:340px">手术费</div>
+            <div style="position: absolute;top:185px;left:420px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:185px;left:480px">其他费</div>
+            <div style="position: absolute;top:185px;left:580px">{{ list.otherCostTotal }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:280px;left:40px"></div>
-            <div style="position: absolute;top:280px;left:130px"></div>
-            <div style="position: absolute;top:280px;left:240px"></div>
-            <div style="position: absolute;top:280px;left:320px"></div>
-            <div style="position: absolute;top:280px;left:440px">材料费</div>
-            <div style="position: absolute;top:280px;left:540px">{{ list.materialCostTotal }}</div>
-            <div style="position: absolute;top:280px;left:620px"></div>
-            <div style="position: absolute;top:280px;left:720px"></div>
+            <div style="position: absolute;top:205px;left:50px"></div>
+            <div style="position: absolute;top:205px;left:130px"></div>
+            <div style="position: absolute;top:205px;left:210px"></div>
+            <div style="position: absolute;top:205px;left:280px"></div>
+            <div style="position: absolute;top:205px;left:340px">材料费</div>
+            <div style="position: absolute;top:205px;left:420px">{{ list.materialCostTotal }}</div>
+            <div style="position: absolute;top:205px;left:480px"></div>
+            <div style="position: absolute;top:205px;left:580px"></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:310px;left:40px"></div>
-            <div style="position: absolute;top:310px;left:130px"></div>
-            <div style="position: absolute;top:310px;left:240px">补收</div>
-            <div style="position: absolute;top:310px;left:320px">{{ list.psn_cash_money }}</div>
-            <div style="position: absolute;top:310px;left:440px"></div>
-            <div style="position: absolute;top:310px;left:540px"></div>
-            <div style="position: absolute;top:310px;left:620px"></div>
-            <div style="position: absolute;top:310px;left:720px"></div>
+            <div style="position: absolute;top:225px;left:50px"></div>
+            <div style="position: absolute;top:225px;left:130px"></div>
+            <div style="position: absolute;top:225px;left:210px"></div>
+            <div style="position: absolute;top:225px;left:280px">{{ list.psn_cash_money }}</div>
+            <div style="position: absolute;top:225px;left:340px"></div>
+            <div style="position: absolute;top:225px;left:420px"></div>
+            <div style="position: absolute;top:225px;left:480px"></div>
+            <div style="position: absolute;top:225px;left:580px"></div>
         </div>
         <div>
             <span>
-            <span  style="position: absolute;top:340px;left:220px">
+            <span  style="position: absolute;top:250px;left:200px">
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
                     {{ zhongwen.substring(0,1) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:340px;left:260px">
+            <span  style="position: absolute;top:250px;left:230px">
                 <span v-if="zhongwen.indexOf('万') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:340px;left:310px">
+            <span  style="position: absolute;top:250px;left:260px">
                 <span v-if="zhongwen.indexOf('仟') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:340px;left:360px">
+            <span  style="position: absolute;top:250px;left:300px">
                 <span v-if="zhongwen.indexOf('佰') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span style="position: absolute;top:340px;left:410px">
+            <span style="position: absolute;top:250px;left:330px">
                 <span v-if="zhongwen.indexOf('拾') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:340px;left:460px">
+            <span  style="position: absolute;top:250px;left:370px">
                 <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) != '拾'">
                     {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:340px;left:510px">
+            <span  style="position: absolute;top:250px;left:400px">
                 <span v-if="zhongwen.indexOf('角') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:340px;left:560px">
+            <span  style="position: absolute;top:250px;left:430px">
                 <span v-if="zhongwen.indexOf('分') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
                 </span>
                 <span v-else>零</span>
             </span>
             </span>
-            <span style="position: absolute;top:340px;left:600px">{{ totalPrice }}</span>
+            <span style="position: absolute;top:250px;left:500px">{{ totalPrice }}</span>
         </div>
         <!-- <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div> -->
         <div>
-            <div style="position: absolute;top:480px;left:160px">{{ org_name }}</div>
-            <div style="position: absolute;top:480px;left:600px">高慧裕</div>
+            <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div>
+            <div style="position: absolute;top:320px;left:460px">高慧裕</div>
         </div>
     </div>
 </template>