From 61ac2080261ca65c6e28c47eef166dc5f9d6c908 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Fri, 27 Oct 2023 09:48:38 +0800
Subject: [PATCH] =?UTF-8?q?2023-10-27=E5=96=9C=E7=9B=B8=E9=9A=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project_web_ui-xxs/.env.development       |   2 +-
 .../project_web_ui-xxs/src/api/User/login.js  |   2 +-
 .../src/assets/loginImg/logo2.png             | Bin 0 -> 1479 bytes
 .../src/layout/components/Navbar.vue          |  35 +++++++++++++++---
 .../project_web_ui-xxs/src/layout/index.vue   |   4 +-
 .../project_web_ui-xxs/src/settings.js        |   2 +-
 .../src/styles/sidebar.scss                   |   4 +-
 .../views/component/instorehouse/purchase.vue |  10 ++---
 .../instorehouse/putInManagement.vue          |  11 +++---
 .../outStorehouseManagement/outList.vue       |   6 +--
 .../component/stockManagement/stockList.vue   |   3 +-
 .../src/views/login/login.vue                 |   4 +-
 .../project_web_ui-xxs/vue.config.js          |   2 +-
 13 files changed, 51 insertions(+), 34 deletions(-)
 create mode 100644 warehousing-system/project_web_ui-xxs/src/assets/loginImg/logo2.png

diff --git a/warehousing-system/project_web_ui-xxs/.env.development b/warehousing-system/project_web_ui-xxs/.env.development
index b986a193..6552d7fa 100644
--- a/warehousing-system/project_web_ui-xxs/.env.development
+++ b/warehousing-system/project_web_ui-xxs/.env.development
@@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/warehouseapi'
 
 ## 配置测试和本地开发时的 接口地址
 ##VUE_APP_URL = "http://jianguan.yyundong.com/"
