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

@@ -639,15 +639,15 @@
             }
           }
           //附加收费
-          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])
+          // }
         }
 
         const obj = {}
@@ -1169,16 +1169,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)
+                // }
 
                 var preTime = ''
 
@@ -1545,16 +1545,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)
+                      // }
 
                       var preTime = ''
 
@@ -2021,16 +2021,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)
+                      // }
 
                       var preTime = ''
 
@@ -2477,16 +2477,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)
+                    // }
 
                     var preTime = ''
 
@@ -2992,16 +2992,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)
+                      // }
 
                       var preTime = ''
 
@@ -3537,16 +3537,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)
+                      // }
 
                       var preTime = ''