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

@@ -13,9 +13,9 @@
       </template>
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0">
+        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0 || org_id == 4">
           <printTwo :info="info" v-if="org_id == 9990"></printTwo>
-          <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138 || org_id == 0"></printThree>
+          <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138 || org_id == 0 || org_id == 4"></printThree>
           <printFour v-if="org_id == 9504 || org_id == 10028 || org_id == 0" :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></printFour>
         </div>
         <printOne :info="info" v-else></printOne>
@@ -79,7 +79,7 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
 
-      if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 0){
+      if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 4){
         setTimeout(() => {
           const style =
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 47%;}}}';
@@ -301,7 +301,7 @@ export default {
           id: obj.order_id,
 
         }
-        if(this.org_id == 10138 || this.org_id == 0){
+        if(this.org_id == 10138 || this.org_id == 0 || this.$store.getters.xt_user.org_id == 4){
           getPrivateExpenses(params).then(response => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)
@@ -328,11 +328,11 @@ export default {
               }
               let num = 0
 
-              let obj4 = {
-                type:4,
-                details: [],
-                total: 0
-              }
+              // let obj4 = {
+              //   type:4,
+              //   details: [],
+              //   total: 0
+              // }
               this.balanceAccounts.order_info.map(item => {
                 if(item.advice_id > 0){
                   obj.details.push(item)
@@ -350,19 +350,19 @@ export default {
                   }
                 }
               })
-              this.balanceAccounts.new_order_info.map(item => {
-                    obj4.total = item.Total
-                     obj4.details.push(item)
-                     num++
-
-
-              })
+              // this.balanceAccounts.new_order_info.map(item => {
+              //       obj4.total = item.Total
+              //        obj4.details.push(item)
+              //        num++
+              //
+              //
+              // })
 
               this.balanceAccounts.new_detail_list = []
               this.balanceAccounts.new_detail_list.push(obj)
               this.balanceAccounts.new_detail_list.push(obj2)
               this.balanceAccounts.new_detail_list.push(obj3)
-              this.balanceAccounts.new_detail_list.push(obj4)
+              // this.balanceAccounts.new_detail_list.push(obj4)
 
               console.log(111,this.balanceAccounts)
               this.num = num

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -48,14 +48,14 @@
                                 <span v-if="item.type == 1">药品费</span>
                                 <span v-if="item.type == 2">治疗费</span>
                                 <span v-if="item.type == 3">耗材费</span>
-                                <span v-if="item.type == 4">检验费</span>
+                                <!--<span v-if="item.type == 4">检验费</span>-->
 
                             </td>
                             <td>
                                 <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
                                 <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
                                 <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
-                                <span v-if="item.type == 4">{{ subItem.project.project.team_name }}</span>
+                                <!--<span v-if="item.type == 4">{{ subItem.project.project.team_name }}</span>-->
 
                             </td>
                             <td>
@@ -63,35 +63,35 @@
                                         v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
                                 <span v-if="item.type == 2"></span>
                                 <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
-                                <span v-if="item.type == 4"></span>
+                                <!--<span v-if="item.type == 4"></span>-->
 
                             </td>
                             <td>
                                 <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
                                 <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
                                 <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
-                                <span v-if="item.type == 4"></span>
+                                <!--<span v-if="item.type == 4"></span>-->
 
                             </td>
                             <td>
                                 <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
                                 <span v-if="item.type == 2">{{ subItem.project.count }}</span>
                                 <span v-if="item.type == 3">{{ subItem.project.count }}</span>
-                                <span v-if="item.type == 4"></span>
+                                <!--<span v-if="item.type == 4"></span>-->
 
                             </td>
                             <td>
                                 <span v-if="item.type == 1">{{ subItem.pric }}</span>
                                 <span v-if="item.type == 2">{{ subItem.pric }}</span>
                                 <span v-if="item.type == 3">{{ subItem.pric }}</span>
-                                <span v-if="item.type == 4"></span>
+                                <!--<span v-if="item.type == 4"></span>-->
 
                             </td>
                             <td>
                                 <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(4) }}</span>
                                 <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(4) }}</span>
                                 <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(4) }}</span>
-                                <span v-if="item.type == 4"></span>
+                                <!--<span v-if="item.type == 4"></span>-->
 
                             </td>
                             <td :rowspan="item.details.length" v-if="index == 0"
@@ -106,7 +106,7 @@
                                     <span v-if="item.type == 1">药品费: {{ item.total.toFixed(4) }}</span>
                                     <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(4) }}</span>
                                     <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(4) }}</span>
-                                    <span v-if="item.type == 4">检验费: {{ item.total.toFixed(4) }}</span>
+                                    <!--<span v-if="item.type == 4">检验费: {{ item.total.toFixed(4) }}</span>-->
 
                                 </div>
                             </div>
@@ -182,14 +182,14 @@
                                 <span v-if="item.type == 1">药品费</span>
                                 <span v-if="item.type == 2">治疗费</span>
                                 <span v-if="item.type == 3">耗材费</span>
-                                <span v-if="item.type == 4">检验费</span>
+                                <!--<span v-if="item.type == 4">检验费</span>-->
 
                             </td>
                             <td>
                                 <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
                                 <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
                                 <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
-                                <span v-if="item.type == 4">{{ subItem.Name }}</span>
+                                <!--<span v-if="item.type == 4">{{ subItem.Name }}</span>-->
 
                             </td>
                             <td>
@@ -197,35 +197,35 @@
                                         v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
                                 <span v-if="item.type == 2"></span>
                                 <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
-                                <span v-if="item.type == 4"></span>
+                                <!--<span v-if="item.type == 4"></span>-->
 
                             </td>
                             <td>
                                 <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
                                 <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
                                 <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
-                                <span v-if="item.type == 4"></span>
+                                <!--<span v-if="item.type == 4"></span>-->
 
                             </td>
                             <td>
                                 <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
                                 <span v-if="item.type == 2">{{ subItem.project.count }}</span>
                                 <span v-if="item.type == 3">{{ subItem.project.count }}</span>
-                                <span v-if="item.type == 4">1</span>
+                                <!--<span v-if="item.type == 4">1</span>-->
 
                             </td>
                             <td>
                                 <span v-if="item.type == 1">{{ subItem.pric }}</span>
                                 <span v-if="item.type == 2">{{ subItem.pric }}</span>
                                 <span v-if="item.type == 3">{{ subItem.pric }}</span>
-                                <span v-if="item.type == 4">{{subItem.Total}}</span>
+                                <!--<span v-if="item.type == 4">{{subItem.Total}}</span>-->
 
                             </td>
                             <td>
                                 <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(2) }}</span>
                                 <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
                                 <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
-                                <span v-if="item.type == 4">{{subItem.Total}}</span>
+                                <!--<span v-if="item.type == 4">{{subItem.Total}}</span>-->
 
                             </td>
                             <td :rowspan="item.details.length" v-if="index == 0"
@@ -241,7 +241,7 @@
                                     <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
                                     <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(2) }}</span>
                                     <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
-                                    <span v-if="item.type == 4">检验费: {{ item.total.toFixed(2) }}</span>
+                                    <!--<span v-if="item.type == 4">检验费: {{ item.total.toFixed(2) }}</span>-->
 
                                 </div>
                             </div>