-VUE_APP_URL = "http://127.0.0.1:9050"
+VUE_APP_URL = "http://192.168.1.107:9051"
diff --git a/warehousing-system/project_web_ui-xxs/src/api/User/login.js b/warehousing-system/project_web_ui-xxs/src/api/User/login.js
index 80149639..3deea8a4 100644
--- a/warehousing-system/project_web_ui-xxs/src/api/User/login.js
+++ b/warehousing-system/project_web_ui-xxs/src/api/User/login.js
@@ -12,7 +12,7 @@ class user {
 
   logout(data) { // 退出
     return request({
-      url: '/portal/v1/sysuser/signOut',
+      url: '/v1/sysuser/signOut',
       method: 'post',
       data: qs.stringify(data)
     })
diff --git a/warehousing-system/project_web_ui-xxs/src/assets/loginImg/logo2.png b/warehousing-system/project_web_ui-xxs/src/assets/loginImg/logo2.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa39ecbb7d99aeb3cb74faf036ad4335c5ba0778
GIT binary patch
literal 1479
zcmV;&1vvVNP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz00001b5ch_0Itp)
z=>Px)fk{L`RCr$PolR03F%X4YflGuHxdCOHJ?w!i1Qw9of^drf3&<6KJ>KJ?xB*_l
zDJZ3yiOAS!Jd#E&wd__E8;~@u{^sfR{9r36wCSy_P583@9Te;U;E$dHs3~X|tH;S%
zq00hQV&Hl(It2y4+GE#K(CWHGFvS7U!_j@M2#2QOS7}g+0rI{@t*u`<!}#E(r||Z+
ztDc^w4hXY%DFVnp7|-F^DhCRCAbK>~0S&lK^=xJM3Tq(U<{iL@xv#JV;$`06T=cc7
zsw3}V2?nqO5^mnU+2ZLdtboMx3s*S&ps)d=2iu3BG?ulA8!xkG0ffZ7eX%kz`|Lny
z&D)m>j8!$+^&S;*KsF%h%-c6xd3_}dko4vq07ZW}Q;!eVz9akgPYxuXdHbd+kJ%>$
zqKCsP0Cnh_nymd3n|%@>eEq@|wVtY~`sUiZPd{=XHH@`;0JYgC(EMZ5m^~>F{^sqA
znci2(fUvmO^Ub$Ye_ALcK#DYPCm4-RL}niqNcraNO(pu{;b=hmKW6n!2ABSE%{~f{
z<uh+z*ztU&H<0BuZ(k??5W!b^0bzEhHXwrpLwZ690<wDM?F%m4SG<9UU%0{vgW?55
zV7S6C{rt_|8Hkv-FO0B@NGBj--aTM^40U@KY#|Ua?-(GOb9DPkD-iLE*f1KtqSTR^
zOvbh&Sb>!Dn3XDN)bqBR{U;z|-qbJ_oBa$BG4F&hK6bF#|ML0(vJ%fQGUVIokd50d
z??A-Bozh0zNx?1}eGSCtA1P_WTH)F2H(QicRE*96REc;8BOsu!5y*4-?@Vz@YOh$v
z0;E^|Vh`3+rH3OOds>+<JOctGJa;4`1qex6!zUFW;khFjDL_cl8a}B23C|tLNC85U
z*6>LMNO<l@MhXy;w1!Vg2jt`!;N%40<rU!W7U1GCJW38D6Rn2^$Z!a7{(Cl!KYjvK
z6^GRN$B=M6G(gPR)Li<-MY$?DJq6g`n+17x25@`l54U3k4G`NIg~8(@N^DCB1h*^P
zwn}Wc{o+a1YzGImKSpje3fcGyaC0*oDh7{>D6!#Ma7_Y)3BAd~=Rii=B*D=r1VgpS
zyu?Zi%^W>sz7+?=R%w;!BQ`@PEKukaVym=D^by;3MW}Q-AU0!1*%K}%`lg<EyTbVC
zfZ*&lxtF98TXjXaUC{%vZCiL$qO07f3bA=$0)^8mq^;U2K_xctAXW#xLhuM}UXoyO
z!HTh!>^K?G)p;{cdWE!k3I3kr4M&^rC5$x<kT#VhT&R;;+NvrXOmrbQA6FV6c+|GV
zqMuw|klf04f?zte6(9+WJpGnsj@VYY<bJBy7FS{zX-s|oG+ng#)VEe}D@D(kzqM{+
z&fszBwk)$qOv3TW=O=LH@2R#hgn%&SZ>yU)QlA|Ej+-8cDTVj;>X#te8iK(K$k@-}
zyFg$(8B6j!K)O7o3CSo1!Gu1cLlxi&u(#i?2y@KLcM<XeF>3jJ-km7yYs|lTtkd`U
z@)?rZg1&A53<quy%-j@;^eXkJZ!Wq9)8#8&^B|};FX$SJf6wF>w$Sn`q#0FL)#H*}
zpFRizRS~)s`W(x#FE1d?N^DU%>bSV%1w-Gs$e)Mw4G<NBRS_C;+qHu0F^vD*-LX={
zeE2*SVoS1tGZ_B&3pDO|?=agB8onu+3wp1(93YF7fKV9ufU9Wvn|hy>EXmmAP{@+N
zz-0&!W-tYa0AZE^X5olJ1PHSXFbhW%B0!jBfLS=A5COt01I)q^g$NL48DJI;D&!sj
zc9_MrqT%4j#16I(LFua%%>b`u;|D2YMDi6CEVztSHK~ETL#e-r{<Qv3WnK7}(X&Xf
hYY<~l>W}%xoxi-<#>S))@6rGO002ovPDHLkV1hX^w3Gk<

literal 0
HcmV?d00001

diff --git a/warehousing-system/project_web_ui-xxs/src/layout/components/Navbar.vue b/warehousing-system/project_web_ui-xxs/src/layout/components/Navbar.vue
index b2a263c3..822bbc4d 100644
--- a/warehousing-system/project_web_ui-xxs/src/layout/components/Navbar.vue
+++ b/warehousing-system/project_web_ui-xxs/src/layout/components/Navbar.vue
@@ -1,15 +1,15 @@
 <template>
   <div>
     <div class="navbar">
-      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png"
-          style="width: 45px;height: 45px;margin-right: 10px;" />汇融云仓贷后监管平台</p>
+      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo2.png"
+          style="width: 45px;height: 45px;margin-right: 10px;" />喜相随贸易</p>
       <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
       <div class="right-menu">
         <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
         <p>欢迎您，{{name}}</p>
-        <img src="@/assets/images/info.png">
+        <!-- <img src="@/assets/images/info.png"> -->
         <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
