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

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -48,6 +48,7 @@
     <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
               max-height="600"
+              show-summary
               v-loading="detail_loading"
               highlight-current-row>
       <el-table-column type="index" label="序号" width="60px" align="center">
@@ -55,15 +56,15 @@
           {{scope.row.index}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="处方日期">
+      <el-table-column align="center" label="处方日期">
         <template slot-scope="scope">{{getTime(scope.row.record_date)}}</template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="费用编码">
+      <el-table-column align="center" label="费用编码">
         <template slot-scope="scope">
           {{scope.row.number}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="项目名称">
+      <el-table-column align="center" label="项目名称">
         <template slot-scope="scope">
           <span v-if="scope.row.advice_id > 0">{{scope.row.advice.advice_name}}</span>
           <span v-if="scope.row.project_id > 0">
@@ -72,7 +73,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="规格">
+      <el-table-column align="center" label="规格">
         <template slot-scope="scope">
           <span v-if="scope.row.advice_id > 0">{{scope.row.advice.drug.dose}}{{scope.row.advice.drug.dose_unit}}*{{scope.row.advice.drug.min_number}}{{scope.row.advice.drug.min_unit}}/{{scope.row.advice.drug.max_unit}}</span>
           <span v-if="scope.row.project_id > 0">
@@ -81,12 +82,12 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="数量">
+      <el-table-column align="center"  label="数量">
         <template slot-scope="scope">
           {{scope.row.cnt}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="单位">
+      <el-table-column align="center" label="单位">
         <template slot-scope="scope">
           <span v-if="scope.row.advice_id > 0">{{scope.row.advice.prescribing_number_unit}}</span>
           <span v-if="scope.row.project_id > 0">
@@ -95,12 +96,12 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="单价">
+      <el-table-column align="center" label="单价">
         <template slot-scope="scope">
           {{scope.row.pric}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="金额">
+      <el-table-column align="center" label="金额" prop="total_price">
         <template slot-scope="scope">
           <div>
             {{scope.row.total_price}}
@@ -233,8 +234,8 @@ export default {
             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("tabledata23233232233232",this.tableData)
+          // this.tableData.push(obj)cccc
+          // console.log("tabledata23233232233232",this.tableData)
           var new_arr = []
        
           if(this.keywords!=""){
@@ -261,10 +262,11 @@ export default {
             }
             var objs = {index:"合计",total_price:0,record_date:"0"}
             objs.total_price = this.getPrice(new_arr)
-            new_arr.push(objs)
+            // new_arr.push(objs)
             
             this.tableData = new_arr
           }
+
            if(this.id == 1){
               var obj = {index:"合计",total_price:0,record_date:"0"}
               var new_arr = []
@@ -277,7 +279,7 @@ export default {
               }
               this.tableData = []
               obj.total_price = this.getPrice(new_arr)
-              new_arr.push(obj)
+              // new_arr.push(obj)
               this.tableData = new_arr
            }
           if(this.id == 2){
@@ -295,8 +297,8 @@ export default {
             console.log("项目new_arr",new_arr)
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-            console.log("ar3233223232",new_arr)
-            new_arr.push(obj)
+            // console.log("ar3233223232",new_arr)
+            // new_arr.push(obj)
             this.tableData = new_arr
             }
 
@@ -314,15 +316,15 @@ export default {
             }
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-            new_arr.push(obj)
-            console.log("new_arr2332323232",new_arr)
+            // new_arr.push(obj)
+            // console.log("new_arr2332323232",new_arr)
             this.tableData = new_arr
           }          
        }
      })
     },
     getAllPice(){
-     console.log("表哥233323232323223",this.tableData)
+    //  console.log("表哥233323232323223",this.tableData)
       var total_price = 0
       for(let i=0;i<this.tableData.length;i++){
         if(this.tableData[i].index =="合计"){
@@ -332,7 +334,7 @@ export default {
       return total_price
     },
     getActPay(){
-      console.log("list2332323232323232",this.list)
+      // console.log("list2332323232323232",this.list)
       var act_pay = 0
       for(let i=0;i<this.list.length;i++){
         for(let j=0;j<this.list[i].orders.length;j++){

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -49,17 +49,18 @@
     <el-table :data="tableList" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
               max-height="600"
+              show-summary
               v-loading="detail_loading"
               highlight-current-row>
       <el-table-column type="index" label="序号" width="60px" align="center">
            <template slot-scope="scope">{{scope.row.index}}</template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="处方日期">
+      <el-table-column align="center" label="处方日期">
         <template slot-scope="scope">
           <span v-if="scope.row.record_date > 0">{{getTimes(scope.row.record_date)}} </span> 
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="费用分类">
+      <el-table-column align="center" label="费用分类">
         <template slot-scope="scope">
            <span v-if="scope.row.type == 1">
               {{getAdviceMedChrgintmType(scope.row.name)}}
@@ -72,34 +73,34 @@
            </span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="项目名称">
+      <el-table-column align="center" label="项目名称">
         <template slot-scope="scope">
           <span>{{scope.row.name}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="规格型号">
+      <el-table-column align="center" label="规格型号">
         <template slot-scope="scope">
           {{ scope.row.spec }}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="数量">
+      <el-table-column align="center" label="数量">
         <template slot-scope="scope">
           {{ scope.row.count }}
           {{ scope.row.unit }}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="单价">
+      <el-table-column align="center" label="单价">
         <template slot-scope="scope">
           {{scope.row.price}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="金额">
+      <el-table-column align="center" label="金额" prop="total_all">
         <template slot-scope="scope">
           <span v-if="scope.row.is_total == 1">{{ scope.row.total }}</span>  
           <span v-if="scope.row.is_total == 2">{{ (scope.row.price * scope.row.count).toFixed(2) }}</span>  
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="医保类别">
+      <el-table-column align="center" label="医保类别">
         <template slot-scope="scope">
          <span v-if="balanceAccountsType == 2">{{getChrgitmLv(scope.row.chrgitm_lv)}}</span>
 
@@ -218,7 +219,7 @@ export default {
         }
         var obj ={index:"合计",is_total:1,total:0}
         obj.total = this.getPrice(new_arr)
-        new_arr.push(obj)
+        // new_arr.push(obj)
         this.tableList = []
         this.tableList = new_arr
       }else{
@@ -864,10 +865,10 @@ export default {
       objOne.total = this.getTotalPrice(this.tableList)
       for(let i=0;i<this.tableList.length;i++){
         this.tableList[i].index = i + 1
+        this.tableList[i].total_all = (this.tableList[i].count * this.tableList[i].price).toFixed(2)
+        // console.log(this.tableList[i].count,'opop')
       }
-      this.tableList.push(objOne)
-
-      console.log("hh2323323232322323233223",this.tableList)
+      // this.tableList.push(objOne)
     },
 
     getTotalPrice(val){