Skip to content

肖康 / cloudSystem

Go to a project
Commit 2171cc37 by 肖康
Options

x

parent d1a9ef73
Inline Side-by-side
Showing with 134 additions and 20 deletions
src/assets/css/public/common.less
......@@ -328,7 +328,7 @@ body {
}
}
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,
......
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{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__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-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/listDetail.less
......@@ -4,8 +4,15 @@
padding:20px;
font-size: 14px;
color:#333;
padding-top: 30px;
span{
margin-right: 45px;
}
}
.data-box{
padding:20px;
padding-top: 10px;
background: #fff;
}
}
\ No newline at end of file
src/assets/css/store/listDetail.min.css
.listDetail .detail-nav{background:#fff;padding:20px;font-size:14px;color:#333}.listDetail .detail-nav span{margin-right:45px}
\ No newline at end of file
.listDetail .detail-nav{background:#fff;padding:20px;font-size:14px;color:#333;padding-top:30px}.listDetail .detail-nav span{margin-right:45px}.listDetail .data-box{padding:20px;padding-top:10px;background:#fff}
\ No newline at end of file
src/views/Store/enter.vue
......@@ -53,7 +53,7 @@
<el-table-column prop="create_time" label="上传时间" min-width="20%">
</el-table-column>
</el-table>
<el-pagination layout="prev, pager, next" :page-size="limit" :total="total" @current-change="handleCurrentChange" :current-page="page">
<el-pagination layout="prev, pager, next,jumper" :page-size="limit" :total="total" @current-change="handleCurrentChange" :current-page="page">
</el-pagination>
</div>
</div>
......@@ -117,7 +117,7 @@
end_time: this.formInline.date[1]
}).then(res => {
if (res.err_code === 0) {
console.log(res)
this.tableData = res.data.list || [];
this.total =res.data.total||0;
} else {
......
src/views/Store/listDetail.vue
<template>
<div class="listDetail pagex">
<div class="detail-nav">
<span>单号：SD202104060008</span>
<span>文件名：圣和堂-联营数据上传.csv</span>
<span>上传时间：2021-03-30</span>
<span>状态：处理中</span>
<div class="detail-nav" v-if="detailInfo">
<span>单号：{{detailInfo.up_sn}}</span>
<span>文件名：{{detailInfo.file_name}}</span>
<span>上传时间：{{detailInfo.create_time}}</span>
<span>状态：
<span v-if="detailInfo.status==1" class="f-green">待处理</span>
<span v-else-if="detailInfo.status==2" class="f-yellow1">处理中</span>
<span v-else-if="detailInfo.status==3">已处理</span>
<span v-else-if="detailInfo.status==4" class="f-red1">其他失败</span>
</span>
</div>
<Menu/>
<div class="data-box" v-if="tableData">
<el-table :data="tableData" border style="width: 100%">
<el-table-column fixed prop="id" label="ID" width="75">
</el-table-column>
<el-table-column prop="status" fixed label="状态" width="75">
<template slot-scope="scope">
<span v-if="scope.row.status==1" class="f-green">待处理</span>
<span v-else-if="scope.row.status==2" class="f-yellow1">处理中</span>
<span v-else-if="scope.row.status==3">已处理</span>
<span v-else-if="scope.row.status==4" class="f-red1">其他失败</span>
</template>
</el-table-column>
<el-table-column fixed prop="goods_sn" label="供应商内部型号编码" width="180">
</el-table-column>
<el-table-column fixed prop="goods_name" label="型号" width="180">
</el-table-column>
<el-table-column fixed prop="brand_name" label="品牌" width="180">
</el-table-column>
<el-table-column prop="stock" label="库存数量" width="150">
</el-table-column>
<el-table-column prop="moq" label="起订量" width="150">
</el-table-column>
<el-table-column prop="mpq" label="标准包装量" width="150">
</el-table-column>
<el-table-column prop="batch_sn" label="批次" width="150">
</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="spu_brief" label="简短描述" width="150">
</el-table-column>
<template v-if="maxPrice.length">
<template v-for="item in maxPrice">
<el-table-column :prop="'purchases'+(item+1)" :label="'阶梯数量'+(item+1)" width="150">
</el-table-column>
<el-table-column :prop="'price_cn'+(item+1)" :label="'国内含税价'+(item+1)" width="150">
</el-table-column>
<el-table-column :prop="'price_us'+(item+1)" :label="'香港交货价'+(item+1)" width="150">
</el-table-column>
</template>
</template>
</el-table>
<el-pagination layout="prev, pager, next,jumper" :page-size="limit" :total="total"
@current-change="handleCurrentChange" :current-page="page">
</el-pagination>
</div>
<Menu />
</div>
</template>
......@@ -14,31 +74,77 @@
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import Tool from '../../tool'
import {
Button,
Message
Table,
TableColumn,
Message,
Pagination
} from 'element-ui'
Vue.use(Button)
Vue.use(Pagination).use(TableColumn).use(Table)
export default {
name: "listDetail",
data() {
return {};
return {
detailInfo: "",
total: 0,
limit: 10,
page: 1,
tableData: "",
maxPrice: []
};
},
watch: {},
created() {
this.getInfo()
console.log(this.$route.query.params)
this.getList()
},
computed: {},
methods: {
getInfo(){
getInfo() {
this.$http('get', "/api/uploadSku/info", {
id: this.$route.query.id
}).then(res => {
if (res.err_code === 0) {
this.detailInfo = res.data
} else {
Message(res.err_msg);
}
})
},
getList() {
this.$http('get', "/api/uploadSku/itemList", {
page: this.page,
limit: this.limit,
up_sn: this.$route.query.sn
}).then(res => {
if (res.err_code === 0) {
var arr = res.data.list || [];
for (var i = 0; i < arr.length; i++) {
if (arr[i]['ladder_price']) {
for (var j = 0; j < arr[i]['ladder_price'].length; j++) {
arr[i]['purchases' + (j + 1)] = arr[i]['ladder_price'][j]['purchases']
arr[i]['price_cn' + (j + 1)] = arr[i]['ladder_price'][j]['price_cn']
arr[i]['price_us' + (j + 1)] = arr[i]['ladder_price'][j]['price_us']
}
}
}
this.tableData = arr
this.total = res.data.total || 0;
var max_= res.data.max_price_count||0;
for(var g=0;g<max_;g++){
this.maxPrice.push(g)
}
} else {
Message(res.err_msg);
}
})
},
handleCurrentChange(val) {
this.page = val;
this.getList();
},
},
components: {
Menu
......
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