From cd8ae0c40f3cfcc98b74458356f876797c384f86 Mon Sep 17 00:00:00 2001
From: 13208366016 <47278630@qq.com>
Date: Fri, 10 Nov 2023 11:23:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=98=E7=9B=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicdata/basicdataTray.js            |  6 ++--
 .../warehouse/tray/basicdataTray.vue          | 35 +++++++++++--------
 vite.config.js                                |  6 ++--
 3 files changed, 25 insertions(+), 22 deletions(-)

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 @@
           >查看二维码
         </el-button>
         <el-button type="warning" plain icon="el-icon-edit" @click="lossess">报 损 </el-button>
-        <el-button type="warning" plain icon="el-icon-circle-close" @click="disable">禁 用 </el-button>
+        <el-button type="warning" plain icon="el-icon-circle-close" @click="disable"
+          >禁 用
+        </el-button>
         <el-button type="warning" plain icon="el-icon-check" @click="addable">启 用 </el-button>
         <el-button type="warning" plain icon="el-icon-refresh" @click="vacants"
           >一 键 空 置
@@ -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 {
 };
 </script>
 
-<style scoped lang='scss'>
-:deep(.avue-form__row){
-  margin-left:10px;
-  max-width:300px!important;
+<style scoped lang="scss">
+:deep(.avue-form__row) {
+  margin-left: 10px;
+  max-width: 300px !important;
 }
-:deep(.no-print){
-  margin-left:auto;
+:deep(.no-print) {
+  margin-left: auto;
 }
-:deep(.el-form-item__label){
-  width:auto !important;
+:deep(.el-form-item__label) {
+  width: auto !important;
 }
-:deep(.avue-form__row){
-  margin-left:0;
+:deep(.avue-form__row) {
+  margin-left: 0;
 }
-:deep(.no-print){
-  .el-button{
-     margin-right:0
+:deep(.no-print) {
+  .el-button {
+    margin-right: 0;
   }
 }
 </style>
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',