|
|
@@ -23,18 +23,17 @@
|
|
|
>
|
|
|
<!-- 表头工具栏 -->
|
|
|
<template v-slot:toolbar="{ row }">
|
|
|
-
|
|
|
<div class="upload">
|
|
|
- <el-button
|
|
|
- v-if="selectedDime == 3"
|
|
|
- size="small"
|
|
|
- :disabled="checkRadioData.length == 0"
|
|
|
- icon="el-icon-set-up"
|
|
|
- class="ele-btn-icon"
|
|
|
- @click="allPrinting()"
|
|
|
- >
|
|
|
- 打印条码
|
|
|
- </el-button>
|
|
|
+ <el-button
|
|
|
+ v-if="selectedDime == 3"
|
|
|
+ size="small"
|
|
|
+ :disabled="checkRadioData.length == 0"
|
|
|
+ icon="el-icon-set-up"
|
|
|
+ class="ele-btn-icon"
|
|
|
+ @click="allPrinting()"
|
|
|
+ >
|
|
|
+ 打印条码
|
|
|
+ </el-button>
|
|
|
|
|
|
<!-- <el-upload
|
|
|
v-if="!isLoading"
|
|
|
@@ -55,7 +54,7 @@
|
|
|
>
|
|
|
</slot>
|
|
|
</el-upload> -->
|
|
|
-
|
|
|
+
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
@@ -688,11 +687,13 @@
|
|
|
...where,
|
|
|
...order
|
|
|
};
|
|
|
- const data = storageApi.getBatchList({
|
|
|
- ...params,
|
|
|
+ this.params = {
|
|
|
+ ...params,
|
|
|
pageNum: page,
|
|
|
size: limit
|
|
|
- });
|
|
|
+ };
|
|
|
+ console.log('this.params----', this.params);
|
|
|
+ const data = storageApi.getBatchList( this.params );
|
|
|
return data;
|
|
|
} else if (dimension == 4) {
|
|
|
// 物料维度
|
|
|
@@ -731,12 +732,12 @@
|
|
|
...order
|
|
|
};
|
|
|
}
|
|
|
- this.params = {
|
|
|
+
|
|
|
+ const data = storageApi.getPackingList({
|
|
|
...params,
|
|
|
pageNum: page,
|
|
|
size: limit
|
|
|
- };
|
|
|
- const data = storageApi.getPackingList( this.params);
|
|
|
+ });
|
|
|
return data;
|
|
|
}
|
|
|
},
|
|
|
@@ -852,7 +853,7 @@
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
|
.upload {
|
|
|
- display:flex;
|
|
|
+ display: flex;
|
|
|
width: 100%;
|
|
|
margin-left: 10px;
|
|
|
}
|