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

@@ -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
@@ -515,6 +515,12 @@ export default {
                 details: [],
                 total: 0
               }
+
+              let obj4 = {
+                type:4,
+                details: [],
+                total: 0
+              }
               let num = 0
               that.info.order_infos.map(item => {
                 if(item.advice_id > 0){
@@ -534,11 +540,19 @@ export default {
                 }
               })
 
+              this.info.order_infos.map(item => {
+                obj4.total = item.Total
+                obj4.details.push(item)
+                num++
+
+              })
+
               that.info.new_detail_list = []
               that.info.new_detail_list.push(obj)
               that.info.new_detail_list.push(obj2)
               that.info.new_detail_list.push(obj3)
-              console.log('123',that.info.new_detail_list)
+              that.info.new_detail_list.push(obj4)
+
               that.num = num
 
               if(that.paramsObj.settle_type != 1){

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,28 +63,28 @@
                                         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>
@@ -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,39 +197,39 @@
                                         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 == 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">{{subItem.Total}}</span>
 
                             </td>
                             <td :rowspan="item.details.length" v-if="index == 0"
-                                style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}
+                                style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(4) }}
                             </td>
                         </tr>
                     </div>
@@ -238,10 +238,10 @@
                             <div style="display:flex;flez-wrap:wrap;">
                                 <div style="width:33%;" v-for="(item,index) in balanceAccounts.new_detail_list"
                                      :key="index">
-                                    <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 == 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>
 
                                 </div>
                             </div>