518合并代码

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -62,7 +62,7 @@
       <el-table-column align="center" prop="name" label="费用分类">
         <template slot-scope="scope">
            <span v-if="scope.row.type == 1">
-              {{getAdviceMedChrgintmType(scope.row.advice_id)}}
+              {{getAdviceMedChrgintmType(scope.row.name)}}
            </span>
            <span v-if="scope.row.type == 2">
              {{getProjectMedChrgintmType(scope.row.project_id)}}
@@ -305,7 +305,7 @@ export default {
               order_info[i].med_chrgitm_type = this.getType(order_info[i].med_chrgitm_type)
               order_info[i].chrgitm_lv  = this.getMedicineInsuranceType(order_info[i].chrgitm_lv)
             }
-           
+            console.log("order_info32323232323232233232323232",order_info)
             this.order_info_list = order_info
             var prescription = response.data.data.prescription
           
@@ -862,7 +862,9 @@ export default {
       for(let i=0;i<this.tableList.length;i++){
         this.tableList[i].index = i + 1
       }
-       this.tableList.push(objOne)
+      this.tableList.push(objOne)
+
+      console.log("hh2323323232322323233223",this.tableList)
     },
 
     getTotalPrice(val){
@@ -872,10 +874,10 @@ export default {
       }
       return total_price.toFixed(2)
     },
-    getAdviceMedChrgintmType(advice_id){
+    getAdviceMedChrgintmType(name){
       var med_chrgitm_type = ""
       for(let i=0;i<this.order_info_list.length;i++){
-        if(advice_id == this.order_info_list[i].advice_id){
+        if(name == this.order_info_list[i].advice.advice_name){
           med_chrgitm_type = this.order_info_list[i].med_chrgitm_type
         }
       }
@@ -921,7 +923,7 @@ export default {
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
          if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)

src/xt_pages/outpatientTool/detailPrint.vue

@@ -44,16 +44,12 @@
           <td width="150" style="text-align: center">金额</td>
         </tr>
         <tr v-for="(item, index) in tableData" :key="index">
-          <td style="text-align: center">{{ index + 1 }}</td>
           <td style="text-align: center">
-          <td style="width: 19%; text-align: center">
             <span v-if="item.is_total == 1">{{ index + 1 }}</span>
             <span v-if="item.is_total == 2">合计</span>
           </td>
-          <td style="width: 10%; text-align: center">
-            <span v-if="item.record_date > 0">{{
-              getTimes(item.record_date)
-            }}</span>
+          <td style="text-align: center">
+            <span v-if="item.is_total == 1">{{getTimes(item.record_date)}}</span> 
           </td>
           <td width="80" style="text-align: center">{{ item.number }}</td>
           <td style="text-align: center">

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -57,7 +57,7 @@
             <tr v-for="(item, index) in tableList" :key="index">
                 <td style="text-align:center" >
                   <span v-if="item.type == 1">
-                    {{getAdviceMedChrgintmType(item.advice_id)}}
+                    {{getAdviceMedChrgintmType(item.name)}}
                   </span>
                    <span v-if="item.type == 2">
                     {{getProjectMedChrgintmType(item.project_id)}}
@@ -716,10 +716,10 @@
       }
       return total_price.toFixed(2)
     },
-    getAdviceMedChrgintmType(advice_id){
+    getAdviceMedChrgintmType(name){
       var med_chrgitm_type = ""
       for(let i=0;i<this.order_info_list.length;i++){
-        if(advice_id == this.order_info_list[i].advice_id){
+        if(name == this.order_info_list[i].advice.advice_name){
           med_chrgitm_type = this.order_info_list[i].med_chrgitm_type
         }
       }
@@ -765,7 +765,7 @@
       var total_price = 0
       for(let i=0;i<this.tableList.length;i++){
          if(this.tableList[i].advice_id > 0){
-           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].advice_id)
+           this.tableList[i].drug_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
          }
          if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)