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

@@ -477,6 +477,7 @@ export default {
         { value: 2, label: "自费" },
       ],
       shouJuVisible: false,
+      org_id:0,
     };
   },
 
@@ -1320,15 +1321,27 @@ export default {
       return uParseTime(time, "{y}-{m}-{d}");
     },
     toDetail(row) {
-      this.$router.push(
-        // "/outpatientCharges/summaryDetail?patient_id=" +
-          "/hospitalCharges/summaryDetail?patient_id=" +
+      // if(this.org_id ==10265 || this.org_id ==0){
+        this.$router.push(
+          "/outpatientCharges/summaryDetail?patient_id=" +
           row.patient.id +
           "&number=" +
           row.number +
           "&id=" +
           row.id
-      );
+        );
+      // }else{
+      //   this.$router.push(
+      //   // "/outpatientCharges/summaryDetail?patient_id=" +
+      //     "/hospitalCharges/summaryDetail?patient_id=" +
+      //     row.patient.id +
+      //     "&number=" +
+      //     row.number +
+      //     "&id=" +
+      //     row.id
+      //   );
+      // }
+      
     },
     getTime(value, temp) {
       if (value != undefined) {
@@ -1412,6 +1425,7 @@ export default {
     },
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id,
     this.fetchAllAdminUsers();
     this.getDoctorList();
     this.getHisOrderList();

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -16,8 +16,8 @@
       <printOne  v-if="org_id != 10215  && org_id !=9671&&org_id !=9675&& org_id !=10515 && org_id !=10489 && org_id !=10644 && org_id !=0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
       <summary-print v-if="org_id == 10215|| org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
       <printTwo v-if="org_id==10515 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printTwo>
-      <printthree  v-if="org_id == 10489" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printthree>
-      <printFour v-if="org_id == 10644 || org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printFour>
+      <printthree  v-if="org_id == 10489 || org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printthree>
+      <printFour v-if="org_id == 10644 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printFour>
       <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
     </div>
   </div>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -15,7 +15,7 @@
 
     <div class='dialysisPage' style="padding-top:40px;">
       
-      <listPrintforu v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id != 10191"
+      <listPrintforu v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id != 10191 "
         :list="list" :patient="patient" :order="order" :admin="admin">
       </listPrintforu>
       <printOne v-if="org_id == 10191" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
@@ -23,7 +23,7 @@
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
      <list-print-three v-if="org_id == 10215 || org_id==9675  || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
-      <print-two10265  v-if="org_id == 10265" :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <print-two10265  v-if="org_id == 10265 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>
@@ -379,13 +379,15 @@
       set10265NewData(details) {
         let drug_ids = []
         let project_ids = []
-
+        console.log('details12121212',details);
+        
         for (let i = 0; i < details.length; i++) {
           if (details[i].advice && details[i].advice.id > 0 && details[i].advice.prescription && details[i].advice.prescription.type == 1) { //药品
             let obj = {
               id: details[i].advice.drug_id,
               price: details[i].advice.price,
               lv: details[i].chrgitm_lv,
+              selfpay_prop:details[i].selfpay_prop
             }
             drug_ids.push(obj)
           } else if (details[i].project && details[i].project.id > 0 && details[i].project.prescription && details[i].project.prescription.type == 2) { //项目
@@ -393,7 +395,7 @@
               id: details[i].project.project_id,
               price: details[i].project.price,
               lv: details[i].chrgitm_lv,
-
+              selfpay_prop:details[i].selfpay_prop
             }
             project_ids.push(obj)
 
@@ -402,18 +404,17 @@
         }
         //
         // console.log('old ids')
-        // console.log(drug_ids)
-        // console.log(project_ids)
+        console.log('drug_ids',drug_ids)
+        console.log('project_ids',project_ids)
         // console.log('old ids')
-
         let new_drug_ids = this.unique10265(drug_ids)
         let new_project_ids = this.unique10265(project_ids)
         let list = []
 
-        console.log('ids')
-        console.log(new_drug_ids)
-        console.log(new_project_ids)
-        console.log('ids')
+        // console.log('ids')
+        console.log('new_drug_ids',new_drug_ids)
+        console.log('new_project_ids',new_project_ids)
+        // console.log('ids')
 
         if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
           for (let i = 0; i < new_drug_ids.length; i++) {
@@ -429,6 +430,7 @@
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2
+                obj['selfpay_prop'] = details[a].selfpay_prop
                 count = count + details[a].cnt
               }
             }
@@ -459,7 +461,7 @@
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2
-
+                obj['selfpay_prop'] = details[a].selfpay_prop
                 count = count + details[a].cnt
               }
             }

src/xt_pages/outpatientCharges/listTemplate/listPrintforu.vue

@@ -7,7 +7,7 @@
             <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
             <div>身份证号：{{patient.id_card_no}}</div>
             <div>年龄：{{patient.age}}  岁</div>
-            <div>开方日期：{{getTimes(order.settle_accounts_date) }}</div>
+            <div v-if="org_id!=10489">开方日期：{{getTimes(order.settle_accounts_date) }}</div>
         </div>
         <div class="listInfo">
             <div>结算类型：{{order.is_medicine_insurance == 1 ? "医保" : "自费"}}</div>
@@ -24,9 +24,10 @@
         
         <table class="listTable" style="text-align: center;">
             <tr style="border-bottom: 1px solid black;">
-              <td style="width:25%">医保编码</td>
-              <td style="width:25%">项目名称</td>
-              <td style="width:15%">规格</td>
+              <td style="width:12%" v-if="org_id==10489">开方日期</td>
+              <td style="width:20%">医保编码</td>
+              <td style="width:20%">项目名称</td>
+              <td style="width:13%">规格</td>
               <td style="width:5%">数量</td>
               <td style="width:5%">单位</td>
               <td style="width:8%">单价(元)</td>
@@ -34,12 +35,10 @@
               <td style="width:8%">自付比例</td>
             </tr>
             <tr v-for="(item,index) in list" style="line-height: 30px;">
-                <!-- <template v-if="index == (list.length)-1">
-                    <tr style="border-bottom: 1px solid black;"></tr>
-                </template> -->
-                <td style="width:25%">{{item.code}}</td>
-                <td style="width:25%">{{item.name}}</td>
-                <td style="width:15%">{{item.spec}}</td>
+                <td style="width:12%" v-if="org_id==10489">{{getTimes(order.settle_accounts_date) }}</td>
+                <td style="width:20%">{{item.code}}</td>
+                <td style="width:20%">{{item.name}}</td>
+                <td style="width:13%">{{item.spec}}</td>
                 <td style="width:5%" >
                   <span v-if="item.code!=undefined">{{item.count}}</span>
                 </td>

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -58,6 +58,7 @@
                   <TD width="80">单价(元)</TD>
                   <TD width="80">数量</TD>
                   <TD width="80">金额(元)</TD>
+                  <td width="80">自负比例</td>
                 </TR>
                 <TR v-for="subItem in item.details" :key="subItem">
                   <TD style="white-space: nowrap">{{
@@ -75,6 +76,10 @@
                   <TD>{{
                     (subItem.price * subItem.count).toFixed(2)
                   }}</TD>
+                  <td>
+                    {{(subItem.selfpay_prop)*100}}
+                    <span v-if="subItem.selfpay_prop !=''">%</span>
+                  </td>
                 </TR>
                 <TR>
                   <TD style="white-space: nowrap"