Skip to content

肖康 / cloudSystem

Go to a project
Commit 1282d0a7 by liangjianmin
Options

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

parents a158d841 e0e645b0
Inline Side-by-side
Showing with 294 additions and 193 deletions
src/assets/css/public/common.less
html {
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
-ms-text-size-adjust : 100%;
}
html * {
outline: 0;
-webkit-text-size-adjust: none !important;
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;
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;
font-size : 14px;
color : #646B78;
}
body,
......@@ -56,7 +56,7 @@ header,
menu,
nav,
section {
margin: 0;
margin : 0;
padding: 0;
}
......@@ -64,8 +64,8 @@ button,
input,
select,
textarea {
font-size: 100%;
border: none;
font-size : 100%;
border : none;
-webkit-appearance: none;
}
......@@ -77,7 +77,7 @@ input[type=submit] {
table {
border-collapse: collapse;
border-spacing: 0;
border-spacing : 0;
}
ol,
......@@ -92,7 +92,7 @@ h3,
h4,
h5,
h6 {
font-size: 100%;
font-size : 100%;
font-weight: 500;
}
......@@ -116,20 +116,20 @@ img {
}
.clr:after {
content: ".";
clear: both;
height: 0;
content : ".";
clear : both;
height : 0;
visibility: hidden;
display: block;
display : block;
}
.fl {
float: left;
float : left;
_display: inline;
}
.fr {
float: right;
float : right;
_display: inline;
}
......@@ -147,38 +147,38 @@ img {
.lineBlock {
display: inline-block;
*display: inline;
zoom: 1;
display : inline-block;
*display : inline;
zoom : 1;
letter-spacing: normal;
word-spacing: normal;
word-spacing : normal;
}
.lbBox {
font-size: 0 !important;
font-size : 0 !important;
*word-spacing: -1px !important;
}
.emptys {
margin-left: -1px;
width: 1px;
height: 100%;
font-size: 0;
margin-left : -1px;
width : 1px;
height : 100%;
font-size : 0;
vertical-align: middle;
}
.boxsiz {
-webkit-box-sizing: border-box;
box-sizing: border-box;
box-sizing : border-box;
}
.column {
display: flex;
display : flex;
flex-direction: column;
}
.row {
display: flex;
display : flex;
flex-direction: row;
}
......@@ -204,16 +204,16 @@ img {
.boxFlex {
-webkit-box-flex: 1;
-moz-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
-moz-box-flex : 1;
-webkit-flex : 1;
-ms-flex : 1;
flex : 1;
}
html,
body {
width: 100%;
height: 100%;
width : 100%;
height : 100%;
-webkit-overflow-scrolling: touch;
}
......@@ -221,20 +221,35 @@ body {
overflow-x: hidden;
background: #F1F4FA;
}
.f-blue{color:#1969F9;}
.f-green{color:#3FBE1B;}
.f-yellow1{color:#CC8200;}
.f-red1{color:#FC1F00;}
.f-blue {
color: #1969F9;
}
.f-green {
color: #3FBE1B;
}
.f-yellow1 {
color: #CC8200;
}
.f-red1 {
color: #FC1F00;
}
/**element-ui 样式重写**/
.el-pagination{
.el-pagination {
text-align: right;
margin-top: 20px;
}
.el-message--info {
min-width: auto !important;
border: 0px !important;
min-width : auto !important;
border : 0px !important;
background: rgba(0, 0, 0, 0.4) !important;
top:100px!important;
top : 100px !important;
.el-icon-info {
display: none;
}
......@@ -249,10 +264,10 @@ body {
//表单样式重写
.el-input__inner {
height: 38px;
height : 38px;
border-radius: 2px;
border: 1px solid #BEC9DF;
font-size: 14px;
border : 1px solid #BEC9DF;
font-size : 14px;
&:focus {
border: 1px solid #387FFF;
......@@ -282,8 +297,8 @@ body {
}
.el-message--info {
min-width: auto !important;
border: 0px !important;
min-width : auto !important;
border : 0px !important;
background: rgba(0, 0, 0, 0.4) !important;
.el-icon-info {
......@@ -295,32 +310,39 @@ body {
}
}
//表格样式重写
.el-table {
color: #646B78;
}
.el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner {
.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #1969F9;
border-color: #1969F9;
border-color : #1969F9;
}
.el-table__header {
th {
font-weight: normal;
}
.el-table__body tr.hover-row > td {
.el-table__body tr.hover-row>td {
background-color: #F1F8FF;
}
}
.th-all{
.th-all {
.el-table__header {
th {
background-color: #F1F4FA
}
}
}
.el-table__fixed {
.el-table__header {
th {
......@@ -352,46 +374,71 @@ body {
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius: 8px;
background: #fff;
width: 18px;
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;
background : #D2D9E7;
}
}
//js跟随提示框
.el-tooltip__popper {
border:0px!important;
box-shadow: 0px 0px 10px #ccc;
.boxxrth2021 {
width : 150px;
background : #fff;
font-size : 12px;
color : #333;
p {
height : 28px;
line-height: 28px;
span {
width: 50%;
}
}
}
}
.el-tooltip__popper[x-placement="top"] .popper__arrow{border-top-color:#fff!important;}
.el-tooltip__popper[x-placement="bottom"] .popper__arrow{border-bottom-color:#fff!important;}
//弹窗公共样式
.el-dialog__body {
padding:20px !important;
padding: 20px !important;
}
.el-dialog__title {
font-size: 14px;
color: #333;
font-size : 14px;
color : #333;
font-weight: bold;
position: relative;
position : relative;
&::after {
content: "";
position: absolute;
width: 5px;
height: 22px;
content : "";
position : absolute;
width : 5px;
height : 22px;
background: #1969F9;
left: -20px;
top: 2px;
left : -20px;
top : 2px;
}
}
.el-icon-close {
font-size: 24px;
&:hover, &:focus {
&:hover,
&:focus {
color: #1969F9 !important;
}
......@@ -400,7 +447,7 @@ body {
.el-message-box__container {
text-align: center;
padding: 15px 0px;
padding : 15px 0px;
}
.el-message-box__message {
......@@ -408,12 +455,12 @@ body {
}
.el-message-box__message p {
color: #333;
color : #333;
font-size: 16px;
}
.el-message-box__status.el-icon-error {
color: #FC1F00 !important;
color : #FC1F00 !important;
font-size: 25px !important;
}
......@@ -421,35 +468,38 @@ body {
content: "\E609";
}
.el-message-box__btns, .dialog-footer {
.el-message-box__btns,
.dialog-footer {
.el-button {
width: 76px;
height: 34px;
text-align: center;
line-height: 34px;
background: #E8ECF4;
border: 1px solid #E8ECF4;
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;
color : #8391AD;
font-size : 14px;
padding : 0px;
&:hover, &:focus {
color: #8391AD;
&:hover,
&:focus {
color : #8391AD;
background: #E8ECF4;
border: 1px solid #E8ECF4
border : 1px solid #E8ECF4
}
&.el-button--primary {
border: 1px solid #1969F9;
color: #fff;
border : 1px solid #1969F9;
color : #fff;
background: #1969F9;
&:hover, &:focus {
color: #fff;
&:hover,
&:focus {
color : #fff;
background: #1969F9;
border: 1px solid #1969F9
border : 1px solid #1969F9
}
}
......
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;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}.f-blue{color:#1969F9}.f-green{color:#3FBE1B}.f-yellow1{color:#CC8200}.f-red1{color:#FC1F00}.el-pagination{text-align:right;margin-top:20px}.el-message--info{min-width:auto !important;border:0px !important;background:rgba(0,0,0,0.4) !important;top:100px!important}.el-message--info .el-icon-info{display:none}.el-message--info .el-message__content{color:#fff !important}.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-checkbox__input.is-checked .el-checkbox__inner,.pagex .el-checkbox__input.is-indeterminate .el-checkbox__inner{background-color:#1969F9;border-color:#1969F9}.pagex .el-table__header th{font-weight:normal}.pagex .el-table__header .el-table__body tr.hover-row>td{background-color:#F1F8FF}.pagex .th-all .el-table__header th{background-color:#F1F4FA}.pagex .el-table__fixed .el-table__header th{background-color:#F1F4FA}.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: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}
\ 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}.f-blue{color:#1969F9}.f-green{color:#3FBE1B}.f-yellow1{color:#CC8200}.f-red1{color:#FC1F00}.el-pagination{text-align:right;margin-top:20px}.el-message--info{min-width:auto !important;border:0px !important;background:rgba(0,0,0,0.4) !important;top:100px !important}.el-message--info .el-icon-info{display:none}.el-message--info .el-message__content{color:#fff !important}.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-checkbox__input.is-checked .el-checkbox__inner,.pagex .el-checkbox__input.is-indeterminate .el-checkbox__inner{background-color:#1969F9;border-color:#1969F9}.pagex .el-table__header th{font-weight:normal}.pagex .el-table__header .el-table__body tr.hover-row>td{background-color:#F1F8FF}.pagex .th-all .el-table__header th{background-color:#F1F4FA}.pagex .el-table__fixed .el-table__header th{background-color:#F1F4FA}.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-tooltip__popper{border:0px!important;box-shadow:0 0 10px #ccc}.el-tooltip__popper .boxxrth2021{width:150px;background:#fff;font-size:12px;color:#333}.el-tooltip__popper .boxxrth2021 p{height:28px;line-height:28px}.el-tooltip__popper .boxxrth2021 p span{width:50%}.el-tooltip__popper[x-placement="top"] .popper__arrow{border-top-color:#fff !important}.el-tooltip__popper[x-placement="bottom"] .popper__arrow{border-bottom-color:#fff !important}.el-dialog__body{padding: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}
\ No newline at end of file
src/assets/css/store/list.less
......@@ -102,4 +102,26 @@
}
}
}
.price-more{
.more-search-btn{
width: 70px;
height: 26px;
background: #F1F4FA;
border-radius: 2px;
border: 1px solid #BEC9DF;
font-size: 12px;
color:#1969F9;
text-align: center;
transition: all 0.5s;
position: relative;
cursor: pointer;
&:hover{
border: 1px solid #1969F9;
}
}
}
}
\ No newline at end of file
src/assets/css/store/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: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
.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}.store-con .price-more .more-search-btn{width:70px;height:26px;background:#F1F4FA;border-radius:2px;border:1px solid #BEC9DF;font-size:12px;color:#1969F9;text-align:center;transition:all .5s;position:relative;cursor:pointer}.store-con .price-more .more-search-btn:hover{border:1px solid #1969F9}
\ No newline at end of file
src/components/menu.vue
......@@ -8,7 +8,7 @@
<font class="fl">概况</font>
</a>
<a class="item fl" :class="{'act':item.path==$route.path}" @click="tabUrl(item)" v-for="item in tabs">
<a class="item fl" :class="{'act':(JSON.stringify(item)==JSON.stringify({path: $route.path,title: $route.meta.title,query:$route.query}))}" @click="tabUrl(item)" v-for="item in tabs">
<font class="fl">{{item.title}}</font>
<span class="icon iconfont fl" @click.stop="closetab(item.path)"></span>
</a>
......@@ -187,6 +187,7 @@
if (tab_arr) {
this.tabs = JSON.parse(tab_arr);
}
let app_ = document.getElementById('app');
this.collapse = false
if (this.collapse) {
......
src/main.js
......@@ -50,7 +50,8 @@ router.afterEach((to, from, next) => {
tabOldJson = [
{
path: to.path,
title: to.meta.title
title: to.meta.title,
query:to.query
}
]
......
src/router/index.js
......@@ -52,7 +52,7 @@ const routes = [
path: '/listDetail',
name: 'ListDetail',
meta: {
title: '库存列表详情'
title: '库存导入详情'
},
component: () => import('../views/Store/listDetail.vue')
......
src/views/Store/enter.vue
......@@ -145,7 +145,7 @@
})
},
downwj() {
this.$http('get', "/api/uploadSku/downUploadCsv", {}).then(res => {
this.$http('post', "/api/uploadSku/downUploadCsv", {}).then(res => {
})
},
......
src/views/Store/list.vue
......@@ -40,9 +40,9 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="fl dcg">导出</div>
<div class="fl dcg heti">上架</div>
<div class="fl dcg heti xjk" @click="handleClose">下架</div>
<div class="fl dcg" @click="downOut">导出</div>
<div class="fl dcg heti" @click="changeStatus(1)">上架</div>
<div class="fl dcg heti xjk" @click="changeStatus(3)">下架</div>
</div>
<div class="data-box">
<el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange">
......@@ -63,18 +63,57 @@
</el-table-column>
<el-table-column prop="stock" label="库存数量" width="150">
</el-table-column>
<el-table-column prop="cn_delivery_time" label="国内含税价（￥）" width="150">
<el-table-column prop="cn_ladder_price" label="国内含税价（￥）" width="140">
<template slot-scope="scope" v-if="scope.row.cn_ladder_price&&scope.row.cn_ladder_price.length>0">
<div class="price-more">
<el-tooltip placement="bottom" effect="light">
<div slot="content">
<div class="boxxrth2021">
<p class="clr" v-for="item in scope.row.cn_ladder_price">
<span class="fl">{{item.purchases}}+</span>
<span class="fl">&yen;{{item.price}}</span>
</p>
</div>
</div>
<div class="more-search-btn">查看更多</div>
</el-tooltip>
</div>
</template>
</el-table-column>
<el-table-column prop="hk_delivery_time" label="香港交货价（＄）" width="150">
<el-table-column prop="hk_ladder_price" label="香港交货价（＄）" width="150">
<template slot-scope="scope" v-if="scope.row.hk_ladder_price&&scope.row.hk_ladder_price.length>0">
<div class="price-more">
<el-tooltip placement="bottom" effect="light">
<div slot="content">
<div class="boxxrth2021">
<p class="clr" v-for="item in scope.row.hk_ladder_price">
<span class="fl">{{item.purchases}}+</span>
<span class="fl">&yen;{{item.price}}</span>
</p>
</div>
</div>
<div class="more-search-btn">查看更多</div>
</el-tooltip>
</div>
</template>
</el-table-column>
<el-table-column prop="cn_delivery_time" label="大陆交期" width="150">
</el-table-column>
<el-table-column prop="hk_delivery_time" label="香港交期" width="150">
</el-table-column>
<el-table-column prop="status" label="状态" width="150">
<el-table-column prop="goods_status" label="状态" width="150">
<template slot-scope="scope">
<span v-if="scope.row.status==1" class="f-green">上架</span>
<span v-else-if="scope.row.status==3">下架</span>
<span v-if="scope.row.goods_status==1" class="f-green">上架</span>
<span v-else-if="scope.row.goods_status==3">下架</span>
</template>
</el-table-column>
......@@ -93,11 +132,12 @@
</el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="25%">
</el-table-column>
<el-table-column prop="inquiry_number" label="库存数量" min-width="25%">
<el-table-column prop="stock" label="库存数量" min-width="25%">
</el-table-column>
<el-table-column label="修改库存" min-width="25%">
<template slot-scope="scope">
<el-input v-model="updateKc" placeholder="点击修改"
<el-input v-model="scope.row.updateStock" placeholder="点击修改"
onkeyup="if(event.keyCode !=37 &amp;&amp; event.keyCode != 39){if (!/^[\d]+$/ig.test(this.value)){this.value='';}}">
</el-input>
</template>
......@@ -107,7 +147,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
<el-button type="primary" @click="submitKc">确 定</el-button>
</span>
</el-dialog>
<!--修改交期弹窗-->
......@@ -120,16 +160,15 @@
</el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="20%">
</el-table-column>
<el-table-column prop="inquiry_number" label="库存数量" min-width="20%">
<el-table-column prop="stock" label="库存数量" min-width="20%">
</el-table-column>
<el-table-column label="修改大陆交期" min-width="20%">
<template slot-scope="scope">
<div class="updatebox">
<el-input v-model="updateHqdl" placeholder="点击修改"
onkeyup="if(event.keyCode !=37 &amp;&amp; event.keyCode != 39){if (!/^[\d]+$/ig.test(this.value)){this.value='';}}">
<el-input v-model="updateHqdl" placeholder="如:2-5" @change="changedl(scope.row)">
</el-input>
<div class="selectdw">
<el-select v-model="updateHqdldw">
<el-select v-model="updateHqdldw" @change="changedl(scope.row)">
<el-option label="天" value="天"></el-option>
<el-option label="周" value="周"></el-option>
</el-select>
......@@ -141,8 +180,7 @@
<el-table-column label="修改香港交期" min-width="20%">
<template slot-scope="scope">
<div class="updatebox">
<el-input v-model="updateHqhk" placeholder="点击修改"
onkeyup="if(event.keyCode !=37 &amp;&amp; event.keyCode != 39){if (!/^[\d]+$/ig.test(this.value)){this.value='';}}">
<el-input v-model="updateHqhk" placeholder="如:2-5">
</el-input>
<div class="selectdw">
<el-select v-model="updateHqhkdw">
......@@ -188,9 +226,10 @@
MessageBox,
Dialog,
Pagination,
popover
Tooltip
} from 'element-ui'
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(popover)
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip)
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination)
export default {
name: "list",
......@@ -198,7 +237,7 @@
data() {
return {
total: 0,
limit: 1,
limit: 10,
page: 1,
dialogVisible: false,
dialogVisible2: false,
......@@ -211,77 +250,16 @@
},
multipleSelection: [],
selectData: [],
updateKc: "",
updateHq: "",
updateHqdl: "",
updateHqdldw: "天",
updateHqhk: "",
updateHqhkdw: "天",
huoqidata: [{
"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"
}, ],
kucundata: [{
"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"
}, ],
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"
}
]
huoqidata: [],
kucundata: [],
tableData: []
};
},
......@@ -310,6 +288,38 @@
}
})
},
submitKc() {
var arr_={}
var self=this;
for(var i=0;i<self.kucundata.length;i++){
arr_[self.kucundata[i]['goods_id']]={stock:self.kucundata[i]['updateStock']}
console.log(self.kucundata[i]['goods_id'])
}
console.log(arr_)
this.$http('post', "/api/sku/updateSku", arr_).then(res => {
if (res.err_code === 0) {
Message("修改成功");
this.getData()
this.dialogVisible = false
} else {
Message(res.err_msg);
}
})
},
changedl(item) {
console.log(item)
},
downOut() {
this.$http('get', "/api/sku/exportSku", {
page: this.page,
limit: this.limit,
status: this.formInline.status,
brand_id: this.formInline.brand_id,
action_time: this.formInline.date[0],
end_time: this.formInline.date[1]
}).then(res => {})
},
onSubmit() {
this.page = 1;
this.getData();
......@@ -320,28 +330,44 @@
},
handleSelectionChange(val) {
this.multipleSelection = val;
console.log(this.multipleSelection)
},
handleCommand(command) {
console.log(command)
if (this.multipleSelection.length == 0) {
Message("请至少选择一条数据")
return
}
this.selectData = JSON.parse(JSON.stringify(this.multipleSelection));
if (command == 1) {
//修改库存弹窗
this.dialogVisible = true
this.kucundata = this.selectData
} else {
//修改货期弹窗
this.dialogVisible2 = true
this.kucundata = this.selectData
}
},
handleClose(done) {
MessageBox.confirm('确认关闭？', {
type: 'error'
changeStatus(status) {
if (this.multipleSelection.length == 0) {
Message("请至少选择一条数据")
return
}
var arr = [];
for (var i = 0; i < this.multipleSelection.length; i++) {
arr.push(this.multipleSelection[i]['goods_id'])
}
this.$http('post', "/api/sku/updateSkuStatus", {
sku_ids: arr.join(","),
status: status == 1 ? 'passed' : 'offshelf'
}).then(res => {
if (res.err_code === 0) {
Message("操作成功");
this.getData()
} else {
Message(res.err_msg);
}
})
.then(() => {
done();
})
.catch(() => {});
}
},
......
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