518合并代码

src/api/stock.js

@@ -1057,3 +1057,11 @@ export function checkRturnStockWarehouseInfo(params) {
     params: params
   })
 }
+
+export function getPrintList(params) {
+  return request({
+    url: '/api/stock/getprintlist',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -641,8 +641,7 @@ export default {
           this.form.manufacturer = 0;
           this.form.dealer = 0;
           this.list = response.data.data.list;
-          this.storehouse_id =
-            response.data.data.configlist.drug_storehouse_info;
+          this.storehouse_id =response.data.data.configlist.drug_storehouse_info;
         }
         loading.close();
       });

src/xt_pages/stock/inventoryDetails.vue

@@ -130,7 +130,7 @@ export default {
     },
     methods:{
         toprint(){
-          this.$router.push({path:'/stock/print_all'})
+          this.$router.push({path:'/stock/print_all?storehouse_id='+this.storehouse_id+"&good_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page})
         },
 
         search(){

src/xt_pages/stock/print_all.vue

@@ -55,7 +55,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
-import { getInventoryExportList } from "@/api/stock"
+import { getPrintList } from "@/api/stock"
 import print from "print-js";
 export default {
     components:{
@@ -72,6 +72,7 @@ export default {
           ids:"",
           tableData:[],
           manufacturerList:[],
+          houseList:[],
         }
     },
     methods:{
@@ -96,14 +97,20 @@ export default {
          }
         },
         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
-        //    }
-        //  })
+          var params = {
+            storehouse_id:this.$route.query.storehouse_id,
+            good_name:this.$route.query.good_name,
+            limit:this.$route.query.limit,
+            page:this.$route.query.page,
+          }
+         getPrintList(params).then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("list233233232323",list)
+             this.tableData = list
+             this.houseList = response.data.data.houseList
+           }
+         })
         },
         getManufacturerName(id){
            var name = ""
@@ -116,6 +123,7 @@ export default {
         }
     },
     created(){
+
       this.getlist()
     }
 }