瀏覽代碼

518合并代码

XMLWAN 2 年之前
父節點
當前提交
bd3848debe

+ 8 - 0
src/api/stock.js 查看文件

1057
     params: params
1057
     params: params
1058
   })
1058
   })
1059
 }
1059
 }
1060
+
1061
+export function getPrintList(params) {
1062
+  return request({
1063
+    url: '/api/stock/getprintlist',
1064
+    method: 'get',
1065
+    params: params
1066
+  })
1067
+}

+ 1 - 2
src/xt_pages/stock/drugs/drugStockInOrderAdd.vue 查看文件

641
           this.form.manufacturer = 0;
641
           this.form.manufacturer = 0;
642
           this.form.dealer = 0;
642
           this.form.dealer = 0;
643
           this.list = response.data.data.list;
643
           this.list = response.data.data.list;
644
-          this.storehouse_id =
645
-            response.data.data.configlist.drug_storehouse_info;
644
+          this.storehouse_id =response.data.data.configlist.drug_storehouse_info;
646
         }
645
         }
647
         loading.close();
646
         loading.close();
648
       });
647
       });

+ 1 - 1
src/xt_pages/stock/inventoryDetails.vue 查看文件

130
     },
130
     },
131
     methods:{
131
     methods:{
132
         toprint(){
132
         toprint(){
133
-          this.$router.push({path:'/stock/print_all'})
133
+          this.$router.push({path:'/stock/print_all?storehouse_id='+this.storehouse_id+"&good_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page})
134
         },
134
         },
135
 
135
 
136
         search(){
136
         search(){

+ 17 - 9
src/xt_pages/stock/print_all.vue 查看文件

55
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
55
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
56
 const moment = require('moment');
56
 const moment = require('moment');
57
 import { uParseTime } from '@/utils/tools'
57
 import { uParseTime } from '@/utils/tools'
58
-import { getInventoryExportList } from "@/api/stock"
58
+import { getPrintList } from "@/api/stock"
59
 import print from "print-js";
59
 import print from "print-js";
60
 export default {
60
 export default {
61
     components:{
61
     components:{
72
           ids:"",
72
           ids:"",
73
           tableData:[],
73
           tableData:[],
74
           manufacturerList:[],
74
           manufacturerList:[],
75
+          houseList:[],
75
         }
76
         }
76
     },
77
     },
77
     methods:{
78
     methods:{
96
          }
97
          }
97
         },
98
         },
98
         getlist(){
99
         getlist(){
99
-        //  getInventoryExportList().then(response=>{
100
-        //    if(response.data.state == 1){
101
-        //      var list =  response.data.data.list
102
-        //      console.log("list233233232323",list)
103
-        //      this.tableData = list
104
-        //      this.manufacturerList = response.data.data.manufacturerList
105
-        //    }
106
-        //  })
100
+          var params = {
101
+            storehouse_id:this.$route.query.storehouse_id,
102
+            good_name:this.$route.query.good_name,
103
+            limit:this.$route.query.limit,
104
+            page:this.$route.query.page,
105
+          }
106
+         getPrintList(params).then(response=>{
107
+           if(response.data.state == 1){
108
+             var list =  response.data.data.list
109
+             console.log("list233233232323",list)
110
+             this.tableData = list
111
+             this.houseList = response.data.data.houseList
112
+           }
113
+         })
107
         },
114
         },
108
         getManufacturerName(id){
115
         getManufacturerName(id){
109
            var name = ""
116
            var name = ""
116
         }
123
         }
117
     },
124
     },
118
     created(){
125
     created(){
126
+
119
       this.getlist()
127
       this.getlist()
120
     }
128
     }
121
 }
129
 }