Browse Source

2023-10-27喜相随

master
guoxing 2 years ago
parent
commit
61ac208026
  1. 2
      warehousing-system/project_web_ui-xxs/.env.development
  2. 2
      warehousing-system/project_web_ui-xxs/src/api/User/login.js
  3. BIN
      warehousing-system/project_web_ui-xxs/src/assets/loginImg/logo2.png
  4. 35
      warehousing-system/project_web_ui-xxs/src/layout/components/Navbar.vue
  5. 4
      warehousing-system/project_web_ui-xxs/src/layout/index.vue
  6. 2
      warehousing-system/project_web_ui-xxs/src/settings.js
  7. 4
      warehousing-system/project_web_ui-xxs/src/styles/sidebar.scss
  8. 8
      warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/purchase.vue
  9. 11
      warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/putInManagement.vue
  10. 6
      warehousing-system/project_web_ui-xxs/src/views/component/outStorehouseManagement/outList.vue
  11. 3
      warehousing-system/project_web_ui-xxs/src/views/component/stockManagement/stockList.vue
  12. 4
      warehousing-system/project_web_ui-xxs/src/views/login/login.vue
  13. 2
      warehousing-system/project_web_ui-xxs/vue.config.js

2
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://jianguan.yyundong.com/"
VUE_APP_URL = "http://127.0.0.1:9050" VUE_APP_URL = "http://192.168.1.107:9051"

2
warehousing-system/project_web_ui-xxs/src/api/User/login.js

