From 83e4d29faeccce9b420268f55c1abadbb7216f17 Mon Sep 17 00:00:00 2001
From: liyang <1260016348@qq.com>
Date: Wed, 3 Apr 2024 14:41:00 +0800
Subject: [PATCH] no message

---
 wms-vue/src/App.vue                           |  2 +-
 wms-vue/src/components/Login.vue              | 27 ++++---------------
 .../components/duochaxun/Zhengliqingdan.vue   | 22 ++++++++-------
 wms-vue/src/router/router.js                  |  5 ++++
 .../wms/service/impl/ZhengliqingdanImpl.java  |  3 ++-
 wms/src/main/resources/application.yml        |  2 +-
 6 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/wms-vue/src/App.vue b/wms-vue/src/App.vue
index ccd15ce..104fe32 100644
--- a/wms-vue/src/App.vue
+++ b/wms-vue/src/App.vue
@@ -14,6 +14,6 @@ export default {
 
 <style>
 #app {
-  height: 100%;
+  height: 98%;
 }
 </style>
diff --git a/wms-vue/src/components/Login.vue b/wms-vue/src/components/Login.vue
index eea5036..e411323 100644
--- a/wms-vue/src/components/Login.vue
+++ b/wms-vue/src/components/Login.vue
@@ -2,29 +2,7 @@
   <div class="loginDiv">
     <div class="login-box">
       <h2>智能仓储WMS</h2>
-      <form>
 
-        <div class="user-box">
-          <input type="text" name="" required="" v-model="ruleForm.userNo" @keyup.enter="login"/>
-          <label>账号</label>
-        </div>
-        <div class="user-box">
-          <input type="password" name="" required="" v-model="ruleForm.passWord" @keyup.enter="login"/>
-          <label>密码</label>
-        </div>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        <a href="javascript:"
-           @click="login"
-        >
-          <span></span>
-          <span></span>
-          <span></span>
-          <span></span>
-          登录
-        </a>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        <a>注册 </a>
-      </form>
     </div>
   </div>
 </template>
@@ -41,8 +19,13 @@ export default {
 
     }
   },
+  mounted() {
+    this.login()
+  },
   methods: {
     login() {
+      this.ruleForm.userNo="admin"
+      this.ruleForm.passWord="123"
       if (this.ruleForm.userNo == null || this.ruleForm.userNo.length <= 0) {
         this.$message({
           message: '请输入账号',
diff --git a/wms-vue/src/components/duochaxun/Zhengliqingdan.vue b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
index c9a7924..0e453ca 100644
--- a/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
+++ b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="div1">
+  <div class="div1" style="height: 100%">
 
     <div class="div2" style="padding-bottom: 10px">
 
@@ -225,7 +225,8 @@
 
 
     <el-table
-        :max-height="MaxHeight"
+        v-loading="this.tableloding"
+        :max-height="480"
         :header-cell-style="{background:'#000',color:'#fff'}"
         :data="tableData"
         id="educe-table"
@@ -498,6 +499,7 @@ export default {
 
     };
     return {
+      tableloding:false,
       pickerOptions: {
         shortcuts: [{
           text: '最近一周',
@@ -563,7 +565,6 @@ export default {
         //容器码
         LP: ''
       },
-      MaxHeight: '',
       plant: [],
       loc: [],
       name: [],
@@ -601,9 +602,10 @@ export default {
     this.Plant();
     this.Loc();
     this.z_Name();
-    this.$nextTick(()=> {
-      this.MaxHeight = window.innerHeight - 300;//300是页面中除了表格外其他组件的高度
-    })
+    // this.$nextTick(()=> {
+    //
+    //   this.MaxHeight = window.innerHeight - 220;//300是页面中除了表格外其他组件的高度
+    // })
   },
   methods: {
     handleEdit(index, row) {
@@ -672,6 +674,7 @@ export default {
           })
     },
     queryUser() {
+      this.tableloding=true
       //列表数据加载
       this.$axios.post(this.$httpUrl + '/Zhengliqingdan/queryWhere', {
         pageSize: this.pageSize,
@@ -679,15 +682,16 @@ export default {
         param: this.param,
       }).then(res => res.data)
           .then(res => {
+            this.tableloding=false
             if (res.code == 200) {
               this.tableData = res.data
               this.total = res.total
             } else {
               this.$message.error('获取数据失败');
             }
-          })
-          .catch(function (err) {
-            console.log(err);
+            // eslint-disable-next-line no-unused-vars
+          },err =>{
+            this.tableloding=false
           })
     },
     find(){
diff --git a/wms-vue/src/router/router.js b/wms-vue/src/router/router.js
index b80d6ea..227a9b7 100644
--- a/wms-vue/src/router/router.js
+++ b/wms-vue/src/router/router.js
@@ -6,6 +6,11 @@ const routes=[
         name:'login',
         component: () => import('../components/Login')
     },
+    {
+        path:'/',
+        name:'login',
+        component: () => import('../components/Login')
+    },
     {
         path:'/index',
         name:'index',
diff --git a/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java b/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java
index 6130be7..e2980de 100644
--- a/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java
+++ b/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java
@@ -46,8 +46,9 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
 
         //查询条件
         //采购单号
+        System.out.println(zhengliqingdan.sourceId.trim()==null);
         if(zhengliqingdan.sourceId!=null&&!zhengliqingdan.sourceId.equals("")){
-            sql+=" and ad.sourceId="+"'"+zhengliqingdan.sourceId+"'";
+            sql+=" and ad.sourceId="+"'"+zhengliqingdan.sourceId.trim()+"'";
         }
         //收货凭证
         if(zhengliqingdan.strBill7!=null&&!zhengliqingdan.strBill7.equals("")){
diff --git a/wms/src/main/resources/application.yml b/wms/src/main/resources/application.yml
index 23de31a..43262ba 100644
--- a/wms/src/main/resources/application.yml
+++ b/wms/src/main/resources/application.yml
@@ -3,7 +3,7 @@ server:
 
 spring:
   datasource:
-    url: jdbc:sqlserver://47.100.54.81:1433;DatabaseName=zwtest
+    url: jdbc:sqlserver://47.100.54.81:1433;DatabaseName=zwwms
     driver-class-name:  com.microsoft.sqlserver.jdbc.SQLServerDriver
     username: super
     password: 1K4QfD%ESd1fe@VJ