518合并代码

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -133,6 +133,7 @@ export default {
             limit:10,
             page:1,
             storehouse_id:0,
+            houseList:[],
         }
     },
     methods:{
@@ -143,7 +144,7 @@ export default {
             this.$router.push({path:'/stock/drugs/inventoryPrint'}) 
         },
         print_1(){
-           this.$router.push({path:'/stock/drugs/print'}) 
+           this.$router.push({path:'/stock/drugs/print?storehouse_id='+this.storehouse_id+"&drug_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page}) 
         },
         handleSizeChange(val){
          this.limit = val

src/xt_pages/stock/drugs/print.vue

@@ -32,17 +32,27 @@
                         
                     </tr>
                     <tr v-for="(item,index) in tableData" :key="index">
-                        <td>{{item.good_name}}</td>
+                        <td>{{item.drug_name}}</td>
                         <td>{{item.specification_name}}</td>
-                        <td>{{item.packing_unit}}</td>
-                        <td>{{item.number}}</td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
+                        <td>{{item.warehousing_unit}}</td>
+                        <td>{{getNumber(item.id)}}</td>
+                        <td>{{item.manufacturer}}</td>
+                        <td>{{item.storehouse_id}}</td>
+                        <td> 
+                            <span v-if="item.stock_max_number>0">{{item.stock_max_number}}{{item.warehousing_unit}} </span>  
+                            <span v-if="item.stock_min_number>0">{{item.stock_min_number}}{{item.min_unit}}</span>
+                            <span v-if="item.stock_max_number == 0 && item.stock_min_number == 0">0</span></td>
+                        <td>
+                            <span v-if="item.last_stock_max_number > 0">{{item.last_stock_max_number}}{{item.warehousing_unit}}</span>  
+                            <span v-if="item.last_stock_min_number>0">{{item.last_stock_min_number}}{{item.min_unit}}</span>
+                            <span v-if="item.last_stock_max_number == 0 && item.last_stock_min_number == 0">0</span>
+                        </td>
+                        <td>
+                          <span v-if="item.inventory_type == 10">盘盈</span>
+                          <span v-if="item.inventory_type == 11">盘亏</span>  
+                        </td>
+                        <td>{{getPrice(item.id)}}</td>
+                        <td>{{getTotalPrice(item.last_stock_max_number,item.last_stock_min_number,item.min_number,item.id)}}</td>
                     </tr>
                     </tbody>
                 </table>
@@ -55,7 +65,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
-import { getInventoryExportList } from "@/api/stock"
+import { getInventoryDetailList } from "@/api/drug/drug"
 import print from "print-js";
 export default {
     components:{
@@ -72,6 +82,8 @@ export default {
           ids:"",
           tableData:[],
           manufacturerList:[],
+          houseList:[],
+          inventoryList:[],
         }
     },
     methods:{
@@ -95,15 +107,23 @@ export default {
             return uParseTime(val, '{y}-{m}-{d}')
          }
         },
-        getlist(){
-         getInventoryExportList().then(response=>{
-           if(response.data.state == 1){
-             var list =  response.data.data.list
-             console.log("list233233232323",list)
-             this.tableData = list
-             this.manufacturerList = response.data.data.manufacturerList
-           }
-         })
+       getlist(){
+            var params = {
+              limit:this.$route.query.limit,
+              page:this.$route.query.page,
+              keyword:this.$route.query.drug_name,
+              storehouse_id:this.$route.query.storehouse_id,
+            }
+          getInventoryDetailList(params).then(response=>{
+             if(response.data.state == 1){
+              this.total =  response.data.data.total
+              this.tableData = response.data.data.list
+              this.houseList = response.data.data.houseList
+              this.inventoryList = response.data.data.inventoryList
+              console.log("hhahhh2o2o233oo2332",this.inventoryList)
+              
+             }
+          })   
         },
         getManufacturerName(id){
 
@@ -114,7 +134,40 @@ export default {
               }
            }
            return name
-        }
+        },
+        getNumber(id){
+          var number = ""
+          for(let i=0;i<this.inventoryList.length;i++){
+            if(id == this.inventoryList[i].id){
+                number = this.inventoryList[i].drug_warehouse_info.batch_number
+            }
+          }
+          return number
+         },
+         getTotalPrice(last_stock_max_number,last_stock_min_number,min_number,id){
+           var retail_price = 0
+           var totail_price =0
+           for(let i=0;i<this.inventoryList.length;i++){
+            if(id == this.inventoryList[i].id){
+              retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+            }
+          }
+         var totail_price = last_stock_max_number * min_number * retail_price + last_stock_min_number * retail_price 
+          if(totail_price > 0){
+             return totail_price
+          }else{
+            return ""
+          }
+         },
+         getPrice(id){
+           var retail_price = 0
+           for(let i=0;i<this.inventoryList.length;i++){
+            if(id == this.inventoryList[i].id){
+              retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+            }
+          }
+          return retail_price
+         }
     },
     created(){
 

src/xt_pages/stock/print_all.vue

@@ -36,13 +36,16 @@
                         <td>{{item.specification_name}}</td>
                         <td>{{item.packing_unit}}</td>
                         <td>{{item.number}}</td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
+                        <td>{{item.manufacturer}}</td>
+                        <td>{{getHouseName(item.storehouse_id)}}</td>
+                        <td>{{item.stock_count}}</td>
+                        <td>{{item.last_stock_count}}</td>
+                        <td>  
+                          <span v-if="item.stock_count > item.last_stock_count">盘亏</span>
+                          <span v-if="item.stock_count < item.last_stock_count">盘盈</span>
+                        </td>
+                        <td>{{item.buy_price}}</td>
+                        <td>{{(item.last_stock_count * item.buy_price).toFixed(2)}}</td>
                     </tr>
                     </tbody>
                 </table>
@@ -120,7 +123,20 @@ export default {
               }
            }
            return name
-        }
+        },
+        getHouseName(id){
+         var storehouse_name = ""
+         for(let i=0;i<this.houseList.length;i++){
+           if(id == this.houseList[i].id){
+              storehouse_name = this.houseList[i].storehouse_name
+           }
+         }
+         if(storehouse_name == "全部"){
+           return ""
+         }else{
+           return storehouse_name
+         }
+       }
     },
     created(){
 

src/xt_pages/stock/stockPrint.vue

@@ -46,13 +46,6 @@
                                    <td>
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
                                    </td>
-<<<<<<< Updated upstream
-=======
-                                   <td v-if="end_time == ''"  style="text-align:center">
-                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265">
-                                      </span>
-                                   </td>
->>>>>>> Stashed changes
                                    <td v-if="end_time == ''">
                                       <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265 || org_id == 10210">
                                         <span>