-        <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
+        <span class="backToHome" @click="logout"><i class="el-icon-back"></i>退出登录</span>
       </div>
     </div>
     <el-footer class="footer" height="40px">Copyright © {{ year }} 技术支持集团 All Rights Reserved</el-footer>
@@ -17,6 +17,11 @@
 </template>
 
 <script>
+  import {
+    getStorage,
+    removeStorage
+  } from '@/utils/auth'
+  import User from "@/api/User/login.js";
   export default {
     data() {
       return {
@@ -38,8 +43,26 @@
     methods: {
       logout() {
         // this.$router.push({ path: '/home' })
-        window.opener = null
-        window.open('about:blank', '_top').close()
+        // window.opener = null
+        // window.open('about:blank', '_top').close()
+        this.$confirm('确定要退出吗, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$router.push({
+            path: '/login'
+          })
+          // User.logout({
+          //   token: getStorage()
+          // }).then(res => {
+          //   removeStorage()
+          //   // this.$store.commit('user/SET_UESRINFO', '')
+          //   this.$router.push({
+          //     path: '/login'
+          //   })
+          // })
+        })
       }
     }
   }
diff --git a/warehousing-system/project_web_ui-xxs/src/layout/index.vue b/warehousing-system/project_web_ui-xxs/src/layout/index.vue
index 2f4dcbce..7c9b5f69 100644
--- a/warehousing-system/project_web_ui-xxs/src/layout/index.vue
+++ b/warehousing-system/project_web_ui-xxs/src/layout/index.vue
@@ -9,10 +9,10 @@
       @click="handleClickOutside"
     />
     <div class="main-container">
-      <div class="home-box">
+     <!-- <div class="home-box">
         <a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">平台首页</a>
         <a href="javascript:void(0);" class="text-center">云仓管理</a>
-      </div>
+      </div> -->
       <sidebar class="sidebar-container" />
       <!--菜单-->
       <div class="TagsView">
