Skip to content

肖康 / cloudSystem

Go to a project
Commit 8325f78c by 肖康
Options

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

parents 3148d33a 3576e2ae
Expand all
Inline Side-by-side
Showing with 378 additions and 189 deletions
package.json
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
"echarts": "^5.1.1", "echarts": "^5.1.1",
"element-ui": "^2.15.1", "element-ui": "^2.15.1",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-clipboard2": "^0.3.1",
"vue-router": "^3.2.0" "vue-router": "^3.2.0"
}, },
"devDependencies": { "devDependencies": {
......
src/assets/css/index/index.less
...@@ -476,7 +476,7 @@ ...@@ -476,7 +476,7 @@
} }
} }
.el-input__inner { .p-date {
height: 28px !important; height: 28px !important;
line-height: 28px !important; line-height: 28px !important;
} }
......
src/assets/css/index/index.min.css
...@@ -396,7 +396,7 @@ ...@@ -396,7 +396,7 @@
.home-index .inquiry .wrap .box2 .inp::-webkit-input-placeholder { .home-index .inquiry .wrap .box2 .inp::-webkit-input-placeholder {
color: #a1acc1; color: #a1acc1;
} }
.home-index .el-input__inner { .home-index .p-date {
height: 28px !important; height: 28px !important;
line-height: 28px !important; line-height: 28px !important;
} }
......
src/assets/css/list/inquire.less
...@@ -134,4 +134,23 @@ ...@@ -134,4 +134,23 @@
} }
} }
} }
.p-copy {
position: relative;
.copy {
position: absolute;
right: 0;
top: 0;
color: #1969F9;
cursor: pointer;
display: none;
}
&:hover {
.copy {
display: block;
}
}
}
} }
\ No newline at end of file
src/assets/css/list/inquire.min.css
...@@ -111,4 +111,18 @@ ...@@ -111,4 +111,18 @@
.store-con .updatebox .selectdw .el-select .el-input__suffix { .store-con .updatebox .selectdw .el-select .el-input__suffix {
display: none !important; display: none !important;
} }
.store-con .p-copy {
position: relative;
}
.store-con .p-copy .copy {
position: absolute;
right: 0;
top: 0;
color: #1969F9;
cursor: pointer;
display: none;
}
.store-con .p-copy:hover .copy {
display: block;
}
/*# sourceMappingURL=inquire.min.css.map */ /*# sourceMappingURL=inquire.min.css.map */
\ No newline at end of file
src/assets/css/list/inquire.min.css.map
{"version":3,"sources":["inquire.less"],"names":[],"mappings":"AAAA;EACE,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AAJF,UAME;EACE,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AAEA,UAXF,YAWG;EACC,mBAAA;;AAlBN,UAsBE;EACE,gBAAA;EACA,mBAAA;;AAxBJ,UAsBE,SAIE;EAEE,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,eAAA;EACA,WAAA;;AArCN,UAsBE,SAIE,QAaE;EACE,gBAAA;;AAGF,UArBJ,SAIE,QAiBG;EAEC,mBAAA;EACA,WAAA;;AA9CR,UAsBE,SA6BE;EACE,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,mBAAA;EACA,cAAA;EACA,iBAAA;EACA,eAAA;EACA,oBAAA;;AAEA,UA1CJ,SA6BE,KAaG;EACC,mBAAA;EACA,eAAA;EACA,WAAA;;AAGF,UAhDJ,SA6BE,KAmBG;EACC,WAAA;EACA,gBAAA;;AAEA,UApDN,SA6BE,KAmBG,KAIE;EACC,mBAAA;EACA,cAAA;;AAIJ,UA1DJ,SA6BE,KA6BG;EACC,kBAAA;EACA,WAAA;EACA,8BAAA;;AAEA,UA/DN,SA6BE,KA6BG,IAKE;EACC,8BAAA;;AAIJ,UApEJ,SA6BE,KAuCG;EACC,yBAAA;EACA,mBAAA;EACA,cAAA;;AAEA,UAzEN,SA6BE,KAuCG,OAKE;EACC,mBAAA;EACA,WAAA;;AAjGV,UAuGE;EACE,kBAAA;;AAxGJ,UAuGE,WAGE;EACE,YAAA;EACA,WAAA;EAEA,kBAAA;EACA,QAAA;EACA,UAAA;;AAhHN,UAuGE,WAGE,UAQE;EACE,WAAA;EACA,8BAAA;;AApHR,UAuGE,WAGE,UAQE,WAIE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,WAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AA7HV,UAuGE,WAGE,UAQE,WAeE;AAjIR,UAuGE,WAGE,UAQE,WAeqB;EACjB,wBAAA","file":"inquire.min.css"} {"version":3,"sources":["inquire.less"],"names":[],"mappings":"AAAA;EACE,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AAJF,UAME;EACE,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AAEA,UAXF,YAWG;EACC,mBAAA;;AAlBN,UAsBE;EACE,gBAAA;EACA,mBAAA;;AAxBJ,UAsBE,SAIE;EAEE,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,eAAA;EACA,WAAA;;AArCN,UAsBE,SAIE,QAaE;EACE,gBAAA;;AAGF,UArBJ,SAIE,QAiBG;EAEC,mBAAA;EACA,WAAA;;AA9CR,UAsBE,SA6BE;EACE,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,mBAAA;EACA,cAAA;EACA,iBAAA;EACA,eAAA;EACA,oBAAA;;AAEA,UA1CJ,SA6BE,KAaG;EACC,mBAAA;EACA,eAAA;EACA,WAAA;;AAGF,UAhDJ,SA6BE,KAmBG;EACC,WAAA;EACA,gBAAA;;AAEA,UApDN,SA6BE,KAmBG,KAIE;EACC,mBAAA;EACA,cAAA;;AAIJ,UA1DJ,SA6BE,KA6BG;EACC,kBAAA;EACA,WAAA;EACA,8BAAA;;AAEA,UA/DN,SA6BE,KA6BG,IAKE;EACC,8BAAA;;AAIJ,UApEJ,SA6BE,KAuCG;EACC,yBAAA;EACA,mBAAA;EACA,cAAA;;AAEA,UAzEN,SA6BE,KAuCG,OAKE;EACC,mBAAA;EACA,WAAA;;AAjGV,UAuGE;EACE,kBAAA;;AAxGJ,UAuGE,WAGE;EACE,YAAA;EACA,WAAA;EAEA,kBAAA;EACA,QAAA;EACA,UAAA;;AAhHN,UAuGE,WAGE,UAQE;EACE,WAAA;EACA,8BAAA;;AApHR,UAuGE,WAGE,UAQE,WAIE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,WAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AA7HV,UAuGE,WAGE,UAQE,WAeE;AAjIR,UAuGE,WAGE,UAQE,WAeqB;EACjB,wBAAA;;AAlIV,UAyIE;EACE,kBAAA;;AA1IJ,UAyIE,QAGE;EACE,kBAAA;EACA,QAAA;EACA,MAAA;EACA,cAAA;EACA,eAAA;EACA,aAAA;;AAGF,UAZF,QAYG,MACC;EACE,cAAA","file":"inquire.min.css"}
\ No newline at end of file \ No newline at end of file
src/assets/css/list/quote.less
...@@ -134,4 +134,12 @@ ...@@ -134,4 +134,12 @@
} }
} }
} }
}
\ No newline at end of file .price-more {
.more-search-btn {
&:hover {
color: #1969f9;
}
}
}
}
src/assets/css/list/quote.min.css
...@@ -111,4 +111,7 @@ ...@@ -111,4 +111,7 @@
.store-con .updatebox .selectdw .el-select .el-input__suffix { .store-con .updatebox .selectdw .el-select .el-input__suffix {
display: none !important; display: none !important;
} }
.store-con .price-more .more-search-btn:hover {
color: #1969f9;
}
/*# sourceMappingURL=quote.min.css.map */ /*# sourceMappingURL=quote.min.css.map */
\ No newline at end of file
src/assets/css/list/quote.min.css.map
{"version":3,"sources":["quote.less"],"names":[],"mappings":"AAAA;EACE,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AAJF,UAME;EACE,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AAEA,UAXF,YAWG;EACC,mBAAA;;AAlBN,UAsBE;EACE,gBAAA;EACA,mBAAA;;AAxBJ,UAsBE,SAIE;EAEE,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,eAAA;EACA,WAAA;;AArCN,UAsBE,SAIE,QAaE;EACE,gBAAA;;AAGF,UArBJ,SAIE,QAiBG;EAEC,mBAAA;EACA,WAAA;;AA9CR,UAsBE,SA6BE;EACE,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,mBAAA;EACA,cAAA;EACA,iBAAA;EACA,eAAA;EACA,oBAAA;;AAEA,UA1CJ,SA6BE,KAaG;EACC,mBAAA;EACA,eAAA;EACA,WAAA;;AAGF,UAhDJ,SA6BE,KAmBG;EACC,WAAA;EACA,gBAAA;;AAEA,UApDN,SA6BE,KAmBG,KAIE;EACC,mBAAA;EACA,cAAA;;AAIJ,UA1DJ,SA6BE,KA6BG;EACC,kBAAA;EACA,WAAA;EACA,8BAAA;;AAEA,UA/DN,SA6BE,KA6BG,IAKE;EACC,8BAAA;;AAIJ,UApEJ,SA6BE,KAuCG;EACC,yBAAA;EACA,mBAAA;EACA,cAAA;;AAEA,UAzEN,SA6BE,KAuCG,OAKE;EACC,mBAAA;EACA,WAAA;;AAjGV,UAuGE;EACE,kBAAA;;AAxGJ,UAuGE,WAGE;EACE,YAAA;EACA,WAAA;EAEA,kBAAA;EACA,QAAA;EACA,UAAA;;AAhHN,UAuGE,WAGE,UAQE;EACE,WAAA;EACA,8BAAA;;AApHR,UAuGE,WAGE,UAQE,WAIE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,WAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AA7HV,UAuGE,WAGE,UAQE,WAeE;AAjIR,UAuGE,WAGE,UAQE,WAeqB;EACjB,wBAAA","file":"quote.min.css"} {"version":3,"sources":["quote.less"],"names":[],"mappings":"AAAA;EACE,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AAJF,UAME;EACE,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AAEA,UAXF,YAWG;EACC,mBAAA;;AAlBN,UAsBE;EACE,gBAAA;EACA,mBAAA;;AAxBJ,UAsBE,SAIE;EAEE,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,eAAA;EACA,WAAA;;AArCN,UAsBE,SAIE,QAaE;EACE,gBAAA;;AAGF,UArBJ,SAIE,QAiBG;EAEC,mBAAA;EACA,WAAA;;AA9CR,UAsBE,SA6BE;EACE,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,mBAAA;EACA,cAAA;EACA,iBAAA;EACA,eAAA;EACA,oBAAA;;AAEA,UA1CJ,SA6BE,KAaG;EACC,mBAAA;EACA,eAAA;EACA,WAAA;;AAGF,UAhDJ,SA6BE,KAmBG;EACC,WAAA;EACA,gBAAA;;AAEA,UApDN,SA6BE,KAmBG,KAIE;EACC,mBAAA;EACA,cAAA;;AAIJ,UA1DJ,SA6BE,KA6BG;EACC,kBAAA;EACA,WAAA;EACA,8BAAA;;AAEA,UA/DN,SA6BE,KA6BG,IAKE;EACC,8BAAA;;AAIJ,UApEJ,SA6BE,KAuCG;EACC,yBAAA;EACA,mBAAA;EACA,cAAA;;AAEA,UAzEN,SA6BE,KAuCG,OAKE;EACC,mBAAA;EACA,WAAA;;AAjGV,UAuGE;EACE,kBAAA;;AAxGJ,UAuGE,WAGE;EACE,YAAA;EACA,WAAA;EAEA,kBAAA;EACA,QAAA;EACA,UAAA;;AAhHN,UAuGE,WAGE,UAQE;EACE,WAAA;EACA,8BAAA;;AApHR,UAuGE,WAGE,UAQE,WAIE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,WAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AA7HV,UAuGE,WAGE,UAQE,WAeE;AAjIR,UAuGE,WAGE,UAQE,WAeqB;EACjB,wBAAA;;AASJ,UAFJ,YACE,iBACG;EACC,cAAA","file":"quote.min.css"}
\ No newline at end of file \ No newline at end of file
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, html,
body { body {
font-family : PingFangSC-Regular, PingFang SC, 'Microsoft Yahei', sans-serif; font-family: PingFangSC-Regular, PingFang SC, 'Microsoft Yahei', sans-serif;
font-style : normal; font-style: normal;
-webkit-font-smoothing : antialiased; -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, body,
...@@ -56,7 +56,7 @@ header, ...@@ -56,7 +56,7 @@ header,
menu, menu,
nav, nav,
section { section {
margin : 0; margin: 0;
padding: 0; padding: 0;
} }
...@@ -64,8 +64,8 @@ button, ...@@ -64,8 +64,8 @@ button,
input, input,
select, select,
textarea { textarea {
font-size : 100%; font-size: 100%;
border : none; border: none;
-webkit-appearance: none; -webkit-appearance: none;
} }
...@@ -77,7 +77,7 @@ input[type=submit] { ...@@ -77,7 +77,7 @@ input[type=submit] {
table { table {
border-collapse: collapse; border-collapse: collapse;
border-spacing : 0; border-spacing: 0;
} }
ol, ol,
...@@ -92,7 +92,7 @@ h3, ...@@ -92,7 +92,7 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-size : 100%; font-size: 100%;
font-weight: 500; font-weight: 500;
} }
...@@ -116,20 +116,20 @@ img { ...@@ -116,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;
} }
...@@ -147,38 +147,38 @@ img { ...@@ -147,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;
} }
...@@ -204,16 +204,16 @@ img { ...@@ -204,16 +204,16 @@ 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, html,
body { body {
width : 100%; width: 100%;
height : 100%; height: 100%;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
...@@ -245,10 +245,10 @@ body { ...@@ -245,10 +245,10 @@ body {
} }
.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;
top : 100px !important; top: 100px !important;
.el-icon-info { .el-icon-info {
display: none; display: none;
...@@ -264,10 +264,10 @@ body { ...@@ -264,10 +264,10 @@ body {
//表单样式重写 //表单样式重写
.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;
...@@ -297,8 +297,8 @@ body { ...@@ -297,8 +297,8 @@ body {
} }
.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 {
...@@ -311,7 +311,6 @@ body { ...@@ -311,7 +311,6 @@ body {
} }
//表格样式重写 //表格样式重写
.el-table { .el-table {
color: #646B78; color: #646B78;
...@@ -320,7 +319,7 @@ body { ...@@ -320,7 +319,7 @@ body {
.el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner { .el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #1969F9; background-color: #1969F9;
border-color : #1969F9; border-color: #1969F9;
} }
.el-table__header { .el-table__header {
...@@ -328,7 +327,7 @@ body { ...@@ -328,7 +327,7 @@ body {
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;
} }
...@@ -374,71 +373,86 @@ body { ...@@ -374,71 +373,86 @@ body {
} }
.el-table__body-wrapper::-webkit-scrollbar-thumb { .el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius : 8px; border-radius: 8px;
background : #fff; background: #fff;
width : 18px; width: 18px;
-webkit-box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.2);
} }
.el-table__body-wrapper::-webkit-scrollbar-track { .el-table__body-wrapper::-webkit-scrollbar-track {
border-radius: 0; border-radius: 0;
background : #D2D9E7; background: #D2D9E7;
} }
} }
.el-cascader-panel{
.el-cascader-panel {
min-height: 150px; min-height: 150px;
max-height: 300px; max-height: 300px;
} }
.placehoload .el-input__inner::-webkit-input-placeholder {
.placehoload .el-input__inner::-webkit-input-placeholder {
color: #333; color: #333;
} }
//js跟随提示框
.el-tooltip__popper { //js跟随提示框
box-shadow: 1px 2px 10px 0px rgba(119, 135, 145, 0.5); .el-tooltip__popper {
border: 1px solid #387FFF!important; box-shadow: 1px 2px 10px 0px rgba(119, 135, 145, 0.5);
border-radius: 0px!important; border: 1px solid #387FFF !important;
.boxxrth2021 { border-radius: 0px !important;
width : 150px;
background : #fff; .boxxrth2021 {
font-size : 12px; width: 150px;
color : #333; background: #fff;
p { font-size: 12px;
height : 28px; color: #333;
line-height: 28px;
p {
span { height: 28px;
width: 50%; line-height: 28px;
}
span {
width: 50%;
} }
} }
} }
.el-tooltip__popper[x-placement="top"] .popper__arrow{border-top-color:#387FFF!important;}
.el-tooltip__popper[x-placement="bottom"] .popper__arrow{border-bottom-color:#387FFF!important;}
}
.el-tooltip__popper[x-placement="top"] .popper__arrow {
border-top-color: #387FFF !important;
}
.el-tooltip__popper[x-placement="bottom"] .popper__arrow {
border-bottom-color: #387FFF !important;
}
.el-tooltip__popper.is-light[x-placement^=top] .popper__arrow{
border-top-color: #387FFF !important;
}
.el-tooltip__popper.is-light[x-placement^=bottom] .popper__arrow{
border-bottom-color: #387FFF !important;
}
//弹窗公共样式 //弹窗公共样式
.el-dialog__body { .el-dialog__body {
padding: 20px !important; padding: 20px !important;
} }
.el-dialog__title { .el-dialog__title {
font-size : 14px; font-size: 14px;
color : #333; color: #333;
font-weight: bold; font-weight: bold;
position : relative; position: relative;
&::after { &::after {
content : ""; content: "";
position : absolute; position: absolute;
width : 5px; width: 5px;
height : 22px; height: 22px;
background: #1969F9; background: #1969F9;
left : -20px; left: -20px;
top : 2px; top: 2px;
} }
} }
...@@ -455,7 +469,7 @@ border-radius: 0px!important; ...@@ -455,7 +469,7 @@ border-radius: 0px!important;
.el-message-box__container { .el-message-box__container {
text-align: center; text-align: center;
padding : 15px 0px; padding: 15px 0px;
} }
.el-message-box__message { .el-message-box__message {
...@@ -463,12 +477,12 @@ border-radius: 0px!important; ...@@ -463,12 +477,12 @@ border-radius: 0px!important;
} }
.el-message-box__message p { .el-message-box__message p {
color : #333; color: #333;
font-size: 16px; font-size: 16px;
} }
.el-message-box__status.el-icon-error { .el-message-box__status.el-icon-error {
color : #FC1F00 !important; color: #FC1F00 !important;
font-size: 25px !important; font-size: 25px !important;
} }
...@@ -480,36 +494,62 @@ border-radius: 0px!important; ...@@ -480,36 +494,62 @@ border-radius: 0px!important;
.dialog-footer { .dialog-footer {
.el-button { .el-button {
width : 76px; width: 76px;
height : 34px; height: 34px;
text-align : center; text-align: center;
line-height : 34px; line-height: 34px;
background : #E8ECF4; background: #E8ECF4;
border : 1px solid #E8ECF4; border: 1px solid #E8ECF4;
border-radius: 2px; border-radius: 2px;
color : #8391AD; color: #8391AD;
font-size : 14px; font-size: 14px;
padding : 0px; padding: 0px;
&:hover, &:hover,
&:focus { &:focus {
color : #8391AD; color: #8391AD;
background: #E8ECF4; background: #E8ECF4;
border : 1px solid #E8ECF4 border: 1px solid #E8ECF4
} }
&.el-button--primary { &.el-button--primary {
border : 1px solid #1969F9; border: 1px solid #1969F9;
color : #fff; color: #fff;
background: #1969F9; background: #1969F9;
&:hover, &:hover,
&:focus { &:focus {
color : #fff; color: #fff;
background: #1969F9; background: #1969F9;
border : 1px solid #1969F9 border: 1px solid #1969F9
} }
} }
} }
}
.p-text {
margin-bottom: 6px;
em {
width: 56px;
text-align: left;
}
span {
width: 214px;
height: 30px;
background: #F1F4FA;
border-radius: 2px;
font-size: 14px;
color: #333333;
padding-left: 7px;
margin-left: 8px;
text-align: left;
}
}
.popper-class-box{
.popper__arrow{
left: 20px !important;
}
} }
\ No newline at end of file
src/assets/css/public/common.min.css
...@@ -301,7 +301,7 @@ body { ...@@ -301,7 +301,7 @@ body {
.el-tooltip__popper { .el-tooltip__popper {
box-shadow: 1px 2px 10px 0px rgba(119, 135, 145, 0.5); box-shadow: 1px 2px 10px 0px rgba(119, 135, 145, 0.5);
border: 1px solid #387FFF !important; border: 1px solid #387FFF !important;
border-radius: 0px!important; border-radius: 0px !important;
} }
.el-tooltip__popper .boxxrth2021 { .el-tooltip__popper .boxxrth2021 {
width: 150px; width: 150px;
...@@ -322,6 +322,12 @@ body { ...@@ -322,6 +322,12 @@ body {
.el-tooltip__popper[x-placement="bottom"] .popper__arrow { .el-tooltip__popper[x-placement="bottom"] .popper__arrow {
border-bottom-color: #387FFF !important; border-bottom-color: #387FFF !important;
} }
.el-tooltip__popper.is-light[x-placement^=top] .popper__arrow {
border-top-color: #387FFF !important;
}
.el-tooltip__popper.is-light[x-placement^=bottom] .popper__arrow {
border-bottom-color: #387FFF !important;
}
.el-dialog__body { .el-dialog__body {
padding: 20px !important; padding: 20px !important;
} }
...@@ -400,4 +406,25 @@ body { ...@@ -400,4 +406,25 @@ body {
background: #1969F9; background: #1969F9;
border: 1px solid #1969F9; border: 1px solid #1969F9;
} }
.p-text {
margin-bottom: 6px;
}
.p-text em {
width: 56px;
text-align: left;
}
.p-text span {
width: 214px;
height: 30px;
background: #F1F4FA;
border-radius: 2px;
font-size: 14px;
color: #333333;
padding-left: 7px;
margin-left: 8px;
text-align: left;
}
.popper-class-box .popper__arrow {
left: 20px !important;
}
/*# sourceMappingURL=common.min.css.map */ /*# sourceMappingURL=common.min.css.map */
\ No newline at end of file
src/assets/css/public/common.min.css.map
{"version":3,"sources":["common.less"],"names":[],"mappings":"AAAA;EACE,8BAAA;EACA,0BAAA;;AAGF,IAAK;EACH,UAAA;EACA,yCAAA;EACA,6CAAA;;AAGF;AACA;EACE,8CAA0D,6BAA1D;EACA,kBAAA;EACA,mCAAA;EACA,kCAAA;EACA,eAAA;EACA,cAAA;;AAGF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,SAAA;EACA,UAAA;;AAGF;AACA;AACA;AACA;EACE,eAAA;EACA,YAAA;EACA,wBAAA;;AAGF,KAAK;AACL,KAAK;AACL,KAAK;EACH,eAAA;;AAGF;EACE,yBAAA;EACA,iBAAA;;AAGF;AACA;AACA;EACE,gBAAA;;AAGF;AACA;AACA;AACA;AACA;AACA;EACE,eAAA;EACA,gBAAA;;AAGF;AACA;AACA;EACE,kBAAA;;AAGF;EACE,qBAAA;;AAGF;EACE,YAAA;;AAGF;EACE,QAAA;EACA,WAAA;;AAGF,IAAI;EACF,SAAY,GAAZ;EACA,WAAA;EACA,SAAA;EACA,kBAAA;EACA,cAAA;;AAGF;EACE,WAAA;EACA,gBAAA;;AAGF;EACE,YAAA;EACA,gBAAA;;AAGF;EACE,mBAAA;;AAGF;EACE,sBAAA;;AAGF;EACE,sBAAA;;AAIF;EACE,qBAAA;EACA,gBAAA;EACA,OAAA;EACA,sBAAA;EACA,oBAAA;;AAGF;EACE,uBAAA;EACA,mBAAA;;AAGF;EACE,iBAAA;EACA,UAAA;EACA,YAAA;EACA,YAAA;EACA,sBAAA;;AAGF;EACE,8BAAA;EACA,sBAAA;;AAGF;EACE,aAAA;EACA,sBAAA;;AAGF;EACE,aAAA;EACA,mBAAA;;;AAIF;EACE,8BAAA;;;AAIF;EACE,6BAAA;;;AAIF;EACE,uBAAA;;;AAIF;EACE,mBAAA;;AAGF;EACE,mBAAA;EACA,gBAAA;EACA,eAAA;EACA,WAAA;EACA,OAAA;;AAGF;AACA;EACE,WAAA;EACA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","file":"common.min.css"} {"version":3,"sources":["common.less"],"names":[],"mappings":"AAAA;EACE,8BAAA;EACA,0BAAA;;AAGF,IAAK;EACH,UAAA;EACA,yCAAA;EACA,6CAAA;;AAGF;AACA;EACE,8CAA8C,6BAA9C;EACA,kBAAA;EACA,mCAAA;EACA,kCAAA;EACA,eAAA;EACA,cAAA;;AAGF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,SAAA;EACA,UAAA;;AAGF;AACA;AACA;AACA;EACE,eAAA;EACA,YAAA;EACA,wBAAA;;AAGF,KAAK;AACL,KAAK;AACL,KAAK;EACH,eAAA;;AAGF;EACE,yBAAA;EACA,iBAAA;;AAGF;AACA;AACA;EACE,gBAAA;;AAGF;AACA;AACA;AACA;AACA;AACA;EACE,eAAA;EACA,gBAAA;;AAGF;AACA;AACA;EACE,kBAAA;;AAGF;EACE,qBAAA;;AAGF;EACE,YAAA;;AAGF;EACE,QAAA;EACA,WAAA;;AAGF,IAAI;EACF,SAAS,GAAT;EACA,WAAA;EACA,SAAA;EACA,kBAAA;EACA,cAAA;;AAGF;EACE,WAAA;EACA,gBAAA;;AAGF;EACE,YAAA;EACA,gBAAA;;AAGF;EACE,mBAAA;;AAGF;EACE,sBAAA;;AAGF;EACE,sBAAA;;AAIF;EACE,qBAAA;EACA,gBAAA;EACA,OAAA;EACA,sBAAA;EACA,oBAAA;;AAGF;EACE,uBAAA;EACA,mBAAA;;AAGF;EACE,iBAAA;EACA,UAAA;EACA,YAAA;EACA,YAAA;EACA,sBAAA;;AAGF;EACE,8BAAA;EACA,sBAAA;;AAGF;EACE,aAAA;EACA,sBAAA;;AAGF;EACE,aAAA;EACA,mBAAA;;;AAIF;EACE,8BAAA;;;AAIF;EACE,6BAAA;;;AAIF;EACE,uBAAA;;;AAIF;EACE,mBAAA;;AAGF;EACE,mBAAA;EACA,gBAAA;EACA,eAAA;EACA,WAAA;EACA,OAAA;;AAGF;AACA;EACE,WAAA;EACA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","file":"common.min.css"}
\ No newline at end of file \ No newline at end of file
src/components/menu.vue
...@@ -121,22 +121,23 @@ ...@@ -121,22 +121,23 @@
</div> </div>
</div> </div>
<!--修改库存弹窗--> <!--修改库存弹窗-->
<el-dialog title="修改密码" :visible.sync="dialogVisible" width="500px"> <el-dialog title="修改密码" :visible.sync="dialogVisible" width="500px" class="demo-ruleForm">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
<el-form-item label="原始密码" prop="name"> <el-form-item label="原始密码" prop="old_password">
<el-input v-model="ruleForm.name"></el-input> <el-input v-model="ruleForm.old_password" type='password' placeholder='请输入原始密码'></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新密码" prop="name"> <el-form-item label="新密码" prop="password">
<el-input v-model="ruleForm.name"></el-input> <el-input v-model="ruleForm.password" type='password' placeholder='请输入新密码'></el-input>
</el-form-item> </el-form-item>
<el-form-item label="确认新密码" prop="name"> <el-form-item label="确认新密码" prop="repassword">
<el-input v-model="ruleForm.name"></el-input> <el-input v-model="ruleForm.repassword" type='password' placeholder='请输入新密码'></el-input>
</el-form-item>
<el-form-item>
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submitForm('ruleForm')">确 定</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
</div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -148,6 +149,7 @@ ...@@ -148,6 +149,7 @@
import { import {
Form, Form,
FormItem, FormItem,
Input,
Menu, Menu,
MenuItem, MenuItem,
Submenu, Submenu,
...@@ -157,7 +159,8 @@ ...@@ -157,7 +159,8 @@
Button Button
} from 'element-ui' } from 'element-ui'
Vue.use(Menu).use(MenuItem).use(MenuItemGroup).use(Submenu).use(Form).use(FormItem).use(Dialog).use(Button); Vue.use(Menu).use(MenuItem).use(MenuItemGroup).use(Submenu).use(Form).use(FormItem).use(Dialog).use(Button).use(Input);
export default { export default {
name: 'menus', name: 'menus',
...@@ -166,6 +169,15 @@ ...@@ -166,6 +169,15 @@
this.getData(); this.getData();
}, },
data() { data() {
var validatePass2 = (rule, value, callback) => {
if (value === '') {
callback(new Error('请再次输入密码'))
} else if (value !== this.ruleForm.password) {
callback(new Error('两次输入密码不一致!'))
} else {
callback()
}
}
return { return {
userinfo: {}, userinfo: {},
collapse: false, collapse: false,
...@@ -174,14 +186,20 @@ ...@@ -174,14 +186,20 @@
tabs: "", tabs: "",
dialogVisible: false, dialogVisible: false,
ruleForm: { ruleForm: {
name: '' old_password: '',
password: '',
repassword: ''
}, },
rules: { rules: {
name: [{ old_password: [
required: true, {required: true, message: '请输入原始密码', trigger: 'blur'}
message: '请输入活动名称', ],
trigger: 'blur' password: [
}] {required: true, message: '请输入新密码', trigger: 'blur'}
],
repassword: [
{required: true, trigger: 'blur', validator: validatePass2}
]
} }
} }
}, },
...@@ -298,6 +316,30 @@ ...@@ -298,6 +316,30 @@
handleSelect(key, keyPath) { handleSelect(key, keyPath) {
this.tabss(key) this.tabss(key)
}, },
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.$http('post', "/api/user/setpasswd", this.ruleForm).then(res => {
if (res.err_code === 0) {
Message('修改成功');
setTimeout(() => {
Util.delCookie('token');
window.location.href = '/#/login';
sessionStorage.removeItem('userInfox')
history.go(0);
}, 2000)
} else {
Message(res.err_msg);
}
}).catch(err => {
console.log(err.message);
})
} else {
console.log('error submit!!');
return false;
}
});
},
logout() { logout() {
this.$http('post', "/auth/logout").then(res => { this.$http('post', "/auth/logout").then(res => {
Util.delCookie('token'); Util.delCookie('token');
......
src/views/Index/index.vue
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
</ul> </ul>
<el-form> <el-form>
<el-form-item label=""> <el-form-item label="">
<el-date-picker v-model="date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> <el-date-picker class="p-date" v-model="date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -305,22 +305,6 @@ ...@@ -305,22 +305,6 @@
}, },
computed: {},
methods: {
ceshi() {
/* Message('这是一条消息提示');
this.$http('get', "/getJoke1", {
page: 1, count: 2, type: 'video'
}).then(res => {
console.log(res)
})
.catch(err => {
console.log(err.message);
})
*/
}
},
components: { components: {
Menu Menu
} }
......
src/views/List/inquire.vue
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<div class="store-con"> <div class="store-con">
<el-form :inline="true" :model="formInline" class="demo-form-inline"> <el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="型号"> <el-form-item label="型号">
<el-autocomplete v-model="formInline.goods_name" :trigger-on-focus="false" :fetch-suggestions="querySearchAsync" placeholder="请输入型号" @select="handleSelectGoodsName" ></el-autocomplete> <el-autocomplete v-model="formInline.goods_name" :trigger-on-focus="false" :fetch-suggestions="querySearchAsync" placeholder="请输入型号" @select="handleSelectGoodsName"></el-autocomplete>
</el-form-item> </el-form-item>
<el-form-item label="品牌"> <el-form-item label="品牌">
<el-autocomplete v-model="formInline.brand_name" :trigger-on-focus="false" :fetch-suggestions="querySearchAsync2" placeholder="请输入品牌" @select="handleSelectBrandName" ></el-autocomplete> <el-autocomplete v-model="formInline.brand_name" :trigger-on-focus="false" :fetch-suggestions="querySearchAsync2" placeholder="请输入品牌" @select="handleSelectBrandName"></el-autocomplete>
</el-form-item> </el-form-item>
<el-form-item label="询价日期"> <el-form-item label="询价日期">
<el-date-picker v-model="formInline.date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> <el-date-picker v-model="formInline.date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
...@@ -20,11 +20,18 @@ ...@@ -20,11 +20,18 @@
<div class="fl dcg" @click="exportChange">导出</div> <div class="fl dcg" @click="exportChange">导出</div>
<div class="fl dcg delbtn" @click="del">删除</div> <div class="fl dcg delbtn" @click="del">删除</div>
</div> </div>
<div class="data-box"> <div class="data-box th-all">
<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 type="selection" width="40" align="center"></el-table-column> <el-table-column type="selection" width="40" align="center"></el-table-column>
<el-table-column prop="inquiry_sn" label="询价单号" min-width="10%"></el-table-column> <el-table-column prop="inquiry_sn" label="询价单号" min-width="10%"></el-table-column>
<el-table-column prop="goods_name" label="型号" min-width="10%"></el-table-column> <el-table-column prop="goods_name" label="型号" min-width="10%">
<template slot-scope="scope">
<div class="p-copy">
<p>{{scope.row.goods_name}}</p>
<a class="copy" v-clipboard:copy="scope.row.goods_name" v-clipboard:success="onCopy">复制</a>
</div>
</template>
</el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="10%"></el-table-column> <el-table-column prop="brand_name" label="品牌" min-width="10%"></el-table-column>
<el-table-column prop="inquiry_number" label="数量" min-width="10%"></el-table-column> <el-table-column prop="inquiry_number" label="数量" min-width="10%"></el-table-column>
<el-table-column prop="batch" label="批次" min-width="10%"></el-table-column> <el-table-column prop="batch" label="批次" min-width="10%"></el-table-column>
...@@ -50,6 +57,7 @@ ...@@ -50,6 +57,7 @@
import Vue from 'vue'; import Vue from 'vue';
import Menu from "@/components/menu.vue"; import Menu from "@/components/menu.vue";
import {dateTimeFormate} from "../../filters/formate.js"; import {dateTimeFormate} from "../../filters/formate.js";
import VueClipboard from 'vue-clipboard2'
import { import {
Form, Form,
FormItem, FormItem,
...@@ -64,7 +72,6 @@ ...@@ -64,7 +72,6 @@
Table, Table,
TableColumn, TableColumn,
Message, Message,
MessageBox,
Dialog, Dialog,
Pagination, Pagination,
Autocomplete Autocomplete
...@@ -72,13 +79,14 @@ ...@@ -72,13 +79,14 @@
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete); Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination); Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination);
Vue.use(VueClipboard);
export default { export default {
name: "inquire", name: "inquire",
data() { data() {
return { return {
total: 0, total: 0,
limit: 1, limit: 10,
page: 1, page: 1,
tableData: [], tableData: [],
multipleSelection: [], multipleSelection: [],
...@@ -101,12 +109,12 @@ ...@@ -101,12 +109,12 @@
limit: this.limit, limit: this.limit,
goods_name: this.formInline.goods_name, goods_name: this.formInline.goods_name,
brand: this.formInline.brand, brand: this.formInline.brand,
start_time: this.formInline.date[0], start_time: this.formInline.date ? this.formInline.date[0] : '',
end_time: this.formInline.date[1] end_time: this.formInline.date ? this.formInline.date[1] : ''
}).then(res => { }).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
this.tableData = res.data.list || []; this.tableData = res.data.list || [];
this.total = res.data.count || 3; this.total = res.data.total;
} else { } else {
Message(res.err_msg); Message(res.err_msg);
} }
...@@ -134,20 +142,25 @@ ...@@ -134,20 +142,25 @@
return; return;
} }
if (this.multipleSelection.length > 1) { if (this.multipleSelection.length > 1) {
Message("请选择一条询价信息"); Message("请选择一条询价信息");
return; return;
} }
for (var i = 0; i < this.multipleSelection.length; i++) { if (this.multipleSelection[0].status == 1 || this.multipleSelection[0].status == 2) {
arr.push(this.multipleSelection[i]['id']) for (var i = 0; i < this.multipleSelection.length; i++) {
} arr.push(this.multipleSelection[i]['id'])
}
this.$router.push({
path: '/inquire/detail?id=' + arr.join(",")
})
} else {
Message("该订单不可报价");
return;
}
this.$router.push({
path:'/inquire/detail?id='+arr.join(",")
})
}, },
exportChange() { exportChange() {
var arr = []; var arr = [];
...@@ -190,21 +203,21 @@ ...@@ -190,21 +203,21 @@
}) })
}, },
handleSelectGoodsName(item) { handleSelectGoodsName(item) {
this.formInline.goods_name=item.value this.formInline.goods_name = item.value
}, },
handleSelectBrandName(item){ handleSelectBrandName(item) {
this.formInline.brand_name=item.value; this.formInline.brand_name = item.value;
this.formInline.brand_id=item.brand_id; this.formInline.brand_id = item.brand_id;
}, },
querySearchAsync(queryString, cb) { querySearchAsync(queryString, cb) {
this.$http('get', "/api/search/getspu", { this.$http('get', "/api/search/getspu", {
spu_name: this.formInline.goods_name spu_name: this.formInline.goods_name
}).then(res => { }).then(res => {
if (res.err_code == 0) { if (res.err_code == 0) {
var arrlist_=res.data||[]; var arrlist_ = res.data || [];
var arr_=[] var arr_ = []
for(var i=0;i<arrlist_.length;i++){ for (var i = 0; i < arrlist_.length; i++) {
arr_.push({value:arrlist_[i]['spu_name']}) arr_.push({value: arrlist_[i]['spu_name']})
} }
cb(arr_); cb(arr_);
} }
...@@ -215,16 +228,19 @@ ...@@ -215,16 +228,19 @@
brand_name: this.formInline.brand_name brand_name: this.formInline.brand_name
}).then(res => { }).then(res => {
if (res.err_code == 0) { if (res.err_code == 0) {
var arrlist_=res.data||[]; var arrlist_ = res.data || [];
this.brandList=[] this.brandList = []
this.formInline.brand_id="" this.formInline.brand_id = ""
for(var i=0;i<arrlist_.length;i++){ for (var i = 0; i < arrlist_.length; i++) {
this.brandList.push({value:arrlist_[i]['brand_name'],brand_id:arrlist_[i]['brand_id']}) this.brandList.push({value: arrlist_[i]['brand_name'], brand_id: arrlist_[i]['brand_id']})
} }
cb(this.brandList); cb(this.brandList);
} }
}) })
} },
onCopy(e) {
Message('复制成功');
},
}, },
components: { components: {
Menu Menu
......
src/views/List/quote.vue
...@@ -29,10 +29,40 @@ ...@@ -29,10 +29,40 @@
<div class="fl dcg" @click="close">关闭</div> <div class="fl dcg" @click="close">关闭</div>
<div class="fl dcg delbtn" @click="del">删除</div> <div class="fl dcg delbtn" @click="del">删除</div>
</div> </div>
<div class="data-box"> <div class="data-box th-all">
<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="40" align="center"></el-table-column> <el-table-column fixed type="selection" width="40" align="center"></el-table-column>
<el-table-column prop="goods_name" label="型号" width="200"></el-table-column> <el-table-column prop="goods_name" label="型号" width="200">
<template slot-scope="scope">
<div class="price-more">
<el-tooltip effect="light" placement="bottom-start" popper-class="popper-class-box">
<div slot="content">
<p class="p-text row verCenter">
<em class="row">型号</em>
<span class="row verCenter boxsiz">{{scope.row.goods_name}}</span>
</p>
<p class="p-text row verCenter">
<em class="row">品牌</em>
<span class="row verCenter boxsiz">{{scope.row.brand_name}}</span>
</p>
<p class="p-text row verCenter">
<em class="row">数量</em>
<span class="row verCenter boxsiz">{{scope.row.quote_number}}</span>
</p>
<p class="p-text row verCenter">
<em class="row">批次</em>
<span class="row verCenter boxsiz">{{scope.row.batch}}</span>
</p>
<p class="p-text row verCenter">
<em class="row">交货日期</em>
<span class="row verCenter boxsiz">{{scope.row.delivery_time}}</span>
</p>
</div>
<div class="more-search-btn">{{scope.row.goods_name}}</div>
</el-tooltip>
</div>
</template>
</el-table-column>
<el-table-column prop="brand_name" label="品牌" width="200"></el-table-column> <el-table-column prop="brand_name" label="品牌" width="200"></el-table-column>
<el-table-column prop="inquiry_sn" label="询价单号" width="200"></el-table-column> <el-table-column prop="inquiry_sn" label="询价单号" width="200"></el-table-column>
<el-table-column prop="quote_goods_name" label="报价型号" width="200"></el-table-column> <el-table-column prop="quote_goods_name" label="报价型号" width="200"></el-table-column>
...@@ -85,13 +115,13 @@ ...@@ -85,13 +115,13 @@
Table, Table,
TableColumn, TableColumn,
Message, Message,
MessageBox,
Dialog, Dialog,
Pagination, Pagination,
Autocomplete Autocomplete,
Tooltip
} from 'element-ui' } from 'element-ui'
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete); Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Tooltip);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination); Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination);
export default { export default {
...@@ -107,7 +137,7 @@ ...@@ -107,7 +137,7 @@
goods_name: '', goods_name: '',
brand: '', brand: '',
date: '', date: '',
status:'' status: ''
} }
}; };
}, },
...@@ -118,14 +148,15 @@ ...@@ -118,14 +148,15 @@
computed: {}, computed: {},
methods: { methods: {
getData() { getData() {
console.log(this.formInline)
this.$http('get', "/api/quote/getlist", { this.$http('get', "/api/quote/getlist", {
page: this.page, page: this.page,
limit: this.limit, limit: this.limit,
goods_name: this.formInline.goods_name, goods_name: this.formInline.goods_name,
brand: this.formInline.brand, brand: this.formInline.brand,
start_time: this.formInline.date[0], start_time: this.formInline.date ? this.formInline.date[0] : '',
end_time: this.formInline.date[1], end_time: this.formInline.date ? this.formInline.date[1] : '',
status:this.formInline.status status: this.formInline.status
}).then(res => { }).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
this.tableData = res.data.list || []; this.tableData = res.data.list || [];
......
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