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

@@ -350,13 +350,14 @@ export default {
                   }
                 }
               })
-              this.balanceAccounts.new_order_info.map(item => {
-                    obj4.total = item.Total
-                     obj4.details.push(item)
-                     num++
-
+              if(this.balanceAccounts.new_order_info != null) {
+                this.balanceAccounts.new_order_info.map(item => {
+                  obj4.total = obj4.total + item.Total
+                  obj4.details.push(item)
+                  num++
 
-              })
+                })
+              }
 
               this.balanceAccounts.new_detail_list = []
               this.balanceAccounts.new_detail_list.push(obj)
@@ -540,18 +541,19 @@ export default {
                 }
               })
 
-              this.info.order_infos.map(item => {
-                obj4.total = item.Total
-                obj4.details.push(item)
-                num++
 
-              })
+              // 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)
-              that.info.new_detail_list.push(obj4)
+              // that.info.new_detail_list.push(obj4)
 
               that.num = num
 

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -84,13 +84,16 @@
                                 <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">{{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"></span>-->
 
                             </td>
@@ -106,6 +109,8 @@
                                     <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(4) }}</span>-->
 
                                 </div>