Skip to content

肖康 / cloudSystem

Go to a project
Commit 83d268da by 肖康
Options

x

parent bf8d8f51
Expand all
Inline Side-by-side
Showing with 178 additions and 47 deletions
src/assets/css/public/common.less
...@@ -307,7 +307,13 @@ body { ...@@ -307,7 +307,13 @@ body {
} }
.th-all{
.el-table__header {
th {
background-color: #F1F4FA
}
}
}
.el-table__fixed { .el-table__fixed {
.el-table__header { .el-table__header {
th { th {
...@@ -322,7 +328,20 @@ body { ...@@ -322,7 +328,20 @@ body {
.el-table th.is-leaf { .el-table th.is-leaf {
border-bottom: 1px solid #D2D9E7; border-bottom: 1px solid #D2D9E7;
} }
.el-table--border{
border-bottom:0px!important;
position: relative;
&::after{
content:"";
position: absolute;
width:100%;
height:1px;
background: red;
left:0px;
bottom:-1px;
z-index: 3;
}
}
.el-table--border td, .el-table--border td,
.el-table--border th, .el-table--border th,
.el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed { .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
......
src/assets/css/store/enter.less 0 → 100644
.enter{
.enter-con{
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #E5EBF6;
padding:20px;
}
.search-btn{
cursor: pointer;
width: 76px;
height: 37px;
line-height: 37px;
background: #1969F9;
border-radius: 2px;
font-size: 14px;
color:#fff;
text-align: center;
&:hover{
background: #0050E0;
}
}
.btn-nav{
margin-top: 11px;
margin-bottom: 22px;
.dcg{
width: 66px;
height: 26px;
border-radius: 2px;
text-align: center;
line-height: 26px;
border: 1px solid #1969F9;
background: #fff;
color:#1969F9;
margin-right: 10px;
font-size: 14px;
transition: all 0.5s;
&.long{width:95px;}
&:hover{
background: #1969F9;
cursor: pointer;
color:#fff;
}
&.delbtn{
border:1px solid #FC1F00;
background: #FFE7E3;
color:#FC1F00;
&:hover{
background: #FF715D;
color:#fff;
}
}
}
}
}
\ No newline at end of file
src/assets/css/store/enter.min.css 0 → 100644
.enter .enter-con{background:#FFFFFF;border-radius:4px;border:1px solid #E5EBF6;padding:20px}.enter .search-btn{cursor:pointer;width:76px;height:37px;line-height:37px;background:#1969F9;border-radius:2px;font-size:14px;color:#fff;text-align:center}.enter .search-btn:hover{background:#0050E0}.enter .btn-nav{margin-top:11px;margin-bottom:22px}.enter .btn-nav .dcg{width:66px;height:26px;border-radius:2px;text-align:center;line-height:26px;border:1px solid #1969F9;background:#fff;color:#1969F9;margin-right:10px;font-size:14px;transition:all .5s}.enter .btn-nav .dcg.long{width:95px}.enter .btn-nav .dcg:hover{background:#1969F9;cursor:pointer;color:#fff}.enter .btn-nav .dcg.delbtn{border:1px solid #FC1F00;background:#FFE7E3;color:#FC1F00}.enter .btn-nav .dcg.delbtn:hover{background:#FF715D;color:#fff}
\ No newline at end of file
src/assets/css/list/list.less → src/assets/css/store/list.less
.store-con{ .store-con{
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px; border-radius: 4px;
...@@ -7,8 +6,8 @@ ...@@ -7,8 +6,8 @@
.search-btn{ .search-btn{
cursor: pointer; cursor: pointer;
width: 76px; width: 76px;
height: 36px; height: 37px;
line-height: 36px; line-height: 37px;
background: #1969F9; background: #1969F9;
border-radius: 2px; border-radius: 2px;
font-size: 14px; font-size: 14px;
...@@ -60,6 +59,11 @@ ...@@ -60,6 +59,11 @@
} }
&.heti{ &.heti{
width:56px; width:56px;
background: #fff;
&:hover{
background: #E5EEFF;
color:#1969F9;
}
} }
&.xjk{ &.xjk{
position: relative; position: relative;
......
src/assets/css/store/list.min.css 0 → 100644
.store-con{background:#FFFFFF;border-radius:4px;border:1px solid #E5EBF6;padding:20px}.store-con .search-btn{cursor:pointer;width:76px;height:37px;line-height:37px;background:#1969F9;border-radius:2px;font-size:14px;color:#fff;text-align:center}.store-con .search-btn:hover{background:#0050E0}.store-con .btn-nav{margin-top:11px;margin-bottom:22px}.store-con .btn-nav .update{height:26px;line-height:26px;text-align:center;background:#FFEEDD;border:1px solid #FF870D;border-radius:2px;color:#FF870D;font-size:14px;cursor:pointer;width:66px}.store-con .btn-nav .update i{margin-left:3px}.store-con .btn-nav .update:hover{background:#FCA955;color:#fff}.store-con .btn-nav .dcg{width:66px;height:26px;border-radius:2px;text-align:center;line-height:26px;border:1px solid #1969F9;background:#E5EEFF;color:#1969F9;margin-left:10px;font-size:14px;transition:all .5s}.store-con .btn-nav .dcg:hover{background:#1969F9;cursor:pointer;color:#fff}.store-con .btn-nav .dcg.heti{width:56px;background:#fff}.store-con .btn-nav .dcg.heti:hover{background:#E5EEFF;color:#1969F9}.store-con .btn-nav .dcg.xjk{position:relative;left:-11px;border-left:1px solid #1969F9}.store-con .btn-nav .dcg.xjk:hover{border-left:1px solid #1969F9}.store-con .updatebox{position:relative}.store-con .updatebox .selectdw{height:36px;width:36px;position:absolute;top:1px;right:2px}.store-con .updatebox .selectdw .el-select{width:36px;border-left:1px solid #C0C4CC}.store-con .updatebox .selectdw .el-select input{border:0px;padding:0px;height:36px;width:36px;font-size:14px;color:#333;text-align:center}.store-con .updatebox .selectdw .el-select .el-input__prefix,.store-con .updatebox .selectdw .el-select .el-input__suffix{display:none!important}
\ No newline at end of file
src/main.js
...@@ -24,7 +24,7 @@ Vue.use(directive); ...@@ -24,7 +24,7 @@ Vue.use(directive);
//处理顶部导航TAB //处理顶部导航TAB
router.afterEach((to, from, next) => { router.afterEach((to, from, next) => {
if (to.path == "/") { if (to.path == "/"||to.path == "/login") {
return return
} }
let tabOldArr = sessionStorage.getItem('tabs'); let tabOldArr = sessionStorage.getItem('tabs');
......
src/views/Store/enter.vue
<template> <template>
<div class="enter"> <div class="enter pagex">
我是库存导入 <div class="enter-con">
<Menu/> <el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="状态">
<el-select v-model="formInline.status" placeholder="全部">
<el-option label="全部" value="0"></el-option>
<el-option label="待处理" value="1"></el-option>
<el-option label="处理中" value="2"></el-option>
<el-option label="已处理" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="更新日期">
<el-date-picker v-model="formInline.date" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<div @click="onSubmit" class="search-btn">搜索</div>
</el-form-item>
</el-form>
<div class="btn-nav clr">
<div class="fl dcg">导出</div>
<div class="fl dcg long">查看导入结果</div>
<div class="fl dcg">下载模版</div>
<div class="fl dcg delbtn">删除</div>
</div>
<div class="data-box th-all">
<el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" width="37" >
</el-table-column>
<el-table-column prop="up_sn" label="单号" min-width="20%">
</el-table-column>
<el-table-column prop="file_name" label="文件名字" min-width="20%">
</el-table-column>
<el-table-column prop="status" label="状态" min-width="20%">
</el-table-column>
<el-table-column prop="latest_notice" label="最新上传状态" min-width="20%">
</el-table-column>
<el-table-column prop="create_time" label="上传时间" min-width="20%">
</el-table-column>
</el-table>
</div>
</div>
<Menu />
</div> </div>
</template> </template>
...@@ -10,15 +54,41 @@ ...@@ -10,15 +54,41 @@
import Menu from "@/components/menu.vue"; import Menu from "@/components/menu.vue";
import Tool from '../../tool' import Tool from '../../tool'
import { import {
Form,
FormItem,
Select,
Option,
Input,
DatePicker,
Button, Button,
Message Dropdown,
DropdownMenu,
DropdownItem,
Table,
TableColumn,
Message,
MessageBox,
Dialog
} from 'element-ui' } from 'element-ui'
Vue.use(Button) Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog)
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table)
export default { export default {
name: "enter", name: "enter",
data() { data() {
return {}; return {
formInline: {
status: '',
date: ''
},
tableData: [{
up_sn:"4564546546545",
file_name:"肖康.xls",
status:1,
latest_notice:"最新状态",
create_time:"2020-02-02 09:50:50"
}]
};
}, },
watch: {}, watch: {},
created() { created() {
...@@ -26,19 +96,12 @@ ...@@ -26,19 +96,12 @@
}, },
computed: {}, computed: {},
methods: { methods: {
ceshi() { handleSelectionChange(val) {
//this.$message.error('上传头像图片只能是 JPG 格式!'); this.multipleSelection = val;
Message('这是一条消息提示'); console.log(this.multipleSelection)
this.$http('get', "/getJoke1", { },
page: 1, count: 2, type: 'video' onSubmit() {
}) console.log('submit!');
.then(res => {
console.log(res)
})
.catch(err => {
console.log(err.message);
})
} }
}, },
components: { components: {
...@@ -47,5 +110,5 @@ ...@@ -47,5 +110,5 @@
}; };
</script> </script>
<style scoped> <style scoped>
/* @import "../../assets/css/index/index.min.css"; */ @import "../../assets/css/store/enter.min.css";
</style> </style>
\ No newline at end of file
src/views/Store/list.vue
...@@ -46,10 +46,8 @@ ...@@ -46,10 +46,8 @@
<el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange"> <el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" width="37"> <el-table-column fixed type="selection" width="37">
</el-table-column> </el-table-column>
<el-table-column fixed label="型号" width="200">
<template slot-scope="scope"> <el-table-column fixed prop="goods_name" label="型号" width="200">
<a :href="'/#/listDetail?id='+scope.row.id" class="f-blue">{{scope.row.goods_name}}</a>
</template>
</el-table-column> </el-table-column>
<el-table-column fixed prop="inquiry_sn" label="供应商内部型号编码" width="200"> <el-table-column fixed prop="inquiry_sn" label="供应商内部型号编码" width="200">
</el-table-column> </el-table-column>
...@@ -275,21 +273,6 @@ ...@@ -275,21 +273,6 @@
}, },
computed: {}, computed: {},
methods: { methods: {
ceshi() {
Message('这是一条消息提示');
this.$http('get', "/getJoke1", {
page: 1,
count: 2,
type: 'video'
})
.then(res => {
console.log(res)
})
.catch(err => {
console.log(err.message);
})
},
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
...@@ -326,5 +309,5 @@ ...@@ -326,5 +309,5 @@
}; };
</script> </script>
<style scoped> <style scoped>
@import "../../assets/css/list/list.min.css"; @import "../../assets/css/store/list.min.css";
</style> </style>
\ No newline at end of file
src/views/Store/listDetail.vue
<template> <template>
<div class="index"> <div class="index pagex">
我是库存列表详情 我是库存列表详情
<Menu/> <Menu/>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment