diff --git a/src/api/basicdata/basicdataTray.js b/src/api/basicdata/basicdataTray.js
index 6ee67a91..5a184131 100644
--- a/src/api/basicdata/basicdataTray.js
+++ b/src/api/basicdata/basicdataTray.js
@@ -6,11 +6,11 @@ export const getList = (current, size, params) => {
url: '/api/logpm-basicdata/tray/list',
method: 'get',
params: {
- ...params,
current,
size,
- }
- })
+ ...params,
+ },
+ });
}
export const getpackList = (current, size, params) => {
return request({
diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue
index c87b783e..c8a4aadf 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTray.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue
@@ -37,7 +37,9 @@
>查看二维码
报 损
- 禁 用
+ 禁 用
+
启 用
一 键 空 置
@@ -510,6 +512,7 @@ export default {
},
searchReset() {
this.query = {};
+ console.log('123123123');
this.onLoad(this.page);
},
searchChange(params, done) {
@@ -523,6 +526,7 @@ export default {
},
selectionClear() {
this.selectionList = [];
+ console.log(this.query,'query');
this.$refs.crud.toggleSelection();
},
currentChange(currentPage) {
@@ -537,13 +541,14 @@ export default {
onLoad(page, params = {}) {
this.loading = true;
- const { warehouseId, trayStatus, type, palletCode } = this.query;
+ const { warehouseId, trayStatus, type, palletCode,palletName } = this.query;
let values = {
warehouseId: warehouseId,
trayStatus: trayStatus,
type: type,
palletCode: palletCode,
+ palletName:palletName
};
getList(page.currentPage, page.pageSize, values).then(res => {
@@ -558,23 +563,23 @@ export default {
};
-
diff --git a/vite.config.js b/vite.config.js
index 41baec6d..c695de61 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -17,12 +17,10 @@ export default ({ mode, command }) => {
// target: 'http://192.168.10.48:8888',
// lmy
// target: 'http://192.168.10.123:8889',
- // target: 'http://192.168.10.101:8888',
- // target: 'http://192.168.10.75:8777',
// cyz
- // target: 'http://192.168.10.94:8888',
+ target: 'http://192.168.10.75:8777',
// tjj
- target: 'http://192.168.10.29:13000',
+ // target: 'http://192.168.10.29:13000',
// sst
// target: 'http://192.168.10.94:8888',
// target: 'http://192.168.10.29:13000',