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

src/xt_pages/hospitalStation/invoiceTemplate/printOne.vue

@@ -1,118 +1,123 @@
 <template>
     <div id='invoice-print'>
         <div style="display:flex;">
-            <div style="position: absolute;top:50px;left:70px;">{{ list.order_number }}</div>
+            <div style="position: absolute;top:70px;left:70px;">{{ 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:50px;left:300px">{{ list.number }}</div>
+            <div  style="position: absolute;top:70px;left:300px">住院号：{{ list.number }}</div>
             <div></div>
-            <div  style="position: absolute;left:560px;top:50px;">
+            <div  style="position: absolute;left:560px;top:70px;">
                 <span>{{ printDate.slice(0,4) }}</span>
                 <span>{{ printDate.slice(5,7) }}</span>
                 <span>{{ printDate.slice(8,11) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:70px;left:120px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:90px;left:120px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:90px;left:240px;">√</div>
             <!-- <div>{{ list.pay_way }}</div> -->
-            <div style="position: absolute;top:70px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
-            <div style="position: absolute;top:70px;left:560px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <!-- <div style="position: absolute;top:70px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:70px;left:560px;">{{ paramsObj.setl_time.split(' ')[0] }}</div> -->
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
-            <div style="position: absolute;top:90px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
-            <div style="position: absolute;top:90px;left:440px;">{{ list.psn_cash_money }}</div>
-            <div style="position: absolute;top:90px;left:580px;">{{ list.pay_way }}</div>
+            <div style="position: absolute;top:110px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
+            <div style="position: absolute;top:110px;left:440px;">{{ list.psn_cash_money }}</div>
+            <div style="position: absolute;top:110px;left:580px;">门特</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:140px;left:40px">西药</div>
-            <div style="position: absolute;top:140px;left:110px">{{ list.westernMedicineCostTotal }}</div>
-            <div style="position: absolute;top:140px;left:180px">检查费</div>
-            <div style="position: absolute;top:140px;left:260px">{{ list.checkCostTotal }}</div>
-            <div style="position: absolute;top:140px;left:340px">治疗费</div>
-            <div style="position: absolute;top:140px;left:420px">{{ list.treatCostTotal }}</div>
-            <div style="position: absolute;top:140px;left:500px">床位费</div>
-            <div style="position: absolute;top:140px;left:580px">{{ list.bedCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:40px">西药</div>
+            <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:180px">检查费</div>
+            <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:340px">治疗费</div>
+            <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:500px">床位费</div>
+            <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:170px;left:40px">中成药</div>
-            <div style="position: absolute;top:170px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
-            <div style="position: absolute;top:170px;left:180px">化验费</div>
-            <div style="position: absolute;top:170px;left:260px">{{ list.laboratoryCostTotal }}</div>
-            <div style="position: absolute;top:170px;left:340px">手术费</div>
-            <div style="position: absolute;top:170px;left:420px">{{ list.operationCostTotal }}</div>
-            <div style="position: absolute;top:170px;left:500px">其他费</div>
-            <div style="position: absolute;top:170px;left:580px">{{ list.otherCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:40px">中成药</div>
+            <div style="position: absolute;top:190px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:180px">化验费</div>
+            <div style="position: absolute;top:190px;left:260px">{{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:340px">手术费</div>
+            <div style="position: absolute;top:190px;left:420px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:500px">其他费</div>
+            <div style="position: absolute;top:190px;left:580px">{{ list.otherCostTotal }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:190px;left:40px"></div>
-            <div style="position: absolute;top:190px;left:110px"></div>
-            <div style="position: absolute;top:190px;left:180px"></div>
-            <div style="position: absolute;top:190px;left:260px"></div>
-            <div style="position: absolute;top:190px;left:340px">材料费</div>
-            <div style="position: absolute;top:190px;left:420px">{{ list.materialCostTotal }}</div>
-            <div style="position: absolute;top:190px;left:500px"></div>
-            <div style="position: absolute;top:190px;left:580px"></div>
+            <div style="position: absolute;top:210px;left:40px"></div>
+            <div style="position: absolute;top:210px;left:110px"></div>
+            <div style="position: absolute;top:210px;left:180px"></div>
+            <div style="position: absolute;top:210px;left:260px"></div>
+            <div style="position: absolute;top:210px;left:340px">材料费</div>
+            <div style="position: absolute;top:210px;left:420px">{{ list.materialCostTotal }}</div>
+            <div style="position: absolute;top:210px;left:500px"></div>
+            <div style="position: absolute;top:210px;left:580px"></div>
         </div>
         <div>
             <span>
-            <span  style="position: absolute;top:240px;left:180px">
+            <span  style="position: absolute;top:260px;left:180px">
                 <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:240px;left:220px">
+            <span  style="position: absolute;top:260px;left:220px">
                 <span v-if="zhongwen.indexOf('万') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:240px;left:260px">
+            <span  style="position: absolute;top:260px;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:240px;left:300px">
+            <span  style="position: absolute;top:260px;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:240px;left:340px">
+            <span style="position: absolute;top:260px;left:340px">
                 <span v-if="zhongwen.indexOf('拾') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:240px;left:380px">
+            <span  style="position: absolute;top:260px;left:380px">
                 <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:240px;left:420px">
+            <span  style="position: absolute;top:260px;left:420px">
                 <span v-if="zhongwen.indexOf('角') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:240px;left:460px">
+            <span  style="position: absolute;top:260px;left:460px">
                 <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:240px;left:540px">{{ totalPrice }}</span>
+            <span style="position: absolute;top:260px;left:540px">{{ totalPrice }}</span>
         </div>
+        <div style="position: absolute;top:300px;left:340px">银联：0</div>
+        <div style="position: absolute;top:300px;left:400px">现金：{{ list.psn_cash_money }}</div>
+        <div style="position: absolute;top:300px;left:480px">记账：0</div>
+        <div style="position: absolute;top:300px;left:540px">社保卡：0</div>
         <div>
-            <div style="position: absolute;top:320px;left:70px">{{ org_name }}</div>
-            <div v-if="org_id == 9990" style="position: absolute;top:320px;left:300px">钱玉玲</div>
-            <div v-if="org_id == 9990" style="position: absolute;top:320px;left:420px">陈国杰</div>
+            <div style="position: absolute;top:340px;left:120px">{{ org_name }}</div>
+            <div v-if="org_id == 9990" style="position: absolute;top:340px;left:300px">钱玉玲</div>
+            <div v-if="org_id == 9990" style="position: absolute;top:340px;left:420px">陈国杰</div>
         </div>
     </div>
 </template>
@@ -135,28 +140,33 @@ export default {
         }
     },
     created(){
-        console.log('paramsObj',this.paramsObj);
+        console.log('paramsObj',this.paramsObj)
         let params = {
             order_id: this.paramsObj.order_id,
             patient_id: this.paramsObj.patient_id,
-        };
-        this.getInvoice(params);
-        var data = new Date();
-        var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
-        var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
-        this.printDate = data.getFullYear() + "-" + month + "-" + date;
+        }
+        this.getInvoice(params)
+        // var data = new Date();
+        // var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+        // var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+        // this.printDate = data.getFullYear() + "-" + month + "-" + date;
         // this.smalltoBIG(982732.21)
-        this.org_id = this.$store.getters.xt_user.org_id;
+        this.org_id = this.$store.getters.xt_user.org_id
         this.org_name = this.$store.getters.xt_user.org.org_name
     },
     methods:{
         getInvoice(params){
             getInvoice(params).then((res) => {
-                console.log('res',res);
-                this.list = res.data.data;
+                console.log('res',res)
+                this.list = res.data.data
                 this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
-                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal;
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
                 this.smalltoBIG(this.totalPrice)
+                // var data = new Date(res.data.data.date * 1000);
+                var data = new Date(this.paramsObj.setl_time);
+                var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+                var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+                this.printDate = data.getFullYear() + "-" + month + "-" + date;
             })
         },
         smalltoBIG(n) {
@@ -186,7 +196,7 @@ export default {
             }
 
             var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
-            n += "00";
+            n += "00";  
 
             var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
 
@@ -211,7 +221,7 @@ export default {
                 let params = {
                     order_id: val.order_id,
                     patient_id: val.patient_id,
-                };
+                }
                 this.getInvoice(params)
 
             },

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -108,8 +108,12 @@
                         size="small" @click="open(7)" type="primary"
                       >撤销入院
                       </el-button>
+                      <el-button
+                        size="small" @click="invoicePrint" type="primary"
+                      >发票打印
+                      </el-button>
                     </div>
-
+                    
 
 
                 </div>
@@ -329,6 +333,13 @@
             <new-statement-print-two :params-obj="newOrderObj"></new-statement-print-two>
             <!--<newStatementPrint ref="print" :paramsObj='newOrderObj'></newStatementPrint>-->
         </el-dialog>
+        <el-dialog
+                class="centerDialog"
+                width="1200px"
+                title="打印"
+                :visible.sync="invoiceVisible">
+            <invoice-print ref="print" :invoiceParams='invoiceParams'></invoice-print>
+        </el-dialog>
     </div>
 
 </template>
@@ -364,6 +375,7 @@
   import NewStatementPrintTwo from './newStatementPrintTwo'
   import RegisterDialog9504 from './components/registerDialog9504'
   import ChargePrescriptionTable from "./components/ChargePrescriptionTable";
+  import invoicePrint from './invoicePrint'
 
   const moment = require('moment');
   export default {
@@ -381,7 +393,8 @@
       medicalInsuranceRefund,
       additionalCharges,
       treatPrint,
-      statementPrint
+      statementPrint,
+      invoicePrint
 
     },
     data() {
@@ -467,7 +480,9 @@
         sick: [],
         diagnoses: [],
 
-        department: []
+        department: [],
+        invoiceVisible:false,
+        invoiceParams:{},
 
       }
     },
@@ -2797,6 +2812,18 @@
 
         }
 
+      },
+      invoicePrint(obj){
+        console.log(this.hisPatientInfo)
+        let paramsObj = {
+          order_id: this.hisPatientInfo.id,
+          patient_id: this.hisPatientInfo.patient_id,
+          name:this.hisPatientInfo.name,
+          gend:this.hisPatientInfo.gend,
+          setl_time:this.hisPatientInfo.out_hosptial_time
+        }
+        this.invoiceParams = paramsObj
+        this.invoiceVisible = true
       }
     },
     mounted() {

src/xt_pages/outpatientCharges/summary.vue

@@ -511,7 +511,7 @@
       invoicePrint(obj){
         console.log(obj)
         let paramsObj = {
-          order_id: obj.order_info.order_id,
+          order_id: obj.id,
           patient_id: obj.patient_id,
           name:obj.patient.name,
           age:obj.age,