diff --git a/warehousing-system/project_web_ui-xxs/src/settings.js b/warehousing-system/project_web_ui-xxs/src/settings.js
index b6530e1e..4f45a38b 100644
--- a/warehousing-system/project_web_ui-xxs/src/settings.js
+++ b/warehousing-system/project_web_ui-xxs/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融云仓贷后监管平台',
+  title: '喜相随贸易',
 
   /**
    * @type {boolean} true | false
diff --git a/warehousing-system/project_web_ui-xxs/src/styles/sidebar.scss b/warehousing-system/project_web_ui-xxs/src/styles/sidebar.scss
index 4d304e20..088f372c 100644
--- a/warehousing-system/project_web_ui-xxs/src/styles/sidebar.scss
+++ b/warehousing-system/project_web_ui-xxs/src/styles/sidebar.scss
@@ -40,7 +40,7 @@
     transition: width 0.28s;
     width: $sideBarWidth !important;
     background-color: $menuBg;
-    height: calc(100% - 60px) ;
+    // height: calc(100% - 60px) ;
     position: absolute;
     font-size: 0px;
     top: 60px;
@@ -48,7 +48,7 @@
     left: 0;
     z-index: 8;
     overflow: hidden;
-    padding-top: 40px;
+    // padding-top: 40px;
 
     // reset element-ui css
     .horizontal-collapse-transition {
diff --git a/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/purchase.vue b/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/purchase.vue
index 0d5f8f41..240ec1e6 100644
--- a/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/purchase.vue
+++ b/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/purchase.vue
@@ -26,13 +26,13 @@
           prop="supplierName"
           label="供货单位"
           align="center"
-          width="180">
+          width="220">
         </el-table-column>
         <el-table-column
           prop="purchaseNo"
           label="订单编号"
           align="center"
-          width="180">
+          width="220">
         </el-table-column>
         <el-table-column
           prop="purchaseDate"
@@ -55,8 +55,7 @@
         <el-table-column
           prop="storehouseName"
           label="仓库名称"
-          align="center"
-          width="180">
+          align="center"/>
         </el-table-column>
         <el-table-column
           prop="state"
@@ -65,7 +64,6 @@
           width="180">
         </el-table-column>
         <el-table-column
-          fixed="right"
           prop="operate"
           label="操作"
           width="300"
@@ -78,7 +76,7 @@
               @click="LookPurchase(scope.row)"
               >查看详情</el-button
             >
-            <el-button type="primary" icon="el-icon-edit" size="small" @click="open(scope.row)">修改</el-button>
+           <el-button type="primary" icon="el-icon-edit" size="small" @click="open(scope.row)">修改</el-button>
             <el-button type="danger" icon="el-icon-delete" size="small" @click="deletePurchase(scope.row)">删除</el-button>
           </template>
         </el-table-column>
diff --git a/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/putInManagement.vue b/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/putInManagement.vue
index c24429cb..f3f67253 100644
--- a/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/putInManagement.vue
+++ b/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/putInManagement.vue
@@ -25,19 +25,19 @@
               prop="no"
               label="入库编号"
               align="center"
-              width="180">
+              width="220">
             </el-table-column>
             <el-table-column
               prop="createTime"
               label="入库日期"
               align="center"
-              width="180">
+              width="220">
             </el-table-column>
             <el-table-column
               prop="custerName"
               label="客户名称"
               align="center"
-              width="180">
+              width="220">
             </el-table-column>
             <el-table-column
               prop="applicationDate"
@@ -54,8 +54,7 @@
             <el-table-column
               prop="storeHouseName"
               label="仓库名称"
-              align="center"
-              width="180">
+              align="center">
             </el-table-column>
             <el-table-column
               prop="state"
@@ -159,7 +158,7 @@ export default {
     },
 		formatorderdegree: function( row, column) {
          if(row.state === '1'){
-             return '已出库'
+             return '已入库'
          } else if(row.state === '2') {
              return '重要'
          } else{
diff --git a/warehousing-system/project_web_ui-xxs/src/views/component/outStorehouseManagement/outList.vue b/warehousing-system/project_web_ui-xxs/src/views/component/outStorehouseManagement/outList.vue
index e50a1ad3..98ad58a6 100644
--- a/warehousing-system/project_web_ui-xxs/src/views/component/outStorehouseManagement/outList.vue
+++ b/warehousing-system/project_web_ui-xxs/src/views/component/outStorehouseManagement/outList.vue
@@ -27,7 +27,7 @@
         prop="no"
         label="订单编号"
         align="center"
-        width="180">
+        width="220">
       </el-table-column>
       <el-table-column
         prop="applicationDate"
@@ -44,8 +44,7 @@
       <el-table-column
         prop="storeHouseName"
         label="仓库名称"
-        align="center"
-        width="180">
+        align="center">
       </el-table-column>
       <el-table-column
         prop="state"
@@ -55,7 +54,6 @@
         width="180">
       </el-table-column>
       <el-table-column
-        fixed="right"
         prop="operate"
         label="操作"
         width="300"
diff --git a/warehousing-system/project_web_ui-xxs/src/views/component/stockManagement/stockList.vue b/warehousing-system/project_web_ui-xxs/src/views/component/stockManagement/stockList.vue
index d5270d0c..60da3e0e 100644
--- a/warehousing-system/project_web_ui-xxs/src/views/component/stockManagement/stockList.vue
+++ b/warehousing-system/project_web_ui-xxs/src/views/component/stockManagement/stockList.vue
@@ -100,8 +100,7 @@
       <el-table-column
         align="center"
         prop="storeHouseName"
-        label="仓库名称"
-        width="120">
+        label="仓库名称">
       </el-table-column>
       </el-table>
       <div class="pages">
diff --git a/warehousing-system/project_web_ui-xxs/src/views/login/login.vue b/warehousing-system/project_web_ui-xxs/src/views/login/login.vue
index 63502caa..d490db6e 100644
--- a/warehousing-system/project_web_ui-xxs/src/views/login/login.vue
+++ b/warehousing-system/project_web_ui-xxs/src/views/login/login.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="login">
     <div class="logoTitle">
-      <span>汇融云仓测试</span>
-      <p class="title">贷后监管系统</p>
+      <span>喜相随贸易</span>
+      <p class="title">进销存管理</p>
     </div>
     <div class="images">
       <img class="one" src="../../assets/loginImg/001.jpg" alt="" />
diff --git a/warehousing-system/project_web_ui-xxs/vue.config.js b/warehousing-system/project_web_ui-xxs/vue.config.js
index 620c6f98..fdd64150 100644
--- a/warehousing-system/project_web_ui-xxs/vue.config.js
+++ b/warehousing-system/project_web_ui-xxs/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融云仓贷后监管平台'// page title
+const name = defaultSettings.title || '喜相随贸易'// page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。