@ -12,7 +12,7 @@ class user {
logout(data) { // 退出 logout(data) { // 退出
return request({ return request({
url: '/portal/v1/sysuser/signOut', url: '/v1/sysuser/signOut',
method: 'post', method: 'post',
data: qs.stringify(data) data: qs.stringify(data)
}) })

BIN
warehousing-system/project_web_ui-xxs/src/assets/loginImg/logo2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

35
warehousing-system/project_web_ui-xxs/src/layout/components/Navbar.vue

@ -1,15 +1,15 @@
<template> <template>
<div> <div>
<div class="navbar"> <div class="navbar">
<p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" <p class="breadcrumb-container"><img src="@/assets/loginImg/logo2.png"
style="width: 45px;height: 45px;margin-right: 10px;" />汇融云仓贷后监管平台</p> style="width: 45px;height: 45px;margin-right: 10px;" />喜相随贸易</p>
<!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> --> <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
<div class="right-menu"> <div class="right-menu">
<!-- <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>--> <!-- <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
<p>欢迎您{{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"> --> <!-- <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>
</div> </div>
<el-footer class="footer" height="40px">Copyright © {{ year }} 技术支持集团 All Rights Reserved</el-footer> <el-footer class="footer" height="40px">Copyright © {{ year }} 技术支持集团 All Rights Reserved</el-footer>
@ -17,6 +17,11 @@
</template> </template>
<script> <script>
import {
getStorage,
removeStorage
} from '@/utils/auth'
import User from "@/api/User/login.js";
export default { export default {
data() { data() {
return { return {
@ -38,8 +43,26 @@
methods: { methods: {
logout() { logout() {
// this.$router.push({ path: '/home' }) // this.$router.push({ path: '/home' })
window.opener = null // window.opener = null
window.open('about:blank', '_top').close() // 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'
// })
// })
})
} }
} }
} }

4
warehousing-system/project_web_ui-xxs/src/layout/index.vue

@ -9,10 +9,10 @@
@click="handleClickOutside" @click="handleClickOutside"
/> />
<div class="main-container"> <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:window.opener=null;window.open('','_self');window.close();" class="text-center">平台首页</a>
<a href="javascript:void(0);" class="text-center">云仓管理</a> <a href="javascript:void(0);" class="text-center">云仓管理</a>
</div> </div> -->
<sidebar class="sidebar-container" /> <sidebar class="sidebar-container" />
<!--菜单--> <!--菜单-->
<div class="TagsView"> <div class="TagsView">

2
warehousing-system/project_web_ui-xxs/src/settings.js

@ -1,6 +1,6 @@
module.exports = { module.exports = {
title: '汇融云仓贷后监管平台', title: '喜相随贸易',
/** /**
* @type {boolean} true | false * @type {boolean} true | false

4
warehousing-system/project_web_ui-xxs/src/styles/sidebar.scss

@ -40,7 +40,7 @@
transition: width 0.28s; transition: width 0.28s;
width: $sideBarWidth !important; width: $sideBarWidth !important;
background-color: $menuBg; background-color: $menuBg;
height: calc(100% - 60px) ; // height: calc(100% - 60px) ;
position: absolute; position: absolute;
font-size: 0px; font-size: 0px;
top: 60px; top: 60px;
@ -48,7 +48,7 @@
left: 0; left: 0;
z-index: 8; z-index: 8;
overflow: hidden; overflow: hidden;
padding-top: 40px; // padding-top: 40px;
// reset element-ui css // reset element-ui css
.horizontal-collapse-transition { .horizontal-collapse-transition {

8
warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/purchase.vue

@ -26,13 +26,13 @@
prop="supplierName" prop="supplierName"
label="供货单位" label="供货单位"
align="center" align="center"
width="180"> width="220">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="purchaseNo" prop="purchaseNo"
label="订单编号" label="订单编号"
align="center" align="center"
width="180"> width="220">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="purchaseDate" prop="purchaseDate"
@ -55,8 +55,7 @@
<el-table-column <el-table-column
prop="storehouseName" prop="storehouseName"
label="仓库名称" label="仓库名称"
align="center" align="center"/>
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="state" prop="state"
@ -65,7 +64,6 @@
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
fixed="right"
prop="operate" prop="operate"
label="操作" label="操作"
width="300" width="300"

11
warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/putInManagement.vue

@ -25,19 +25,19 @@
prop="no" prop="no"
label="入库编号" label="入库编号"
align="center" align="center"
width="180"> width="220">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createTime" prop="createTime"
label="入库日期" label="入库日期"
align="center" align="center"
width="180"> width="220">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="custerName" prop="custerName"
label="客户名称" label="客户名称"
align="center" align="center"
width="180"> width="220">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="applicationDate" prop="applicationDate"
@ -54,8 +54,7 @@
<el-table-column <el-table-column
prop="storeHouseName" prop="storeHouseName"
label="仓库名称" label="仓库名称"
align="center" align="center">
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="state" prop="state"
@ -159,7 +158,7 @@ export default {
}, },
formatorderdegree: function( row, column) { formatorderdegree: function( row, column) {
if(row.state === '1'){ if(row.state === '1'){
return '已库' return '已库'
} else if(row.state === '2') { } else if(row.state === '2') {
return '重要' return '重要'
} else{ } else{

6
warehousing-system/project_web_ui-xxs/src/views/component/outStorehouseManagement/outList.vue

@ -27,7 +27,7 @@
prop="no" prop="no"
label="订单编号" label="订单编号"
align="center" align="center"
width="180"> width="220">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="applicationDate" prop="applicationDate"
@ -44,8 +44,7 @@
<el-table-column <el-table-column
prop="storeHouseName" prop="storeHouseName"
label="仓库名称" label="仓库名称"
align="center" align="center">
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="state" prop="state"
@ -55,7 +54,6 @@
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
fixed="right"
prop="operate" prop="operate"
label="操作" label="操作"
width="300" width="300"

3
warehousing-system/project_web_ui-xxs/src/views/component/stockManagement/stockList.vue

@ -100,8 +100,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="storeHouseName" prop="storeHouseName"
label="仓库名称" label="仓库名称">
width="120">
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pages"> <div class="pages">

4
warehousing-system/project_web_ui-xxs/src/views/login/login.vue

@ -1,8 +1,8 @@
<template> <template>
<div class="login"> <div class="login">
<div class="logoTitle"> <div class="logoTitle">
<span>汇融云仓测试</span> <span>喜相随贸易</span>
<p class="title">贷后监管系统</p> <p class="title">进销存管理</p>
</div> </div>
<div class="images"> <div class="images">
<img class="one" src="../../assets/loginImg/001.jpg" alt="" /> <img class="one" src="../../assets/loginImg/001.jpg" alt="" />

2
warehousing-system/project_web_ui-xxs/vue.config.js

@ -6,7 +6,7 @@ function resolve(dir) {
return path.join(__dirname, dir) return path.join(__dirname, dir)
} }
const name = defaultSettings.title || '汇融云仓贷后监管平台'// page title const name = defaultSettings.title || '喜相随贸易'// page title
// 如果端口设置为80, // 如果端口设置为80,
// 使用管理员权限执行命令行。 // 使用管理员权限执行命令行。

Loading…
Cancel
Save