Commit db39a189 by 肖康

x

parent 4b87ed81
......@@ -222,12 +222,15 @@ body {
background: #F1F4FA;
}
.f-blue{color:#1969F9;}
.f-green{color:#3FBE1B;}
.f-yellow1{color:#CC8200;}
.f-red1{color:#FC1F00;}
/**element-ui 样式重写**/
.el-message--info {
min-width: auto !important;
border: 0px !important;
background: rgba(0, 0, 0, 0.4) !important;
top:100px!important;
.el-icon-info {
display: none;
}
......
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}.el-message--info{min-width:auto !important;border:0px !important;background:rgba(0,0,0,0.4) !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-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
......@@ -4,45 +4,54 @@
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="状态">
<el-select v-model="formInline.status" placeholder="全部">
<el-option label="全部" value="0"></el-option>
<el-option label="全部" value=""></el-option>
<el-option label="待处理" value="1"></el-option>
<el-option label="处理中" value="2"></el-option>
<el-option label="已处理" value="3"></el-option>
<el-option label="其他失败" value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="更新日期">
<el-date-picker v-model="formInline.date" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期">
<el-date-picker v-model="formInline.date" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<div @click="onSubmit" class="search-btn">搜索</div>
<div @click="getData" class="search-btn">搜索</div>
</el-form-item>
</el-form>
<div class="btn-nav clr">
<div class="fl dcg"></div>
<div class="fl dcg long">查看导入结果</div>
<div class="fl dcg">下载模版</div>
<div class="fl dcg delbtn">删除</div>
<div class="fl dcg"></div>
<div class="fl dcg long" @click="checkdr">查看导入结果</div>
<div class="fl dcg" @click="downwj">下载模版</div>
<div class="fl dcg delbtn" @click="del">删除</div>
</div>
<div class="data-box th-all">
<div class="data-box th-all" v-if="tableData">
<el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" width="37" >
<el-table-column fixed type="selection" width="37">
</el-table-column>
<el-table-column label="单号" min-width="20%">
<template slot-scope="scope">
<a :href="'/#/listDetail?sn='+scope.row.up_sn" class="f-blue">{{scope.row.up_sn}}</a>
</template>
</el-table-column>
<el-table-column prop="file_name" label="文件名字" min-width="20%">
</el-table-column>
<el-table-column prop="status" label="状态" min-width="20%">
<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 prop="latest_notice" label="最新上传状态" min-width="20%">
</el-table-column>
<el-table-column prop="create_time" label="上传时间" min-width="20%">
</el-table-column>
<el-table-column prop="up_sn" label="单号" min-width="20%">
</el-table-column>
<el-table-column prop="file_name" label="文件名字" min-width="20%">
</el-table-column>
<el-table-column prop="status" label="状态" min-width="20%">
</el-table-column>
<el-table-column prop="latest_notice" label="最新上传状态" min-width="20%">
</el-table-column>
<el-table-column prop="create_time" label="上传时间" min-width="20%">
</el-table-column>
</el-table>
</div>
</div>
......@@ -79,49 +88,89 @@
data() {
return {
page:10,
page: 10,
formInline: {
status: '',
date: ''
},
tableData: [{
up_sn:"4564546546545",
file_name:"肖康.xls",
status:1,
latest_notice:"最新状态",
create_time:"2020-02-02 09:50:50"
}]
tableData: "",
multipleSelection: []
};
},
watch: {},
created() {
this.getData();
this.getData();
},
computed: {},
methods: {
getData(){
this.$http('GET', "/api/uploadSku/list", {
page:1,
status:1,
action_time:1,
end_time:1
getData() {
this.$http('get', "/api/uploadSku/list", {
page: 1,
status: this.formInline.status,
action_time: this.formInline.date[0],
end_time: this.formInline.date[1]
}).then(res => {
if (res.err_code === 0) {
console.log(res)
this.tableData = res.data.list || []
} else {
Message(res.err_msg);
}
})
},
checkdr() {
if (this.multipleSelection.length > 1) {
Message("只能选择一条数据导入")
return
}
if (this.multipleSelection.length == 0) {
Message("请至少选择一条数据导入")
return
}
this.$http('get', "/api/uploadSku/downResult", {
id: this.multipleSelection[0]['id']
}).then(res => {
})
},
downwj() {
this.$http('get', "/api/uploadSku/downUploadCsv", {}).then(res => {
})
},
del() {
if (this.multipleSelection.length == 0) {
Message("请至少选择一条数据")
return
}
var arr=[];
for(var i=0;i<this.multipleSelection.length;i++){
arr.push(this.multipleSelection[i]['id'])
}
MessageBox.confirm('确认到删除当前勾选数据吗?', {
type: 'error'
})
.then(()=> {
this.$http('get', "/api/uploadSku/del", {
log_ids: arr.join(",")
}).then(res => {
if (res.err_code === 0) {
Message("删除成功");
this.getData()
} else {
Message(res.err_msg);
}
})
})
},
handleSelectionChange(val) {
this.multipleSelection = val;
this.multipleSelection = val || [];
console.log(this.multipleSelection)
},
onSubmit() {
console.log('submit!');
}
},
components: {
Menu
......
const env = process.env.NODE_ENV;
const url = 'http://cloud.liexindev.net';
//const url = 'http://192.168.1.237:3000/mock/49';
switch (env) {
case 'development':
......
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