518合并代码

src/api/his/his_tools.js

@@ -14,3 +14,11 @@ export function getHisSummaryDetailList(params) {
     params: params
   })
 }
+
+export function getGatherDetailList(params) {
+  return request({
+    url: '/api/his/getgatherdetailist',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -45,14 +45,12 @@
     </div>
     <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-              show-summary
               max-height="600"
-              :summary-method="getSummaries"
               v-loading="detail_loading"
               highlight-current-row>
       <el-table-column type="index" label="序号" width="60px" align="center">
         <template slot-scope="scope">
-          {{scope.$index + 1}}
+          {{scope.row.index}}
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="处方日期">
@@ -94,12 +92,17 @@
       <el-table-column align="center" prop="name" label="金额">
         <template slot-scope="scope">
           <div>
-            {{(scope.row.cnt * scope.row.pric).toFixed(2)}}
+            {{scope.row.total_price}}
           </div>
         </template>
       </el-table-column>
-
+     
     </el-table>
+     <div>总费用:{{getAllPice()}}</div>
+     <div>个人支付:</div>
+     <div>基金支付记账:</div>
+     <div>补充医疗支付记账:</div>
+    <div>救助支付金额:</div>
   </div>
 
   <!-- </div> -->
@@ -146,35 +149,8 @@ export default {
     }
   },
   methods: {
-    getSummaries(param) {
-      
-        const { columns, data } = param;
-        const sums = [];
-        columns.forEach((column, index) => {
-          console.log("column233232323232",column)
-          if (index === 0) {
-            sums[index] = '总价';
-            return;
-          }
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-            sums[index] += ' 元';
-          } else {
-            sums[index] = 'N/A';
-          }
-        });
-        return sums;
-    },
     getTime(val) {
-      if(val < 0){
+      if(val <= 0){
         return ""
       }
       if(val == ""){
@@ -217,10 +193,30 @@ export default {
                }
             }
           }
+          var obj = {index:"合计",total_price:0,record_date:"0"}
+          for(let i=0;i<this.tableData.length;i++){
+            this.tableData[i].index = i+1
+            this.tableData[i].total_price = 0
+            this.tableData[i].total_price = (this.tableData[i].cnt * this.tableData[i].pric).toFixed(2)
+            obj.total_price += (this.tableData[i].cnt * this.tableData[i].pric)  
+          }
+          obj.total_price = (obj.total_price).toFixed(2)
+          this.tableData.push(obj)
+          
           console.log("tabledata",this.tableData)
        }
      })
     },
