Skip to content

肖康 / cloudSystem

Go to a project
Commit b7271801 by liangjianmin
Options

Merge branch 'master' of http://119.23.72.7/xiaokang/cloudSystem 

# Conflicts:
#	src/assets/css/list/list.min.css
#	src/assets/css/public/common.min.css
css
parents e1ad2700 ecb3f93a
Inline Side-by-side
Showing with 105 additions and 292 deletions
src/assets/css/list/list.less
......@@ -18,6 +18,8 @@
}
}
.btn-nav{
margin-top: 11px;
margin-bottom: 22px;
.update{
width: 66px;
height: 26px;
......@@ -45,6 +47,17 @@
background: #F1F8FF;
cursor: pointer;
}
&.heti{
width:56px;
}
&.xjk{
position: relative;
left:-11px;
border-left:1px solid rgba(255,255,255,0);
&:hover{
border-left:1px solid #1969F9;
}
}
}
}
......
src/assets/css/list/list.min.css
.store-con {
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #E5EBF6;
padding: 20px;
}
.store-con .search-btn {
cursor: pointer;
width: 76px;
height: 36px;
line-height: 36px;
background: #1969F9;
border-radius: 2px;
font-size: 14px;
color: #fff;
text-align: center;
}
.store-con .search-btn:hover {
background: #0050E0;
}
.store-con .btn-nav .update {
width: 66px;
height: 26px;
line-height: 26px;
text-align: center;
background: #FF870D;
border: 1px solid #FF870D;
border-radius: 2px;
color: #fff;
font-size: 14px;
cursor: pointer;
}
.store-con .btn-nav .update i {
margin-left: 3px;
}
.store-con .btn-nav .dcg {
width: 66px;
height: 26px;
border-radius: 2px;
text-align: center;
line-height: 26px;
border: 1px solid #1969F9;
color: #1969F9;
margin-left: 10px;
font-size: 14px;
}
.store-con .btn-nav .dcg:hover {
background: #F1F8FF;
cursor: pointer;
}
/*# sourceMappingURL=list.min.css.map */
\ No newline at end of file
.store-con{background:#FFFFFF;border-radius:4px;border:1px solid #E5EBF6;padding:20px}.store-con .search-btn{cursor:pointer;width:76px;height:36px;line-height:36px;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{width:66px;height:26px;line-height:26px;text-align:center;background:#FF870D;border:1px solid #FF870D;border-radius:2px;color:#fff;font-size:14px;cursor:pointer}.store-con .btn-nav .update i{margin-left:3px}.store-con .btn-nav .dcg{width:66px;height:26px;border-radius:2px;text-align:center;line-height:26px;border:1px solid #1969F9;color:#1969F9;margin-left:10px;font-size:14px}.store-con .btn-nav .dcg:hover{background:#F1F8FF;cursor:pointer}.store-con .btn-nav .dcg.heti{width:56px}.store-con .btn-nav .dcg.xjk{position:relative;left:-11px;border-left:1px solid rgba(255,255,255,0)}.store-con .btn-nav .dcg.xjk:hover{border-left:1px solid #1969F9}
\ No newline at end of file
src/assets/css/public/common.less
......@@ -15,6 +15,7 @@ html, body {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 14px;
color:#646B78;
}
body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, textarea, p, blockquote, th, td, hr, button, article, aside, details, figcaption, figure, footer, header, menu, nav, section {
......@@ -173,6 +174,7 @@ body {
/**页面盒子**/ /**element-ui 样式重写**/
.pagex {
padding: 20px;
//表单样式重写
.el-input__inner{
height: 38px;
border-radius: 2px;
......@@ -208,6 +210,25 @@ body {
color: #fff !important;
}
}
//表格样式重写
.el-table{color:#646B78;}
.el-table__header{
th{
font-weight: normal;
}
.el-table__body tr.hover-row>td {
background-color: #F1F8FF;
}
}
.el-table__fixed{
.el-table__header{
th{
background-color: #F1F4FA
}
}
}
}
......
src/assets/css/public/common.min.css
html {
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
html * {
outline: 0;
-webkit-text-size-adjust: none !important;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
}
html,
body {
font-family: PingFangSC-Regular, PingFang SC, 'Microsoft Yahei', sans-serif;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 14px;
}
body,
div,
dl,
dt,
dd,
ul,
ol,
li,
h1,
h2,
h3,
h4,
h5,
h6,
pre,
code,
form,
fieldset,
legend,
input,
textarea,
p,
blockquote,
th,
td,
hr,
button,
article,
aside,
details,
figcaption,
figure,
footer,
header,
menu,
nav,
section {
margin: 0;
padding: 0;
}
button,
input,
select,
textarea {
font-size: 100%;
border: none;
-webkit-appearance: none;
}
input[type=button],
input[type=file],
input[type=submit] {
cursor: pointer;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
ol,
ul,
dl {
list-style: none;
}
h1,
h2,
h3,
h4,
h5,
h6 {
font-size: 100%;
font-weight: 500;
}
em,
b,
i {
font-style: normal;
}
a {
text-decoration: none;
}
img {
border: none;
}
.clr {
*zoom: 1;
clear: both;
}
.clr:after {
content: ".";
clear: both;
height: 0;
visibility: hidden;
display: block;
}
.fl {
float: left;
_display: inline;
}
.fr {
float: right;
_display: inline;
}
.va-t {
vertical-align: top;
}
.va-m {
vertical-align: middle;
}
.va-b {
vertical-align: bottom;
}
.lineBlock {
display: inline-block;
*display: inline;
zoom: 1;
letter-spacing: normal;
word-spacing: normal;
}
.lbBox {
font-size: 0 !important;
*word-spacing: -1px !important;
}
.emptys {
margin-left: -1px;
width: 1px;
height: 100%;
font-size: 0;
vertical-align: middle;
}
.boxsiz {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.column {
display: flex;
flex-direction: column;
}
.row {
display: flex;
flex-direction: row;
}
/* 两侧对齐 */
.bothSide {
justify-content: space-between;
}
/* 平均分布 */
.avarage {
justify-content: space-around;
}
/* 水平居中 */
.rowCenter {
justify-content: center;
}
/* 垂直居中 */
.verCenter {
align-items: center;
}
.boxFlex {
-webkit-box-flex: 1;
-moz-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
}
html,
body {
width: 100%;
height: 100%;
-webkit-overflow-scrolling: touch;
}
body {
overflow-x: hidden;
background: #F1F4FA;
}
/**页面盒子**/
/**element-ui 样式重写**/
.pagex {
padding: 20px;
}
.pagex .el-input__inner {
height: 38px;
border-radius: 2px;
border: 1px solid #BEC9DF;
font-size: 14px;
}
.pagex .el-input__inner:focus {
border: 1px solid #387FFF;
}
.pagex .el-form-item__label {
color: #666;
}
.pagex .el-range-editor.el-input__inner {
width: 257px;
}
.pagex .el-select .el-input.is-focus .el-input__inner,
.pagex .el-range-editor.is-active,
.pagex .el-range-editor.is-active:hover {
border-color: #387FFF;
}
.pagex .el-select {
width: 100px;
}
.pagex .el-form--inline .el-form-item {
margin-right: 30px;
}
.pagex .el-message--info {
min-width: auto !important;
border: 0px !important;
background: rgba(0, 0, 0, 0.4) !important;
}
.pagex .el-message--info .el-icon-info {
display: none;
}
.pagex .el-message--info .el-message__content {
color: #fff !important;
}
/*# sourceMappingURL=common.min.css.map */
\ No newline at end of file
html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html *{outline:0;-webkit-text-size-adjust:none !important;-webkit-tap-highlight-color:rgba(0,0,0,0) !important}html,body{font-family:PingFangSC-Regular,PingFang SC,'Microsoft Yahei',sans-serif;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-size:14px;color:#646B78}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,hr,button,article,aside,details,figcaption,figure,footer,header,menu,nav,section{margin:0;padding:0}button,input,select,textarea{font-size:100%;border:none;-webkit-appearance:none}input[type=button],input[type=file],input[type=submit]{cursor:pointer}table{border-collapse:collapse;border-spacing:0}ol,ul,dl{list-style:none}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:500}em,b,i{font-style:normal}a{text-decoration:none}img{border:none}.clr{*zoom:1;clear:both}.clr:after{content:".";clear:both;height:0;visibility:hidden;display:block}.fl{float:left;_display:inline}.fr{float:right;_display:inline}.va-t{vertical-align:top}.va-m{vertical-align:middle}.va-b{vertical-align:bottom}.lineBlock{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal}.lbBox{font-size:0 !important;*word-spacing:-1px !important}.emptys{margin-left:-1px;width:1px;height:100%;font-size:0;vertical-align:middle}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}.column{display:flex;flex-direction:column}.row{display:flex;flex-direction:row}.bothSide{justify-content:space-between}.avarage{justify-content:space-around}.rowCenter{justify-content:center}.verCenter{align-items:center}.boxFlex{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}html,body{width:100%;height:100%;-webkit-overflow-scrolling:touch}body{overflow-x:hidden;background:#F1F4FA}.pagex{padding:20px}.pagex .el-input__inner{height:38px;border-radius:2px;border:1px solid #BEC9DF;font-size:14px}.pagex .el-input__inner:focus{border:1px solid #387FFF}.pagex .el-form-item__label{color:#666}.pagex .el-range-editor.el-input__inner{width:257px}.pagex .el-select .el-input.is-focus .el-input__inner,.pagex .el-range-editor.is-active,.pagex .el-range-editor.is-active:hover{border-color:#387FFF}.pagex .el-select{width:100px}.pagex .el-form--inline .el-form-item{margin-right:30px}.pagex .el-message--info{min-width:auto !important;border:0px !important;background:rgba(0,0,0,0.4) !important}.pagex .el-message--info .el-icon-info{display:none}.pagex .el-message--info .el-message__content{color:#fff !important}.pagex .el-table{color:#646B78}.pagex .el-table__header th{font-weight:normal}.pagex .el-table__header .el-table__body tr.hover-row>td{background-color:#F1F8FF}.pagex .el-table__fixed .el-table__header th{background-color:#F1F4FA}
\ No newline at end of file
src/views/Store/list.vue
......@@ -38,11 +38,36 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="fl dcg">导出</div>
<div class="fl dcg">上架</div>
<div class="fl dcg">下架</div>
<div class="fl dcg heti">上架</div>
<div class="fl dcg heti xjk">下架</div>
</div>
<div class="data-box">
<el-table :data="tableData" border style="width: 100%">
<el-table-column fixed prop="inquiry_sn" label="供应商内部型号编码" width="200">
</el-table-column>
<el-table-column fixed prop="goods_name" label="型号" width="200">
</el-table-column>
<el-table-column fixed prop="brand_name" label="品牌" width="200">
</el-table-column>
<el-table-column prop="batch" label="封装" width="200">
</el-table-column>
<el-table-column prop="batch" label="起订量" width="200">
</el-table-column>
<el-table-column prop="inquiry_number" label="库存数量" width="200">
</el-table-column>
<el-table-column prop="inquiry_number" label="国内含税价（￥）" width="200">
</el-table-column>
<el-table-column prop="inquiry_number" label="香港交货价（＄）" width="200">
</el-table-column>
<el-table-column prop="inquiry_number" label="大陆交期" width="200">
</el-table-column>
<el-table-column prop="inquiry_number" label="香港交期" width="200">
</el-table-column>
<el-table-column prop="inquiry_number" label="状态" width="200">
</el-table-column>
</el-table>
</div>
</div>
<Menu />
......@@ -65,9 +90,12 @@
Dropdown,
DropdownMenu,
DropdownItem,
Table,
TableColumn,
Message
} from 'element-ui'
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(DatePicker).use(Icon).use(Dropdown).use(DropdownMenu).use(DropdownItem)
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem)
Vue.use(DatePicker).use(Icon).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table)
export default {
name: "list",
......@@ -78,7 +106,40 @@
status: '',
brand: '',
date: ''
},
tableData: [{
"id": 318,
"inquiry_sn": "X2021050609556",
"goods_name": "M4",
"brand_name": "TR FASTENINGS",
"inquiry_number": 1,
"batch": "1",
"delivery_time": "1天",
"status_val": "已报价（1）",
"quote_count": 1,
"currency": 1,
"status_a": 1,
"user_name": "admin",
"create_name": "admin@ichunt.com",
"create_time": "2021-05-08 09:41:42"
},
{
"id": 318,
"inquiry_sn": "X2021050609556",
"goods_name": "M4",
"brand_name": "TR FASTENINGS",
"inquiry_number": 1,
"batch": "1",
"delivery_time": "1天",
"status_val": "已报价（1）",
"quote_count": 1,
"currency": 1,
"status_a": 1,
"user_name": "admin",
"create_name": "admin@ichunt.com",
"create_time": "2021-05-08 09:41:42"
}
]
};
},
......@@ -103,7 +164,7 @@
})
},
handleCommand(command){
handleCommand(command) {
console.log(command)
},
onSubmit() {
......
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