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

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -24,11 +24,11 @@
           :paramsObj="invoiceParams"
         ></printOne>
         <printTwo
-          v-if="org_id == 10215||org_id == 0"
+          v-if="org_id == 10215"
           :paramsObj="invoiceParams"
         ></printTwo>
         <printThree
-          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 "
+          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 || org_id == 0"
           :paramsObj="invoiceParams"
         ></printThree>
 <!--        <print-night v-if="org_id == 10210 || org_id == 0"-->

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -230,6 +230,8 @@
 
 <script>
 import { getInvoice } from '@/api/project/project'
+import {jsGetAge, uParseTime} from "@/utils/tools";
+
 export default {
     props:{
         paramsObj:Object
@@ -266,6 +268,12 @@ export default {
         this.org_name = this.$store.getters.xt_user.org.org_name
     },
     methods:{
+      getTime(value, temp) {
+        if (value != undefined) {
+          return uParseTime(value, temp);
+        }
+        return "";
+      },
       getDay(dateString1,dateString2){
         var  startDate = Date.parse(dateString1);
         var  endDate = Date.parse(dateString2);
@@ -296,20 +304,20 @@ export default {
                 this.printDate = data.getFullYear() + "-" + month + "-" + date;
 
               if(this.list.his.id > 0){
-                this.in_hosptial_time = this.getTime()
-                this.out_hosptial_time = this.list.order.setl_time.split(' ')[0]
+                this.in_hosptial_time = this.getTime(this.list.his.record_date,'{y}-{m}-{d}')
+                this.out_hosptial_time =  this.getTime(this.list.his.record_date,'{y}-{m}-{d}')
               }else{
                 this.in_hosptial_time = this.list.his_hospital_record.in_hosptial_time.split(' ')[0]
                 this.out_hosptial_time = this.list.his_hospital_record.out_hosptial_time.split(' ')[0]
               }
               this.insutype = this.list.order.insutype
-              this.id_card_no = this.list.his_hospital_record.id_card_no
-              this.number = this.list.his_hospital_record.number
-              this.psn_no = this.list.his_hospital_record.psn_no
+              this.id_card_no = this.list.his.id_card_no
+              this.number = this.list.his.number
+              this.psn_no = this.list.his.psn_no
               this.pre_pay_money = this.list.pre_pay_money
 
-              this.balance_accounts_type = this.list.his_hospital_record.balance_accounts_type
-              this.gend= this.list.his_hospital_record.gend
+              this.balance_accounts_type = this.list.his.balance_accounts_type
+              this.gend= this.list.his.gend
             })
         },
         smalltoBIG(n) {

src/xt_pages/outpatientCharges/invoiceTemplate/printTen.vue

@@ -1,11 +1,11 @@
 <template>
   <div id='invoice-print' style="position: relative;">
-    
+      <div style="text-align: center;width: 573px;font-size: 20px; font-weight: bolder;">灵山盛康收费收据</div>
       <div style="display: flex;width: 575px;margin-bottom: 5px; position: relative;left: 506px;">
         {{printDate}}
       </div>
-      
-        <div style="display: flex; justify-content: space-between;width: 573px;border: 1px solid black; position: relative;padding: 5px;">
+      <div style="border: 1px solid black;width: 573px;">
+        <div style="display: flex; justify-content: space-between;width: 573px;border-bottom: 1px solid black; position: relative;padding: 5px;">
           <div >
             <span>姓名：{{paramsObj.name}}</span>
             <span style="margin-left: 60px;">性别：</span>
@@ -16,7 +16,7 @@
             <span style="margin-right: 60px;">NO：</span>
           </div>
         </div>
-        <div style="display: flex;justify-content: space-around;width: 573px;  padding: 5px;border-left: 1px solid black;border-right: 1px solid black;border-bottom: 1px solid black;">
+        <div style="display: flex;justify-content: space-around;width: 573px;  padding: 5px;border-bottom: 1px solid black;">
           <div>项目</div>
           <div>金额</div>
           <div>项目</div>
@@ -24,14 +24,14 @@
           <div>项目</div>
           <div>金额</div>
         </div>
-        <div style="border: 1px solid black; border-top: none; width: 573px;min-height: 220px;">
+        <div style=" width: 573px;min-height: 220px;">
           <div style="display:flex;justify-content: space-around;">
             
             <div style="">西药费</div>
             <div style="">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
             <div style="">检查费</div>
             <div style="">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
-            <div style="">治疗费</div>
+            <div style="position: relative;left: 16px">治疗费</div>
             <div style="position:  relative;left: 16px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
           </div>
 
@@ -61,9 +61,9 @@
             <div style="position:  relative;left: -169px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
           </div>
         </div>
-        <div style="border: 1px solid black;border-top:none;padding: 5px;width: 573px;">
+        <div style="border-top:1px solid black;width: 573px;">
           
-          <div style="border-right: 1px solid black;display: inline-block;width: 360px;">
+          <div style="border-right: 1px solid black;display: inline-block;width: 360px;padding: 5px;">
             <span>合计（大写）:</span>
             <span  style="">
               <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
@@ -121,7 +121,9 @@
           </div>
           <span style="position: relative;top:0px;left:0px">￥：{{totalPrice.toFixed(2)}}</span>
         </div>
-      
+      </div>
+      <div style="width: 20px;font-size: 13px;position: absolute;top: 120px;left: -15px;">报销联加盖医院收费章有效</div>
+      <div style="width: 20px;font-size: 13px;position: absolute;top: 100px;left: 575px;">白 &nbsp; 存根 &nbsp; 红 &nbsp; 收据 &nbsp; 黄 &nbsp; 记账</div>
       <div style="border-bottom: 1px solid black;width:573px;font-Size:12px">
         <div  style="display:flex;margin: 3px 0px;">
           <div style="width:140px">医保：门慢统筹：{{list.order.hifp_pay}}</div>
@@ -146,7 +148,7 @@
           <div style="width:140px">收款人：{{list.admin_user_name}}</div>
         </div>
       </div>
-   
+      
   </div>
 </template>
 <script>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -8,7 +8,6 @@
         :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date"
         :prescription_id="prescription_id"></printOne>
 
-
         <print-ten-one
           v-if="org_id == 10188" v-bind:childResponse="childResponse"
           :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient"
@@ -16,7 +15,6 @@
           :prescription_id="prescription_id"
         ></print-ten-one>
 
-
         <prinSeven v-if="org_id == 10375"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -326,13 +326,6 @@
 <!--        </div>-->
 
 
-
-
-
-
-
-
-
         <div class="doctorBox">
           <p v-if="org_id == 10217">
             医师：
@@ -517,8 +510,6 @@ export default{
               );
             }
           }
-
-          console.log("处方222222", this.prescriptions);
           var hisPatient = response.data.data.hisPatient;
           console.log("hisPatient", hisPatient);
           this.hisPatient = hisPatient;

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -16,8 +16,8 @@
         <!-- 此下条为本地开发下页面 -->
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
         <!-- org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0 -->
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <printThree v-if=" org_id == 10375" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 && org_id != 0 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printThree v-if=" org_id == 10375 || org_id==0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
         <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
       </div>
   </div>