|
@@ -46,7 +46,7 @@
|
46
|
46
|
style="width: 200px;margin-left:10px;"
|
47
|
47
|
class="filter-item"
|
48
|
48
|
v-model.trim="keywords"
|
49
|
|
- placeholder="耗材名称/商品编码/商品名称/规格名称"
|
|
49
|
+ placeholder="耗材名称"
|
50
|
50
|
/>
|
51
|
51
|
<el-button
|
52
|
52
|
size="small"
|
|
@@ -288,7 +288,7 @@ export default {
|
288
|
288
|
},
|
289
|
289
|
options:[],
|
290
|
290
|
value:"",
|
291
|
|
- type_name:"",
|
|
291
|
+ type_name:0,
|
292
|
292
|
types:[],
|
293
|
293
|
tableList:[],
|
294
|
294
|
manufacturerList:[]
|
|
@@ -391,12 +391,11 @@ export default {
|
391
|
391
|
},
|
392
|
392
|
handleSizeChange(val) {
|
393
|
393
|
this.limit = val;
|
394
|
|
- // this.GetAllStockQuery();
|
|
394
|
+
|
395
|
395
|
this.getlist()
|
396
|
396
|
},
|
397
|
397
|
handleCurrentChange(val) {
|
398
|
398
|
this.page = val;
|
399
|
|
- // this.GetAllStockQuery();
|
400
|
399
|
this.getlist()
|
401
|
400
|
},
|
402
|
401
|
calculate: function(val) {
|
|
@@ -410,7 +409,6 @@ export default {
|
410
|
409
|
this.start_time = "";
|
411
|
410
|
} else {
|
412
|
411
|
this.start_time = val
|
413
|
|
- // this.GetAllStockQuery();
|
414
|
412
|
this.getlist()
|
415
|
413
|
}
|
416
|
414
|
},
|
|
@@ -421,7 +419,6 @@ export default {
|
421
|
419
|
this.end_time = "";
|
422
|
420
|
} else {
|
423
|
421
|
this.end_time = val
|
424
|
|
- // this.GetAllStockQuery();
|
425
|
422
|
this.getlist()
|
426
|
423
|
}
|
427
|
424
|
|
|
@@ -460,7 +457,6 @@ export default {
|
460
|
457
|
showStockOutDetailDialog: function() {},
|
461
|
458
|
showCancelStockDetailDialog: function() {},
|
462
|
459
|
search: function() {
|
463
|
|
- // this.GetAllStockQuery();
|
464
|
460
|
this.getlist()
|
465
|
461
|
},
|
466
|
462
|
|
|
@@ -519,18 +515,20 @@ export default {
|
519
|
515
|
const params = {
|
520
|
516
|
page: this.page,
|
521
|
517
|
limit: this.limit,
|
522
|
|
- keyword: this.keywords,
|
|
518
|
+ keywords: this.keywords,
|
523
|
519
|
start_time:this.start_time,
|
524
|
520
|
end_time:this.end_time,
|
525
|
521
|
type_name:this.type_name,
|
526
|
522
|
};
|
527
|
|
-
|
|
523
|
+ console.log("params",params)
|
528
|
524
|
getAllStockList(params).then(response=>{
|
529
|
525
|
if(response.data.state == 1){
|
530
|
526
|
var list = response.data.data.list
|
531
|
527
|
console.log("list22222",list)
|
532
|
528
|
this.tableList = list
|
533
|
529
|
var total = response.data.data.total
|
|
530
|
+ console.log("total",total)
|
|
531
|
+ this.total = total
|
534
|
532
|
var manufacturerList = response.data.data.manufacturerList
|
535
|
533
|
this.manufacturerList = manufacturerList
|
536
|
534
|
}
|