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

@@ -16,7 +16,7 @@
         <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 || org_id == 4"></printThree>
-          <printFour v-if="org_id == 9504 || org_id == 10028 || org_id == 0" :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></printFour>
+          <printFour v-if="org_id == 9504 || org_id == 10028" :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></printFour>
         </div>
         <printOne :info="info" v-else></printOne>
       </div>
@@ -352,13 +352,21 @@ export default {
               })
               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++
-                  // obj3.details.push(item)
-                  // obj3.total += item.Total
-                  // num++
+                  obj2.total = obj2.total + item.Total
+                  var newObj = {
+                    pric:parseInt(item.Total),
+                    project:{
+                      count:1,
+                      project:{
+                        project_name:item.Name,
+                        unit:'',
+                      }
+
+                    }
 
+                  }
+                  obj2.details.push(newObj)
+                  num++
                 })
               }
 

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -187,14 +187,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>
@@ -202,35 +202,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 == 3">{{ subItem.Total }}</span>
+<!--                                <span v-if="item.type == 4">{{subItem.Total}}</span>-->
 
                             </td>
                             <td :rowspan="item.details.length" v-if="index == 0"