+    getAllPice(){
+      console.log("hhhhh",this.tableData)
+      var total_price = 0
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.tableData[i].index =="合计"){
+          total_price = this.tableData[i].total_price
+        }
+      }
+      return total_price
+    }
   },
   created() {
    // this.getHisSummaryDetailList()

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -51,26 +51,26 @@
               highlight-current-row>
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
       <el-table-column align="center" prop="name" label="处方日期">
-        <template slot-scope="scope">{{  }}</template>
+        <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="费用分类">
-        <template slot-scope="scope">{{scope.row.code}}</template>
+        <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="项目名称">
-        <template slot-scope="scope">{{scope.row.item_name}}</template>
+        <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="规格型号">
-        <template slot-scope="scope">{{scope.row.item_spec}}</template>
+        <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="数量">
-        <template slot-scope="scope">{{scope.row.count}}</template>
+        <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="单价">
-        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+        <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="金额">
         <template slot-scope="scope">
-          <div>{{(scope.row.price.toFixed(2)*scope.row.count).toFixed(2)}}</div>
+          <div></div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="医保类别">
@@ -79,14 +79,12 @@
 
     </el-table>
   </div>
-
-  <!-- </div> -->
 </template>
 
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import {  } from '@/api/his/his'
+import { getGatherDetailList } from '@/api/his/his_tools'
 const moment = require('moment')
 export default {
   components: {
@@ -133,7 +131,7 @@ export default {
     changeItem() {
       this.getSummaryDetailList()
     },
-    getSummaryDetailList() {
+    getGatherDetailList() {
       let start_time = this.chargeDate[0]
       let end_time = this.chargeDate[1]
       let params = {
@@ -143,13 +141,20 @@ export default {
         type: this.item_type,
         keyword: this.keywords
       }
-
+     getGatherDetailList(params).then(response=>{
+       if(response.data.state == 1){
+         var detailList = response.data.data.detailList
+         console.log("detailist232323322332",detailList)
+         var list = response.data.data.list
+         console.log("list233223232323",list)
+       }
+     })
 
 
     },
   },
   created() {
-    this.getSummaryDetailList()
+    this.getGatherDetailList()
 
   }
 }

src/xt_pages/stock/stockBatchNumber.vue

@@ -5,9 +5,9 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-        耗材名称:{{this.$route.query.good_name}} &nbsp;
+        耗材名称:{{getGoodName(this.$route.query.id)}} &nbsp;
         库存:{{this.$route.query.overCount}}{{packing_unit}} &nbsp;
-        规格:{{this.$route.query.specification_name}} &nbsp;
+        规格:{{getSpecName(this.$route.query.id)}} &nbsp;
         厂家:{{this.$route.query.manufacturer}} 
       </div>
       <div class="cell clearfix">
@@ -189,6 +189,7 @@
         packing_unit:"",
         cancelCountList:[],
         houseList:[],
+        good:{}
       }
     },
     methods:{
@@ -259,6 +260,7 @@
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
            this.houseList = response.data.data.houseList
+           this.good = response.data.data.good
          }
       })
      },
@@ -345,7 +347,21 @@
         }
         return storehouse_name
      },
-      
+     getGoodName(id){
+       
+       var good_name =  ""
+       if(id == this.good.id){
+         good_name = this.good.good_name
+       }
+       return good_name
+     },
+     getSpecName(id){
+       var specification_name = ""
+       if(id == this.good.id){
+         specification_name = this.good.specification_name
+       }
+       return specification_name
+     }
 
     }
   }

src/xt_pages/stock/stockFlow.vue

@@ -5,10 +5,10 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       耗材名称:{{this.$route.query.good_name}} &nbsp;
+       耗材名称:{{getGoodName(this.$route.query.id)}} &nbsp;
        库存: {{this.$route.query.overCount}}{{packing_unit}} &nbsp;
        规格:{{this.$route.query.specification_name}} &nbsp;
-       厂家:{{this.$route.query.manufacturer}} 
+       厂家:{{getSpecName(this.$route.query.id)}}
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -451,6 +451,21 @@
         }
         return storehouse_name
      },
+     getGoodName(id){
+       
+       var good_name =  ""
+       if(id == this.good.id){
+         good_name = this.good.good_name
+       }
+       return good_name
+     },
+     getSpecName(id){
+       var specification_name = ""
+       if(id == this.good.id){
+         specification_name = this.good.specification_name
+       }
+       return specification_name
+     }
     }
   }
 </script>

src/xt_pages/stock/stockQuery.vue

@@ -575,7 +575,8 @@ export default {
       var overCount  = this.getOverplus(val.xt_warehouse_info)
       window.sessionStorage.setItem('start_time',this.start_time)
       window.sessionStorage.setItem('end_time',this.end_time)
-      this.$router.push({path:"/stock/in/stockflow?id="+val.id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
+      console.log("val3234243423324324234",val.id)
+      this.$router.push({path:"/stock/in/stockflow?id="+val.id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
     toClickOne(val){
        var manufacturer_name = ""
@@ -589,7 +590,7 @@ export default {
       var overCount  = this.getOverplus(val.xt_warehouse_info)
       window.sessionStorage.setItem('start_time',this.start_time)
       window.sessionStorage.setItem('end_time',this.end_time)
-      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
+      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
     getStockDrugCount(){
         var params ={