11

src/xt_pages/outpatientTool/components/gather.vue

@@ -122,8 +122,8 @@ export default {
        costClassify:getDictionaryDataConfig('system','cost_classify'),
       tableData: [],
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
-      item_type: '0',
-      new_item_type:0,
+      item_type: "",
+      new_item_type:"",
       item_time_type:'1',
       items: [
         { id: 1, name: '药品' },
@@ -165,12 +165,26 @@ export default {
       // this.getSummaryDetailList()
     },
     changeItem() {
+      // console.log("-----")
+      // this.tableData = []
       this.new_item_type = this.item_type
       if(this.item_type == 1){
         this.new_item_type = -100
       }else if(this.item_type == 5){
         this.new_item_type = -200
       }
+      //
+      // if(this.new_item_type == 0){
+      //   this.tableData = this.all_table_data
+      // }else{
+      //   let new_table_data = []
+      //   for(let aa = 0; aa < this.all_table_data.length; aa++){
+      //     if(this.new_item_type == this.all_table_data[aa].cost_classify){
+      //       new_table_data.push(this.all_table_data[aa])
+      //     }
+      //   }
+      //   this.tableData = new_table_data
+      // }
       // this.getSummaryDetailList()
     }, uniquepid(arr) {
       const res = new Map()
@@ -288,7 +302,6 @@ export default {
               }
               new_obj.items.push(obj)
             }
-
             tempPatientsThree.push(new_obj)
           }
 
@@ -299,18 +312,20 @@ export default {
           for(let i = 0; i < tempPatientsThree.length;i++){
             let sum = 0
             for(let b = 0; b < tempPatientsThree[i].items.length;b++){
-              let obj = {
+              let obj2 = {
                 name:tempPatientsThree[i].items[b].name,
                 cost_classify:tempPatientsThree[i].items[b].cost_classify,
                 price:tempPatientsThree[i].items[b].price,
-                patient_id:tempPatientsThree[i].items[b].patient_id,
+                patient_id:tempPatientsThree[i].patient_id,
                 item_name:tempPatientsThree[i].items[b].item_name,
                 sum:0,
               }
               sum = sum + tempPatientsThree[i].items[b].price
-              this.tableData.push(obj)
-              this.all_table_data.push(obj)
+              console.log(obj2)
+              this.tableData.push(obj2)
+              this.all_table_data.push(obj2)
             }
+
             for(let c = 0; c < this.tableData.length;c++){
               if(tempPatientsThree[i].patient_id == this.tableData[c].patient_id){
                 this.tableData[c].sum = sum
@@ -335,6 +350,7 @@ export default {
             this.tableData = new_table_data
           }
           this.handleSpanTempArr()
+          // this.getTotal()
         }
       })
     },getName(cost_classify){
@@ -384,10 +400,7 @@ export default {
       }
       return res
     },unique3(array) {
-      console.log("-----11122222")
 
-      console.log(array)
-      // res用来存储结果
       var res = []
       for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
         for (var j = 0, resLen = res.length; j < resLen; j++) {
@@ -401,18 +414,6 @@ export default {
         }
       }
       return res
-    }, sort(arr) {
-      for (var i = 0; i < arr.length - 1; i++) {
-        for (var j = 0; j < arr.length - i - 1; j++) {
-          if (arr[j].patient_id > arr[j + 1].patient_id) {// 相邻元素两两对比
-            var hand = arr[j]
-            arr[j] = arr[j + 1]
-            arr[j + 1] = hand
-
-          }
-        }
-      }
-      return arr
     }, handleSpanTempArr() {
       this.tempArr = []
 
@@ -431,8 +432,8 @@ export default {
           }
         }
       }
-      console.log('this.tableData',this.tableData);
-      
+      // console.log('this.tableData',this.tableData);
+
       let sameRowArr = [], sIdx = 0
       this.tableData.forEach((item, index) => {
         item.index = index
@@ -448,8 +449,8 @@ export default {
         }
       })
       this.sameRowArr = sameRowArr
-      console.log('this.sameRowArr',this.sameRowArr);
-      
+      // console.log('this.sameRowArr',this.sameRowArr);
+
     }, merge({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0 || columnIndex === 3) {
         const _row = this.tempArr[rowIndex]
@@ -459,26 +460,51 @@ export default {
           colspan: _col
         }
       }
-    }, getTotal(param) {
+    }, deepCopy(obj) {
+        if ((obj === null) || (typeof obj !== 'object')) {
+          return obj;
+        }
+
+        if (obj instanceof Date) {
+          return new Date(obj.getTime());
+        }
+
+        if (obj instanceof Array) {
+          return obj.reduce((arr, item, i) => {
+            arr[i] = this.deepCopy(item);
+            return arr;
+          }, []);
+        }
+
+        if (obj instanceof Object) {
+          return Object.keys(obj).reduce((newObj, key) => {
+            newObj[key] = this.deepCopy(obj[key]);
+            return newObj;
+          }, {});
+        }
+  },getTotal(param) {
       const { columns, data } = param
       const sums = []
+      console.log(data)
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '合计'
           return
         }
-        console.log('data',data)
-        for(let i=0;i<data.length;i++){
-          for(let j=i+1;j<data.length;j++){
-            if(data[i].patient_id == data[j].patient_id){
-              data.splice(j,1)
+       var data2  = this.deepCopy(data)
+        // var data2 = data
+        // console.log('data',data)
+        for(let i=0;i<data2.length;i++){
+          for(let j=i+1;j<data2.length;j++){
+            if(data2[i].patient_id == data2[j].patient_id){
+              data2.splice(j,1)
               j--
             }
           }
         }
-        console.log('data111',data);
-        
-        const values = data.map(item => Number(item[column.property]))
+        // console.log('data111',data);
+
+        const values = data2.map(item => Number(item[column.property]))
         if (column.property === 'sum') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)