Skip to content

肖康 / cloudSystem

Go to a project
Commit 7d72b8ff by liangjianmin
Options

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

parents 682e9879 890c3bf8
Inline Side-by-side
Showing with 289 additions and 341 deletions
src/assets/css/public/common.less
html { html {
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%; -ms-text-size-adjust : 100%;
} }
html * { html * {
outline: 0; outline : 0;
-webkit-text-size-adjust: none !important; -webkit-text-size-adjust : none !important;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important; -webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
} }
html, body { html,
font-family: PingFangSC-Regular, PingFang SC, 'Microsoft Yahei', sans-serif; body {
font-style: normal; font-family : PingFangSC-Regular, PingFang SC, 'Microsoft Yahei', sans-serif;
-webkit-font-smoothing: antialiased; font-style : normal;
-webkit-font-smoothing : antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
font-size: 14px; font-size : 14px;
color:#646B78; 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 { body,
margin: 0; 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; padding: 0;
} }
button, input, select, textarea { button,
font-size: 100%; input,
border: none; select,
textarea {
font-size : 100%;
border : none;
-webkit-appearance: none; -webkit-appearance: none;
} }
input[type=button], input[type=file], input[type=submit] { input[type=button],
input[type=file],
input[type=submit] {
cursor: pointer; cursor: pointer;
} }
table { table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing : 0;
} }
ol, ul, dl { ol,
ul,
dl {
list-style: none; list-style: none;
} }
h1, h2, h3, h4, h5, h6 { h1,
font-size: 100%; h2,
h3,
h4,
h5,
h6 {
font-size : 100%;
font-weight: 500; font-weight: 500;
} }
em, b, i { em,
b,
i {
font-style: normal; font-style: normal;
} }
...@@ -65,20 +116,20 @@ img { ...@@ -65,20 +116,20 @@ img {
} }
.clr:after { .clr:after {
content: "."; content : ".";
clear: both; clear : both;
height: 0; height : 0;
visibility: hidden; visibility: hidden;
display: block; display : block;
} }
.fl { .fl {
float: left; float : left;
_display: inline; _display: inline;
} }
.fr { .fr {
float: right; float : right;
_display: inline; _display: inline;
} }
...@@ -96,38 +147,38 @@ img { ...@@ -96,38 +147,38 @@ img {
.lineBlock { .lineBlock {
display: inline-block; display : inline-block;
*display: inline; *display : inline;
zoom: 1; zoom : 1;
letter-spacing: normal; letter-spacing: normal;
word-spacing: normal; word-spacing : normal;
} }
.lbBox { .lbBox {
font-size: 0 !important; font-size : 0 !important;
*word-spacing: -1px !important; *word-spacing: -1px !important;
} }
.emptys { .emptys {
margin-left: -1px; margin-left : -1px;
width: 1px; width : 1px;
height: 100%; height : 100%;
font-size: 0; font-size : 0;
vertical-align: middle; vertical-align: middle;
} }
.boxsiz { .boxsiz {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing : border-box;
} }
.column { .column {
display: flex; display : flex;
flex-direction: column; flex-direction: column;
} }
.row { .row {
display: flex; display : flex;
flex-direction: row; flex-direction: row;
} }
...@@ -153,16 +204,17 @@ img { ...@@ -153,16 +204,17 @@ img {
.boxFlex { .boxFlex {
-webkit-box-flex: 1; -webkit-box-flex: 1;
-moz-box-flex: 1; -moz-box-flex : 1;
-webkit-flex: 1; -webkit-flex : 1;
-ms-flex: 1; -ms-flex : 1;
flex: 1; flex : 1;
} }
html, body { html,
width: 100%; body {
height: 100%; width : 100%;
height : 100%;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
...@@ -171,35 +223,48 @@ body { ...@@ -171,35 +223,48 @@ body {
background: #F1F4FA; background: #F1F4FA;
} }
/**页面盒子**/ /**element-ui 样式重写**/ /**页面盒子**/
/**element-ui 样式重写**/
.pagex { .pagex {
padding: 20px; padding: 20px;
//表单样式重写 //表单样式重写
.el-input__inner{ .el-input__inner {
height: 38px; height : 38px;
border-radius: 2px; border-radius: 2px;
border: 1px solid #BEC9DF; border : 1px solid #BEC9DF;
font-size: 14px; font-size : 14px;
&:focus{
&:focus {
border: 1px solid #387FFF; border: 1px solid #387FFF;
} }
} }
.el-form-item__label{
color:#666; .el-form-item__label {
color: #666;
}
.el-range-editor.el-input__inner {
width: 257px
} }
.el-range-editor.el-input__inner{width:257px}
.el-select .el-input.is-focus .el-input__inner,.el-range-editor.is-active, .el-range-editor.is-active:hover{ .el-select .el-input.is-focus .el-input__inner,
.el-range-editor.is-active,
.el-range-editor.is-active:hover {
border-color: #387FFF; border-color: #387FFF;
} }
.el-select{
width:100px; .el-select {
width: 100px;
} }
.el-form--inline .el-form-item{
.el-form--inline .el-form-item {
margin-right: 30px; margin-right: 30px;
} }
.el-message--info { .el-message--info {
min-width: auto !important; min-width : auto !important;
border: 0px !important; border : 0px !important;
background: rgba(0, 0, 0, 0.4) !important; background: rgba(0, 0, 0, 0.4) !important;
.el-icon-info { .el-icon-info {
...@@ -210,38 +275,140 @@ body { ...@@ -210,38 +275,140 @@ body {
color: #fff !important; color: #fff !important;
} }
} }
//表格样式重写 //表格样式重写
.el-table{color:#646B78;} .el-table {
.el-table__header{ color: #646B78;
th{ }
.el-table__header {
th {
font-weight: normal; font-weight: normal;
} }
.el-table__body tr.hover-row>td { .el-table__body tr.hover-row>td {
background-color: #F1F8FF; background-color: #F1F8FF;
} }
} }
.el-table__fixed{
.el-table__header{ .el-table__fixed {
th{ .el-table__header {
th {
background-color: #F1F4FA background-color: #F1F4FA
} }
} }
box-shadow: 1px 2px 10px 3px rgba(119, 135, 145, 0.5); box-shadow: 1px 2px 10px 3px rgba(119, 135, 145, 0.5);
} }
.el-table td,.el-table th.is-leaf{
.el-table td,
.el-table th.is-leaf {
border-bottom: 1px solid #D2D9E7; border-bottom: 1px solid #D2D9E7;
} }
.el-table--border td, .el-table--border th, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
.el-table--border td,
.el-table--border th,
.el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
border-right: 1px solid #D2D9E7; border-right: 1px solid #D2D9E7;
} }
.el-table--border, .el-table--group{
.el-table--border,
.el-table--group {
border: 1px solid #D2D9E7; border: 1px solid #D2D9E7;
} }
.el-table--scrollable-x .el-table__body-wrapper{}
}
.el-table__body-wrapper::-webkit-scrollbar {
width: 18px;
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius : 8px;
background : #fff;
width : 18px;
-webkit-box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.2);
}
.el-table__body-wrapper::-webkit-scrollbar-track {
border-radius: 0;
background : #D2D9E7;
}
}
//弹窗公共样式
.el-dialog__body{
padding:0 20px!important;
}
.el-dialog__title{
font-size: 14px;
color:#333;
font-weight: bold;
position: relative;
&::after{
content:"";
position: absolute;
width: 5px;
height: 22px;
background: #1969F9;
left: -20px;
top: 2px;
}
}
.el-icon-close{
font-size: 24px;
&:hover,&:focus{
color:#1969F9!important;
}
}
.el-message-box__container{
text-align: center;
padding:15px 0px;
}
.el-message-box__message{
display: inline-block;
}
.el-message-box__message p{
color:#333;
font-size: 16px;
}
.el-message-box__status.el-icon-error{
color:#FC1F00!important;
font-size: 25px!important;
}
.el-message-box__close:before{
content:"\E609";
}
.el-message-box__btns,.dialog-footer{
.el-button{
width: 76px;
height: 34px;
text-align: center;
line-height: 34px;
background: #E8ECF4;
border:1px solid #E8ECF4;
border-radius: 2px;
color:#8391AD;
font-size: 14px;
padding:0px;
&:hover,&:focus{
color:#8391AD;
background: #E8ECF4;
border:1px solid #E8ECF4
}
&.el-button--primary{
border:1px solid #1969F9;
color:#fff;
background: #1969F9;
&:hover,&:focus{
color:#fff;
background: #1969F9;
border:1px solid #1969F9
}
}
}
}
src/assets/css/public/common.min.css
html { 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{box-shadow:1px 2px 10px 3px rgba(119,135,145,0.5)}.pagex .el-table__fixed .el-table__header th{background-color:#F1F4FA}.pagex .el-table td,.pagex .el-table th.is-leaf{border-bottom:1px solid #D2D9E7}.pagex .el-table--border td,.pagex .el-table--border th,.pagex .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{border-right:1px solid #D2D9E7}.pagex .el-table--border,.pagex .el-table--group{border:1px solid #D2D9E7}.pagex .el-table__body-wrapper::-webkit-scrollbar{width:18px}.pagex .el-table__body-wrapper::-webkit-scrollbar-thumb{border-radius:8px;background:#fff;width:18px;-webkit-box-shadow:inset 0 0 8px rgba(0,0,0,0.2)}.pagex .el-table__body-wrapper::-webkit-scrollbar-track{border-radius:0;background:#D2D9E7}.el-dialog__body{padding:0 20px!important}.el-dialog__title{font-size:14px;color:#333;font-weight:bold;position:relative}.el-dialog__title::after{content:"";position:absolute;width:5px;height:22px;background:#1969F9;left:-20px;top:2px}.el-icon-close{font-size:24px}.el-icon-close:hover,.el-icon-close:focus{color:#1969F9 !important}.el-message-box__container{text-align:center;padding:15px 0px}.el-message-box__message{display:inline-block}.el-message-box__message p{color:#333;font-size:16px}.el-message-box__status.el-icon-error{color:#FC1F00 !important;font-size:25px!important}.el-message-box__close:before{content:"\E609"}.el-message-box__btns .el-button,.dialog-footer .el-button{width:76px;height:34px;text-align:center;line-height:34px;background:#E8ECF4;border:1px solid #E8ECF4;border-radius:2px;color:#8391AD;font-size:14px;padding:0px}.el-message-box__btns .el-button:hover,.dialog-footer .el-button:hover,.el-message-box__btns .el-button:focus,.dialog-footer .el-button:focus{color:#8391AD;background:#E8ECF4;border:1px solid #E8ECF4}.el-message-box__btns .el-button.el-button--primary,.dialog-footer .el-button.el-button--primary{border:1px solid #1969F9;color:#fff;background:#1969F9}.el-message-box__btns .el-button.el-button--primary:hover,.dialog-footer .el-button.el-button--primary:hover,.el-message-box__btns .el-button.el-button--primary:focus,.dialog-footer .el-button.el-button--primary:focus{color:#fff;background:#1969F9;border:1px solid #1969F9}
-webkit-text-size-adjust: 100%; \ No newline at end of file
-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;
}
/**页面盒子**/
/**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;
}
.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 {
box-shadow: 1px 2px 10px 3px rgba(119, 135, 145, 0.5);
}
.pagex .el-table__fixed .el-table__header th {
background-color: #F1F4FA;
}
.pagex .el-table td,
.pagex .el-table th.is-leaf {
border-bottom: 1px solid #D2D9E7;
}
.pagex .el-table--border td,
.pagex .el-table--border th,
.pagex .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
border-right: 1px solid #D2D9E7;
}
.pagex .el-table--border,
.pagex .el-table--group {
border: 1px solid #D2D9E7;
}
/*# sourceMappingURL=common.min.css.map */
\ No newline at end of file
src/views/Store/list.vue
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</div> </div>
<div class="fl dcg">导出</div> <div class="fl dcg">导出</div>
<div class="fl dcg heti">上架</div> <div class="fl dcg heti">上架</div>
<div class="fl dcg heti xjk">下架</div> <div class="fl dcg heti xjk" @click="handleClose">下架</div>
</div> </div>
<div class="data-box"> <div class="data-box">
<el-table :data="tableData" border style="width: 100%"> <el-table :data="tableData" border style="width: 100%">
...@@ -69,6 +69,27 @@ ...@@ -69,6 +69,27 @@
</el-table> </el-table>
</div> </div>
<!--修改库存弹窗-->
<el-dialog title="修改库存" :visible.sync="dialogVisible" width="30%" >
<div class="kc-mask">
修改库存
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
</span>
</el-dialog>
<!--修改库存弹窗-->
<el-dialog title="修改交期" :visible.sync="dialogVisible2" width="30%" >
<div class="kc-mask">
修改货期
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible2 = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible2 = false">确 定</el-button>
</span>
</el-dialog>
</div> </div>
<Menu /> <Menu />
</div> </div>
...@@ -86,21 +107,24 @@ ...@@ -86,21 +107,24 @@
Input, Input,
DatePicker, DatePicker,
Button, Button,
Icon,
Dropdown, Dropdown,
DropdownMenu, DropdownMenu,
DropdownItem, DropdownItem,
Table, Table,
TableColumn, TableColumn,
Message Message,
MessageBox,
Dialog
} from 'element-ui' } from 'element-ui'
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem) Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog)
Vue.use(DatePicker).use(Icon).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table) Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table)
export default { export default {
name: "list", name: "list",
data() { data() {
return { return {
dialogVisible:false,
dialogVisible2:false,
formInline: { formInline: {
goods_name: '', goods_name: '',
status: '', status: '',
...@@ -166,6 +190,24 @@ ...@@ -166,6 +190,24 @@
}, },
handleCommand(command) { handleCommand(command) {
console.log(command) console.log(command)
if (command == 1) {
//修改库存弹窗
this.dialogVisible=true
} else {
//修改货期弹窗
this.dialogVisible2=true
}
},
handleClose(done) {
MessageBox.confirm('确认关闭？', {
type: 'error'
})
.then(_ => {
done();
})
.catch(_ => {});
}, },
onSubmit() { onSubmit() {
console.log('submit!'); console.log('submit!');
......
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