518合并代码

src/lang/zh.js

@@ -143,7 +143,7 @@ export default {
     goodReturnQuery: '退货单',
     addPurchaseOrder: '新增采购订单',
     workforce_template: '排班模板设置',
-    statistics: '统计分析',
+    statistics: '明细汇总统计',
     statisticalConfig: '统计配置',
     basicInformationAnalysis: '基本信息统计',
     patientControlAnalysis: '患者质控达标统计',

src/xt_pages/data/basicConfig.vue

@@ -151,7 +151,7 @@ export default {
             if(response.data.data.is_prescription_advice == 1){
                this.is_open_prescription_xt_his = true
             }else{
-              this.is_open_advice_xt_his = false
+              this.is_open_prescription_xt_his = false
             }
 
           } else {
@@ -359,16 +359,17 @@ export default {
       })
     },
     changeFuncSeven(){
-      var is_open_prescription_xt_his = 2
-      if(this.is_open_advice_xt_his == false){
+      var is_open_prescription_xt_his = 0
+      if(this.is_open_prescription_xt_his == false){
         is_open_prescription_xt_his = 2
       }
-      if(this.is_open_advice_xt_his == true){
-        is_open_prescription_xt_his = 2
+      if(this.is_open_prescription_xt_his == true){
+        is_open_prescription_xt_his = 1
       }
       var params = {
         is_open_prescription_xt_his:is_open_prescription_xt_his,
       }
+      console.log("param22332323232",params)
       changePrescriptionConfig(params).then(response=>{
           if(response.data.state == 1){
             var msg =  response.data.data.msg

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -324,17 +324,13 @@ export default {
      })
     },
     getAllPice(){
-    //  console.log("表哥233323232323223",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
-        }
+        total_price += this.tableData[i].pric * this.tableData[i].cnt
       }
-      return total_price
+      return total_price.toFixed(2)
     },
     getActPay(){
-      // 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/statistics/index.vue

@@ -126,7 +126,7 @@ export default {
     return {
       crumbs: [
         { path: false, name: "质控管理" },
-        { path: false, name: "统计分析" }
+        { path: false, name: "明细汇总统计" }
       ],
       pageLoad: true,
       patientCount: 0,