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

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -25,15 +25,15 @@
 <script>
 
 
-  import { parseTime } from "@/utils";
-  import { getDialysisRecord } from "@/api/dialysis";
-  import { getDataConfig } from "@/utils/data";
-  import { jsGetAge, uParseTime } from "@/utils/tools";
+  import { parseTime } from '@/utils'
+  import { getDialysisRecord } from '@/api/dialysis'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
   import axios from 'axios'
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-  import print from "print-js";
-  import printOne from "./newTreatTemplate/printOne"
-  import printTwo from "./newTreatTemplate/printTwo"
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import printOne from './newTreatTemplate/printOne'
+  import printTwo from './newTreatTemplate/printTwo'
+
   export default {
     name: "newStatementPrintTwo",
     components: {
@@ -185,31 +185,31 @@
                   console.log("～～" + that.info)
 
 
-                  // let type_arr = []
-                  // for (let i = 0; i < that.info.transBody.outputlist1.length; i++) {
-                  //   type_arr.push(that.info.transBody.outputlist1[i].aka111)
-                  // }
-                  //
-                  //
-                  // let  typeArr =  that.unique(type_arr)
-                  //
-                  // that.info['new_detail_list'] = []
-                  //
-                  // for(let i = 0; i <  typeArr.length; i++){
-                  //   let obj = {
-                  //     aka111:typeArr[i],
-                  //     details:[],
-                  //     total:0
-                  //   }
-                  //
-                  //   for(let b = 0; b < that.info.transBody.outputlist1.length;b++){
-                  //       if(typeArr[i] == that.info.transBody.outputlist1[b]){
-                  //         obj.details.push(that.info.transBody.outputlist1[b])
-                  //         obj.total += that.info.transBody.outputlist1[b].akc264
-                  //       }
-                  //   }
-                  //   that.info.new_detail_list.push(obj)
-                  // }
+                  let type_arr = []
+                  for (let i = 0; i < that.info.transBody.outputlist1.length; i++) {
+                    type_arr.push(that.info.transBody.outputlist1[i].aka111)
+                  }
+
+
+                  let  typeArr =  that.unique(type_arr)
+
+                  that.info['new_detail_list'] = []
+
+                  for(let i = 0; i <  typeArr.length; i++){
+                    let obj = {
+                      aka111:typeArr[i],
+                      details:[],
+                      total:0
+                    }
+
+                    for(let b = 0; b < that.info.transBody.outputlist1.length;b++){
+                        if(typeArr[i] == that.info.transBody.outputlist1[b]){
+                          obj.details.push(that.info.transBody.outputlist1[b])
+                          obj.total += that.info.transBody.outputlist1[b].akc264
+                        }
+                    }
+                    that.info.new_detail_list.push(obj)
+                  }
 
 
                 }