Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/hospitalStation/template/printFour.vue

@@ -58,8 +58,8 @@
                  <p>配对：</p>
                  <p>核对：</p>
                  <p>发药：</p>
-<!--                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>-->
-            <p>药费：551.20元</p>
+                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+<!--            <p>药费：551.20元</p>-->
 
           </div>
           <div style="page-break-after:always"></div>

src/xt_pages/hospitalStation/template/printOne.vue

@@ -59,8 +59,8 @@
                  <p>配对：</p>
                  <p>核对：</p>
                  <p>发药：</p>
-<!--                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>-->
-            <p>药费：551.20元</p>
+                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+<!--            <p>药费：551.20元</p>-->
 
           </div>
           <div style="page-break-after:always"></div>

src/xt_pages/hospitalStation/template/printTwo.vue

@@ -35,8 +35,8 @@
             <p>配对:</p>
             <p>核对：{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
             <p>发药：{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
-<!--            <p>药费：{{advicePrint[0].price?advicePrint[0].price:""}}</p>-->
-          <p>药费：551.20元</p>
+            <p>药费：{{advicePrint[0].price?advicePrint[0].price:""}}</p>
+<!--          <p>药费：551.20元</p>-->
 
         </div>
     </div>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -355,6 +355,9 @@ export default {
                   obj4.total = obj4.total + item.Total
                   obj4.details.push(item)
                   num++
+                  // obj3.details.push(item)
+                  // obj3.total += item.Total
+                  // num++
 
                 })
               }
@@ -363,7 +366,7 @@ export default {
               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

@@ -246,7 +246,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>