Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/stock/drugs/drugInventoryModePrint.vue

@@ -18,25 +18,41 @@
                     </thead>
                     <tbody class="print_body">
                     <tr>
-                        <td align="center">药品名称</td>
-                        <td align="center">规格</td>
-                        <td align="center">本月入库数量</td>
-                        <td align="center">本月出库数量</td>
-                        <td align="center">本月剩余库存</td>
-                        <td align="center">批号</td>
-                        <td align="center">生产日期</td> 
-                        <td align="center">有效日期</td>
-                        <td align="center">生产厂商</td>
-                        <td align="center">盘点数量</td>
+                        <td align="center" style="width: 50px;">序号</td>
+                        <td align="center" style="width: 200px;">药品名称</td>
+                        <td align="center" style="width: 200px;">规格</td>
+                        <td align="center" style="width: 200px;">上期结余数量</td>
+                        <td align="center" style="width: 200px;">本月入库数量</td>
+                        <td align="center" style="width: 200px;">进货金额</td>
+                        <td align="center" style="width: 200px;">本月入库总金额</td>
+                        <td align="center" style="width: 200px;">本月出库数量</td>
+                        <td align="center" style="width: 200px;">销售价</td>
+                        <td align="center" style="width: 200px;">本月销售总金额</td>
+                        <td align="center" style="width: 200px;">本月剩余库存</td>
+                        <td align="center" style="width: 200px;">进货价</td>
+                        <td align="center" style="width: 200px;">本月剩余总金额</td>
+                        <td align="center" style="width: 200px;">批号</td>
+                        <td align="center" style="width: 200px;">生产日期</td> 
+                        <td align="center" style="width: 200px;">有效日期</td>
+                        <td align="center" style="width: 200px;">生产厂商</td>
+                        <td align="center" style="width: 200px;">盘点数量</td>
                        
                     </tr>
 
                     <tr v-for="(item,index) in tableList" :key="index">
+                        <td align="center" style="width: 50px;">序号</td>
                         <td align="center">{{ item.drug_name }}</td>
                         <td align="center">{{ item.specification_name }}</td>
+                        <td align="center" style="width: 200px;">上期结余数量</td>
                         <td align="center">{{ getInCount(item.drug_id,item.min_number,item.min_unit,item.max_unit) }}</td>
+                        <td align="center" style="width: 200px;">进货金额</td>
+                        <td align="center" style="width: 200px;">本月入库总金额</td>
                         <td align="center">{{ getOutCount(item.drug_id,item.min_number,item.min_unit,item.max_unit) }}</td> 
+                        <td align="center" style="width: 200px;">销售价</td>
+                        <td align="center" style="width: 200px;">本月销售总金额</td>
                         <td align="center">{{ getSumCount(item.sum_count,item.min_number,item.min_unit,item.max_unit) }}</td>
+                        <td align="center" style="width: 200px;">进货价</td>
+                        <td align="center" style="width: 200px;">本月剩余总金额</td>
                         <td align="center">
                             <table
                                 class="ware_table"
@@ -226,7 +242,11 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
           manufacturerList:[],
           infoList:[],
           drugList:[],
-          outList:[]
+          outList:[],
+          warehouseInfoFlow:[],
+          warehouseOutFlow:[],
+          cancelFlow:[],
+
        }
      },
      methods:{
@@ -282,6 +302,16 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                       min_unit:item.min_unit,
                       max_unit:item.max_unit,
                       sum_count:item.sum_count,
+                      last_over:0, //上期结余数量
+                      month_in_total:0,//本月入库数量
+                      buy_price:0,//进货金额
+                      month_in_total_price:0,//本月入库总金额
+                      month_out_total:0,//本月出库数量,
+                      packing_price:0,//销售价,
+                      month_out_total_price:0,//本月销售总金额,
+                      month_over_total:0,//本月剩余库存
+                      month_over_total_price:0,
+                      is_total:0,
                     }
                   }
                 })
@@ -307,6 +337,10 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
 
               
                  this.drugList = response.data.data.drugList
+
+                 this.warehouseInfoFlow = response.data.data.warehouseInfoFlow
+                 this.warehouseOutFlow = response.data.data.warehouseOutFlow
+                 this.cancelFlow = response.data.data.cancelFlow
               }
           })
         },