4月28日拉取

src/xt_pages/hospitalStation/components/deskPrescription.vue

                     </el-table-column>
                     <el-table-column label="库存" width="60">
                       <template slot-scope="scope">
-                                          <span
-                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
-                                              <span
-                                                  v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
-                                              <span
-                                                  v-if="scope.row.count%scope.row.min_number>0"> {{ scope.row.count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
-                                            </span>
-                        <span v-else> {{ scope.row.total }}{{ scope.row.total ? scope.row.min_unit : '' }}</span>
+                        <!-- <span
+                          v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
+                          <span
+                              v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
+                          <span
+                              v-if="scope.row.count%scope.row.min_number>0"> {{ scope.row.count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
+                        </span>
+                        <span v-else> {{ scope.row.total }}{{ scope.row.total ? scope.row.min_unit : '' }}</span> -->
+                       
+                          <span v-if="scope.row.sum_count/scope.row.min_number>0">{{ Math.floor(scope.row.sum_count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
+                          <span v-if="scope.row.sum_count%scope.row.min_number>0"> {{ scope.row.sum_count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
+                      
                       </template>
                     </el-table-column>
                     <el-table-column label="单价" width="40">
-                      <template slot-scope="scope">{{ scope.row.min_price }}</template>
+                      <template slot-scope="scope">
+                        <span v-if="scope.row.batch_retai_price >0">{{scope.row.batch_retai_price}}</span> 
+                        <span v-else>{{ scope.row.min_price }}</span> 
+                      </template>
                     </el-table-column>
                   </el-table>
                   <!-- <div>{{3*(2/3)}}</div> -->
                     </el-table-column>
                     <el-table-column label="库存" width="40">
                       <template slot-scope="scope">
-                                                <span
-                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
-                                                    {{ scope.row.stock_count }}
-                                                </span>
-                        <span v-else> {{ scope.row.total }}</span>
+                        <!-- <span
+                            v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
+                            {{ scope.row.stock_count }}
+                        </span>
+                        <span v-else> {{ scope.row.total }}</span> -->
+                        <span>{{scope.row.sum_count}}</span>
                       </template>
                     </el-table-column>
                     <el-table-column label="单价" width="40">
       this.$refs.additionalCharges.show()
     },
     selectDrugs(selection, row) {
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
-        if (row.count <= 0) {
+        if (row.sum_count <= 0) {
           if (selection) {
             selection.forEach(row => {
               if (row.count <= 0) {
           this.$message.error(row.drug_name + '库存不足')
           return
         }
-      } else {
-        if (row.total <= 0) {
-          if (selection) {
-            selection.forEach(row => {
-              if (row.total <= 0) {
-                this.$refs.multipleTable.toggleRowSelection(row)
-              }
-            })
-          } else {
-            this.$refs.multipleTable.clearSelection()
-          }
-          this.$message.error(row.drug_name + '库存不足')
-          return
-        }
-      }
+      // if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
+      //   if (row.count <= 0) {
+      //     if (selection) {
+      //       selection.forEach(row => {
+      //         if (row.count <= 0) {
+      //           this.$refs.multipleTable.toggleRowSelection(row)
+      //         }
+      //       })
+      //     } else {
+      //       this.$refs.multipleTable.clearSelection()
+      //     }
+      //     this.$message.error(row.drug_name + '库存不足')
+      //     return
+      //   }
+      // } else {
+      //   if (row.total <= 0) {
+      //     if (selection) {
+      //       selection.forEach(row => {
+      //         if (row.total <= 0) {
+      //           this.$refs.multipleTable.toggleRowSelection(row)
+      //         }
+      //       })
+      //     } else {
+      //       this.$refs.multipleTable.clearSelection()
+      //     }
+      //     this.$message.error(row.drug_name + '库存不足')
+      //     return
+      //   }
+      // }
       this.curDrugs = selection
     },
 
       this.teamList = row
     },
     selectChange(selection, row) {
-      console.log('row', row)
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
-        if (row.stock_count <= 0) {
-          if (row.type == 3) {
-            if (selection) {
-              selection.forEach(row => {
-                if (row.stock_count <= 0) {
-                  this.$refs.tables.toggleRowSelection(row)
-                }
-              })
-            } else {
-              this.$refs.tables.clearSelection()
-            }
-            this.$message.error(row.project_name + '库存不足')
-            return
-          }
-        }
-      } else {
-        if (row.total <= 0) {
-          if (row.type == 3) {
-            if (selection) {
-              selection.forEach(row => {
-                if (row.total <= 0) {
-                  this.$refs.tables.toggleRowSelection(row)
-                }
-              })
-            } else {
-              this.$refs.tables.clearSelection()
+      if(row.sum_count <=0){
+       if(selection){
+          selection.forEach(row => {
+            if (row.sum_count <= 0) {
+              this.$refs.tables.toggleRowSelection(row)
+            }else{
+               this.$refs.tables.clearSelection()
             }
-            this.$message.error(row.project_name + '库存不足')
-            return
-          }
-        }
+             this.$message.error(row.project_name + '库存不足')
+             return
+          })
+       }  
+      }
+      // if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
+      //   if (row.stock_count <= 0) {
+      //     if (row.type == 3) {
+      //       if (selection) {
+      //         selection.forEach(row => {
+      //           if (row.stock_count <= 0) {
+      //             this.$refs.tables.toggleRowSelection(row)
+      //           }
+      //         })
+      //       } else {
+      //         this.$refs.tables.clearSelection()
+      //       }
+      //       this.$message.error(row.project_name + '库存不足')
+      //       return
+      //     }
+      //   }
+      // } else {
+      //   if (row.total <= 0) {
+      //     if (row.type == 3) {
+      //       if (selection) {
+      //         selection.forEach(row => {
+      //           if (row.total <= 0) {
+      //             this.$refs.tables.toggleRowSelection(row)
+      //           }
+      //         })
+      //       } else {
+      //         this.$refs.tables.clearSelection()
+      //       }
+      //       this.$message.error(row.project_name + '库存不足')
+      //       return
+      //     }
+      //   }
 
-      }
+      // }
       this.teamList.push(row)
     },
     getlist() {
               total: project[i].total,
               is_special_diseases: project[i].disease_directory,
               project: project[i],
-              stock_count: 0
+              stock_count: 0,
+              sum_count:0,
+              batch_retai_price:0,
             }
 
             this.tabProject.push(obj)
 
           for (let i = 0; i < good_info.length; i++) {
             good_info[i].stock_count = 0
-            if (good_info[i].good_stock_in.length > 0) {
-              for (let j = 0; j < good_info[i].good_stock_in.length; j++) {
-                good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
-              }
+            if(good_info[i].batch_retai_price > 0){
+              good_info[i].packing_price = 0
+              good_info[i].packing_price = good_info[i].batch_retai_price
             }
             let obj = {
               id: good_info[i].id,
               total: good_info[i].total,
               is_special_diseases: good_info[i].is_special_diseases,
               good_info: good_info[i],
-              stock_count: good_info[i].stock_count
+              stock_count: good_info[i].stock_count,
+              sum_count:good_info[i].sum_count,
+              batch_retai_price:good_info[i].batch_retai_price
             }
             this.tabProject.push(obj)
           }
       })
     },
     selectTeam(row) {
-      console.log(row)
+      console.log("时间233232322322333232",row)
       // var arr = []
       // for (let i = 0; i < row.length; i++) {
       //   arr.push(row[i].item_id)

src/xt_pages/hospitalStation/doctorDesk.vue

             return false
           } else {
             var drugs = response.data.data.drugs
-            for(let i=0;i<drugs.length;i++){
-                drugs[i].count = 0
-              if(drugs[i].stock_in.length > 0){
-                 for(let j=0;j<drugs[i].stock_in.length;j++){
-                    drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
-                 }
-              }
-            }
+            // for(let i=0;i<drugs.length;i++){
+            //     drugs[i].count = 0
+            //   if(drugs[i].stock_in.length > 0){
+            //      for(let j=0;j<drugs[i].stock_in.length;j++){
+            //         drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
+            //      }
+            //   }
+            // }
+            
             this.drugs = drugs
             console.log("所有药品信息",this.drugs)
             this.allDrugs = response.data.data.drugs

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
+                                              <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
-                                              <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span>
+                                              <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span> -->
+                                                <span v-if="scope.row.sum_count/scope.row.min_number>0">{{ Math.floor(scope.row.sum_count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
+                                                <span v-if="scope.row.sum_count%scope.row.min_number>0"> {{ scope.row.sum_count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
 
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
-                                            <template slot-scope="scope">{{ scope.row.min_price }}</template>
+                                            <template slot-scope="scope">
+                                              <span v-if="scope.row.batch_retai_price >0">{{scope.row.batch_retai_price}}</span> 
+                                              <span v-else>{{ scope.row.min_price }}</span> 
+                                           </template>
                                         </el-table-column>
                                     </el-table>
                                     <!-- <div>{{3*(2/3)}}</div> -->
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
+                                              <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
                                                    {{scope.row.stock_count}}
                                               </span>
-                                              <span v-else> {{ scope.row.total }}</span>
+                                              <span v-else> {{ scope.row.total }}</span> -->
+                                              {{scope.row.sum_count}}
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
-                                            <template slot-scope="scope">{{ scope.row.price }}</template>
+                                            <template slot-scope="scope">
+                                              {{ scope.row.price }}
+                                            </template>
                                         </el-table-column>
                                     </el-table>
                                 </div>
         this.$refs.additionalCharges.show()
       },
       selectDrugs(selection, row) {
-        console.log('selection', selection)
-        console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
-            if (row.count <= 0) {
-              if (selection) {
-                selection.forEach(row => {
-                  if (row.count <= 0) {
-                    this.$refs.multipleTable.toggleRowSelection(row)
-                  }
-                })
-              } else {
-                this.$refs.multipleTable.clearSelection()
-              }
-              this.$message.error(row.drug_name + '库存不足')
-              return
-            }
-        }else{
-           if (row.total <= 0) {
-              if (selection) {
-                selection.forEach(row => {
-                  if (row.total <= 0) {
-                    this.$refs.multipleTable.toggleRowSelection(row)
-                  }
-                })
-              } else {
-                this.$refs.multipleTable.clearSelection()
+      if (row.sum_count <= 0) {
+          if (selection) {
+            selection.forEach(row => {
+              if (row.count <= 0) {
+                this.$refs.multipleTable.toggleRowSelection(row)
               }
-              this.$message.error(row.drug_name + '库存不足')
-              return
-            }
-        }
+            })
+          } else {
+            this.$refs.multipleTable.clearSelection()
+          }
+          this.$message.error(row.drug_name + '库存不足')
+          return
+       }
+        // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
+        //     if (row.count <= 0) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.count <= 0) {
+        //             this.$refs.multipleTable.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.multipleTable.clearSelection()
+        //       }
+        //       this.$message.error(row.drug_name + '库存不足')
+        //       return
+        //     }
+        // }else{
+        //    if (row.total <= 0) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.total <= 0) {
+        //             this.$refs.multipleTable.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.multipleTable.clearSelection()
+        //       }
+        //       this.$message.error(row.drug_name + '库存不足')
+        //       return
+        //     }
+        // }
 
         this.curDrugs = selection
       },
                   single_dose: temp[b].single_dose,
                   delivery_way: temp[b].delivery_way,
                   execution_frequency: temp[b].execution_frequency,
-                  retail_price: temp[b].prescribing_number_unit == temp[b].max_unit ? temp[b].retail_price.toString() : temp[b].min_price.toString(),
+                  retail_price: temp[b].prescribing_number_unit == temp[b].max_unit ? temp[b].retail_price.toString() : temp[b].batch_retai_price.toString(),
                   remark: '',
                   day: temp[b].drug_day ? temp[b].drug_day : 1,
                   prescribing_number: temp[b].prescribing_number,
         this.teamList = row
       },
       selectChange(selection, row) {
-        console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
-           if (row.stock_count <= 0) {
-            if (row.type == 3) {
-              if (selection) {
-                selection.forEach(row => {
-                  if (row.stock_count <= 0) {
-                    this.$refs.tables.toggleRowSelection(row)
-                  }
-                })
-              } else {
-                this.$refs.tables.clearSelection()
-              }
-              this.$message.error(row.project_name + '库存不足')
-              return
-            }
-          }
-        }else{
-           if (row.total <= 0) {
-            if (row.type == 3) {
-              if (selection) {
-                selection.forEach(row => {
-                  if (row.total <= 0) {
-                    this.$refs.tables.toggleRowSelection(row)
-                  }
-                })
-              } else {
-                this.$refs.tables.clearSelection()
-              }
-              this.$message.error(row.project_name + '库存不足')
-              return
-            }
-          }
-
-        }
+        if(row.sum_count <=0){
+          if(selection){
+              selection.forEach(row => {
+                if (row.sum_count <= 0) {
+                  this.$refs.tables.toggleRowSelection(row)
+                }else{
+                  this.$refs.tables.clearSelection()
+                }
+                this.$message.error(row.project_name + '库存不足')
+                return
+              })
+          }  
+        }
+        // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
+        //    if (row.stock_count <= 0) {
+        //     if (row.type == 3) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.stock_count <= 0) {
+        //             this.$refs.tables.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.tables.clearSelection()
+        //       }
+        //       this.$message.error(row.project_name + '库存不足')
+        //       return
+        //     }
+        //   }
+        // }else{
+        //    if (row.total <= 0) {
+        //     if (row.type == 3) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.total <= 0) {
+        //             this.$refs.tables.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.tables.clearSelection()
+        //       }
+        //       this.$message.error(row.project_name + '库存不足')
+        //       return
+        //     }
+        //   }
 
+        // }
         this.teamList.push(row)
       },
       getlist() {
                 is_special_diseases: project[i].disease_directory,
                 project: project[i],
                 stock_count:0,
+                sum_count:0,
+                batch_retai_price:0,
               }
 
               this.tabProject.push(obj)
             }
 
             var good_info = response.data.data.good_info
-
+            console.log("good_info2323232323232323",good_info)
 
             for (let i = 0; i < good_info.length; i++) {
                good_info[i].stock_count = 0
-              if(good_info[i].good_stock_in.length >0 ){
-                for(let j=0;j<good_info[i].good_stock_in.length;j++){
-                   good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
-                }
-              }
-               console.log("耗材列表2323232322332",good_info)
+               
+               if(good_info[i].batch_retai_price > 0){
+                  good_info[i].packing_price = 0
+                  good_info[i].packing_price = good_info[i].batch_retai_price
+               }
               let obj = {
                 id: good_info[i].id,
                 project_name: good_info[i].good_name,
                 is_special_diseases: good_info[i].is_special_diseases,
                 good_info: good_info[i],
                 stock_count:good_info[i].stock_count,
+                sum_count:good_info[i].sum_count,
+                batch_retai_price:good_info[i].batch_retai_price
               }
               this.tabProject.push(obj)
             }
-
+           
+            console.log("猎豹33323232323223323223233223",this.tabProject)
             this.allProject = this.tabProject
 
           }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

           return false
         } else {
           var drugs = response.data.data.drugs
-          for (let i = 0; i < drugs.length; i++) {
-            drugs[i].count = 0
-            if (drugs[i].stock_in != null) {
-              if (drugs[i].stock_in.length > 0) {
-                for (let j = 0; j < drugs[i].stock_in.length; j++) {
-                  drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
-                }
-              }
-            }
-          }
+          // for (let i = 0; i < drugs.length; i++) {
+          //   drugs[i].count = 0
+          //   if (drugs[i].stock_in != null) {
+          //     if (drugs[i].stock_in.length > 0) {
+          //       for (let j = 0; j < drugs[i].stock_in.length; j++) {
+          //         drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
+          //       }
+          //     }
+          //   }
+          // }
+          // if(drugs.){
+
+          // }
           this.drugs = drugs
           console.log('五一劳动节2332323322332', this.drugs)