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/detail.vue

@@ -311,9 +311,12 @@
               }
               tempPatientsTwo[i]['total'] = total
             }
-
+            console.log('tempPatientsTwo',tempPatientsTwo)
             for (let i = 0; i < tempPatientsTwo.length; i++) {
-              console.log(tempPatientsTwo[i].total)
+              // console.log(111,tempPatientsTwo[i].total)
+              if(tempPatientsTwo[i].new_order_info.length > 0){
+
+
               for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
                 let new_name = tempPatientsTwo[i].new_order_info[b].item_name
                 new_name=new_name.replace("（ ","");
@@ -330,15 +333,17 @@
                     count: tempPatientsTwo[i].new_order_info[b].count,
 
                   }
-                  if(b == 0){
+
+                  // if(b == 0){
                     obj['total'] =  tempPatientsTwo[i].total
-                  }else{
-                    obj['total'] = 0
-                  }
+                  // }else{
+                  //   obj['total'] = 0
+                  // }
                   this.tableData.push(obj)
                 }
 
               }
+              }
             }
             this.handleSpanTempArr()
             // this.tableData = tempPatientsTwo
@@ -521,22 +526,27 @@
           console.log(data)
           const values = data.map(item => Number(item[column.property]))
           if (column.property === 'total') {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] = sums[index].toFixed(2)
+            // sums[index] = values.reduce((prev, curr) => {
+            //   const value = Number(curr)
+            //   if (!isNaN(value)) {
+            //     return prev + curr
+            //   } else {
+            //     return prev
+            //   }
+            // }, 0)
+            // sums[index] = sums[index].toFixed(2)
+            let num = 0
+            data.map(item => {
+              num += item.price.toFixed(2)*item.count
+            })
+            sums[index] = num.toFixed(2)
           } else {
             sums[index] = ''
           }
         })
 
         return sums
-      }
+      },
     },
     created() {
       this.getSummaryDetailList()

src/xt_pages/outpatientTool/components/gather.vue

@@ -457,7 +457,7 @@
           }
           console.log(data)
           const values = data.map(item => Number(item[column.property]))
-          if (column.property === 'total') {
+          if (column.property === 'sum') {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr)
               if (!isNaN(value)) {