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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -710,16 +710,16 @@
             }
           }
           //附加收费
-          for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-            let obj = {
-              id: month_prescriptions[i].addition[a].item_id,
-              price: month_prescriptions[i].addition[a].price
-
-            }
-            additions_ids.push(obj)
-            addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
-
-          }
+          // for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
+          //   let obj = {
+          //     id: month_prescriptions[i].addition[a].item_id,
+          //     price: month_prescriptions[i].addition[a].price
+          //
+          //   }
+          //   additions_ids.push(obj)
+          //   addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
+          //
+          // }
 
         }
 
@@ -1127,16 +1127,16 @@
                   }
 
                   //附加收费
-                  for (let b = 0; b < prescription.addition.length; b++) {
-                    let obj = {
-                      id: prescription.addition[b].id,
-                      item_name: prescription.addition[b].item_name,
-                      price: prescription.addition[b].price,
-                      count: prescription.addition[b].count,
-                      item_id: prescription.addition[b].item_id
-                    }
-                    tempAddition.push(obj)
-                  }
+                  // for (let b = 0; b < prescription.addition.length; b++) {
+                  //   let obj = {
+                  //     id: prescription.addition[b].id,
+                  //     item_name: prescription.addition[b].item_name,
+                  //     price: prescription.addition[b].price,
+                  //     count: prescription.addition[b].count,
+                  //     item_id: prescription.addition[b].item_id
+                  //   }
+                  //   tempAddition.push(obj)
+                  // }
 
                   let index = i + 1
                   let obj = {
@@ -1248,16 +1248,16 @@
                   }
 
                   //附加收费
-                  for (let b = 0; b < prescription.addition.length; b++) {
-                    let obj = {
-                      id: prescription.addition[b].id,
-                      item_name: prescription.addition[b].item_name,
-                      price: prescription.addition[b].price,
-                      count: prescription.addition[b].count,
-                      item_id: prescription.addition[b].item_id
-                    }
-                    tempAddition.push(obj)
-                  }
+                  // for (let b = 0; b < prescription.addition.length; b++) {
+                  //   let obj = {
+                  //     id: prescription.addition[b].id,
+                  //     item_name: prescription.addition[b].item_name,
+                  //     price: prescription.addition[b].price,
+                  //     count: prescription.addition[b].count,
+                  //     item_id: prescription.addition[b].item_id
+                  //   }
+                  //   tempAddition.push(obj)
+                  // }
 
                   let index = i + 1
                   let obj = {
@@ -3233,7 +3233,7 @@
         }
       }
     }
-  
+
 
   }
 </script>