Skip to content

肖康 / cloudSystem

Go to a project
Commit 0bdf731e by 肖康
Options

x

parent 6ffe61e9
Expand all
Inline Side-by-side
Showing with 126 additions and 126 deletions
src/assets/css/goods/goods.less
.goods{ .goods {
.goods-con{ .pdf {
background: #FFFFFF; span {
font-size: 20px;
}
color:#666;
&:hover {
color : #1969F9;
cursor: pointer;
}
}
.goods-con {
background : #FFFFFF;
border-radius: 4px; border-radius: 4px;
border: 1px solid #E5EBF6; border : 1px solid #E5EBF6;
padding:20px; padding : 20px;
} }
.search-btn{
cursor: pointer; .search-btn {
width: 76px; cursor : pointer;
height: 37px; width : 76px;
line-height: 37px; height : 37px;
background: #1969F9; line-height : 37px;
background : #1969F9;
border-radius: 2px; border-radius: 2px;
font-size: 14px; font-size : 14px;
color:#fff; color : #fff;
text-align: center; text-align : center;
&:hover{
&:hover {
background: #0050E0; background: #0050E0;
} }
} }
.btn-nav{
margin-top: 11px; .btn-nav {
margin-top : 11px;
margin-bottom: 22px; margin-bottom: 22px;
.dcg{ .dcg {
width: 66px; width : 66px;
height: 26px; height : 26px;
border-radius: 2px; border-radius: 2px;
text-align: center; text-align : center;
line-height: 26px; line-height : 26px;
border: 1px solid #1969F9; border : 1px solid #1969F9;
background: #E5EEFF;; background : #E5EEFF;
color:#1969F9; ;
color : #1969F9;
margin-right: 10px; margin-right: 10px;
font-size: 14px; font-size : 14px;
transition: all 0.5s; transition : all 0.5s;
&:hover{
&:hover {
background: #1969F9; background: #1969F9;
cursor: pointer; cursor : pointer;
color:#fff; color : #fff;
} }
&.delbtn{
border:1px solid #FC1F00; &.delbtn {
border : 1px solid #FC1F00;
background: #FFE7E3; background: #FFE7E3;
color:#FC1F00; color : #FC1F00;
&:hover{
&:hover {
background: #FF715D; background: #FF715D;
color:#fff; color : #fff;
} }
} }
&.updatex{
} &.updatex {}
} }
.updatex{
width: 66px; .updatex {
height: 26px; width : 66px;
line-height: 26px; height : 26px;
text-align: center; line-height : 26px;
background: #FFEEDD; text-align : center;
border: 1px solid #FF870D; background : #FFEEDD;
border : 1px solid #FF870D;
border-radius: 2px; border-radius: 2px;
color:#FF870D; color : #FF870D;
font-size: 14px; font-size : 14px;
cursor: pointer; cursor : pointer;
width: 66px; width : 66px;
&:hover{
&:hover {
background: #FCA955; background: #FCA955;
color:#fff; color : #fff;
} }
} }
} }
.brand-img{
width: 80%; .brand-img {
width : 80%;
height: 80; height: 80;
} }
......
src/assets/css/goods/goods.min.css
.goods .goods-con{background:#FFFFFF;border-radius:4px;border:1px solid #E5EBF6;padding:20px}.goods .search-btn{cursor:pointer;width:76px;height:37px;line-height:37px;background:#1969F9;border-radius:2px;font-size:14px;color:#fff;text-align:center}.goods .search-btn:hover{background:#0050E0}.goods .btn-nav{margin-top:11px;margin-bottom:22px}.goods .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-right:10px;font-size:14px;transition:all .5s}.goods .btn-nav .dcg:hover{background:#1969F9;cursor:pointer;color:#fff}.goods .btn-nav .dcg.delbtn{border:1px solid #FC1F00;background:#FFE7E3;color:#FC1F00}.goods .btn-nav .dcg.delbtn:hover{background:#FF715D;color:#fff}.goods .btn-nav .updatex{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}.goods .btn-nav .updatex:hover{background:#FCA955;color:#fff}.goods .brand-img{width:80%;height:80} .goods .pdf{color:#666}.goods .pdf span{font-size:20px}.goods .pdf:hover{color:#1969F9;cursor:pointer}.goods .goods-con{background:#FFFFFF;border-radius:4px;border:1px solid #E5EBF6;padding:20px}.goods .search-btn{cursor:pointer;width:76px;height:37px;line-height:37px;background:#1969F9;border-radius:2px;font-size:14px;color:#fff;text-align:center}.goods .search-btn:hover{background:#0050E0}.goods .btn-nav{margin-top:11px;margin-bottom:22px}.goods .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-right:10px;font-size:14px;transition:all .5s}.goods .btn-nav .dcg:hover{background:#1969F9;cursor:pointer;color:#fff}.goods .btn-nav .dcg.delbtn{border:1px solid #FC1F00;background:#FFE7E3;color:#FC1F00}.goods .btn-nav .dcg.delbtn:hover{background:#FF715D;color:#fff}.goods .btn-nav .updatex{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}.goods .btn-nav .updatex:hover{background:#FCA955;color:#fff}.goods .brand-img{width:80%;height:80}
\ No newline at end of file \ No newline at end of file
src/assets/css/public/common.less
...@@ -387,6 +387,13 @@ body { ...@@ -387,6 +387,13 @@ body {
} }
.el-cascader-panel{
min-height: 150px;
max-height: 300px;
}
.placehoload .el-input__inner::-webkit-input-placeholder {
color: #333;
}
//js跟随提示框 //js跟随提示框
.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);
......
src/assets/css/store/enter.less
.enter{ .enter{
.el-upload-list--text{
display: none;
}
.enter-con{ .enter-con{
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px; border-radius: 4px;
......
src/assets/css/store/enter.min.css
.enter .enter-con { .enter .el-upload-list--text{display:none}.enter .enter-con{background:#FFFFFF;border-radius:4px;border:1px solid #E5EBF6;padding:20px}.enter .search-btn{cursor:pointer;width:76px;height:37px;line-height:37px;background:#1969F9;border-radius:2px;font-size:14px;color:#fff;text-align:center}.enter .search-btn:hover{background:#0050E0}.enter .btn-nav{margin-top:11px;margin-bottom:22px}.enter .btn-nav .dcg{width:66px;height:26px;border-radius:2px;text-align:center;line-height:26px;border:1px solid #1969F9;background:#fff;color:#1969F9;margin-right:10px;font-size:14px;transition:all .5s}.enter .btn-nav .dcg.long{width:95px}.enter .btn-nav .dcg:hover{background:#1969F9;cursor:pointer;color:#fff}.enter .btn-nav .dcg.delbtn{border:1px solid #FC1F00;background:#FFE7E3;color:#FC1F00}.enter .btn-nav .dcg.delbtn:hover{background:#FF715D;color:#fff}
background: #FFFFFF; \ No newline at end of file
border-radius: 4px;
border: 1px solid #E5EBF6;
padding: 20px;
}
.enter .search-btn {
cursor: pointer;
width: 76px;
height: 37px;
line-height: 37px;
background: #1969F9;
border-radius: 2px;
font-size: 14px;
color: #fff;
text-align: center;
}
.enter .search-btn:hover {
background: #0050E0;
}
.enter .btn-nav {
margin-top: 11px;
margin-bottom: 22px;
}
.enter .btn-nav .dcg {
width: 66px;
height: 26px;
border-radius: 2px;
text-align: center;
line-height: 26px;
border: 1px solid #1969F9;
background: #fff;
color: #1969F9;
margin-right: 10px;
font-size: 14px;
transition: all 0.5s;
}
.enter .btn-nav .dcg.long {
width: 95px;
}
.enter .btn-nav .dcg:hover {
background: #1969F9;
cursor: pointer;
color: #fff;
}
.enter .btn-nav .dcg.delbtn {
border: 1px solid #FC1F00;
background: #FFE7E3;
color: #FC1F00;
}
.enter .btn-nav .dcg.delbtn:hover {
background: #FF715D;
color: #fff;
}
/*# sourceMappingURL=enter.min.css.map */
\ No newline at end of file
src/views/Store/enter.vue
...@@ -24,8 +24,11 @@ ...@@ -24,8 +24,11 @@
</el-form> </el-form>
<div class="btn-nav clr"> <div class="btn-nav clr">
<div class="fl dcg">导入</div> <el-upload class="upload-demo fl" :action="uploadUrl" :on-change="handleChange" multiple>
<div class="fl dcg long" @click="checkdr" >查看导入结果</div> <div class="fl dcg">导入</div>
</el-upload>
<div class="fl dcg long" @click="checkdr">查看导入结果</div>
<div class="fl dcg" @click="downwj">下载模版</div> <div class="fl dcg" @click="downwj">下载模版</div>
<div class="fl dcg delbtn" @click="del">删除</div> <div class="fl dcg delbtn" @click="del">删除</div>
</div> </div>
...@@ -35,7 +38,7 @@ ...@@ -35,7 +38,7 @@
</el-table-column> </el-table-column>
<el-table-column label="单号" min-width="20%"> <el-table-column label="单号" min-width="20%">
<template slot-scope="scope"> <template slot-scope="scope">
<a :href="'/#/listDetail?sn='+scope.row.up_sn+'&id='+scope.row.id" class="f-blue">{{scope.row.up_sn}}</a> <a :href="'/#/listDetail?sn='+scope.row.up_sn+'&id='+scope.row.id" class="f-blue">{{scope.row.up_sn}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="file_name" label="文件名字" min-width="20%"> <el-table-column prop="file_name" label="文件名字" min-width="20%">
...@@ -53,7 +56,8 @@ ...@@ -53,7 +56,8 @@
<el-table-column prop="create_time" label="上传时间" min-width="20%"> <el-table-column prop="create_time" label="上传时间" min-width="20%">
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination layout="prev, pager, next,jumper" :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> </el-pagination>
</div> </div>
</div> </div>
...@@ -66,7 +70,9 @@ ...@@ -66,7 +70,9 @@
import Vue from 'vue'; import Vue from 'vue';
import Menu from "@/components/menu.vue"; import Menu from "@/components/menu.vue";
import Tool from '../../tool' import Tool from '../../tool'
import {NODE_ENVS} from "../../ajax"; import {
NODE_ENVS
} from "../../ajax";
import { import {
Form, Form,
FormItem, FormItem,
...@@ -83,10 +89,11 @@ ...@@ -83,10 +89,11 @@
Message, Message,
MessageBox, MessageBox,
Dialog, Dialog,
Upload,
Pagination Pagination
} from 'element-ui' } from 'element-ui'
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination) Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination)
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table) Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Upload)
export default { export default {
name: "enter", name: "enter",
...@@ -95,7 +102,7 @@ ...@@ -95,7 +102,7 @@
total: 0, total: 0,
limit: 10, limit: 10,
page: 1, page: 1,
uploadUrl: NODE_ENVS + '/api/uploadSku/import',
formInline: { formInline: {
status: '', status: '',
date: '' date: ''
...@@ -119,9 +126,9 @@ ...@@ -119,9 +126,9 @@
end_time: this.formInline.date[1] end_time: 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 =Number(res.data.total)||0; this.total = Number(res.data.total) || 0;
} else { } else {
Message(res.err_msg); Message(res.err_msg);
} }
...@@ -131,6 +138,20 @@ ...@@ -131,6 +138,20 @@
this.page = 1; this.page = 1;
this.getData(); this.getData();
}, },
handleChange(file, fileList) {
console.log(file.response);
if (!file.response) {
return
}
if (file.response.err_code === 0) {
Message("导入成功")
this.page = 1;
this.getData();
} else {
Message(res.err_msg);
}
},
checkdr() { checkdr() {
if (this.multipleSelection.length > 1) { if (this.multipleSelection.length > 1) {
Message("只能选择一条数据导入") Message("只能选择一条数据导入")
...@@ -140,8 +161,8 @@ ...@@ -140,8 +161,8 @@
Message("请至少选择一条数据导入") Message("请至少选择一条数据导入")
return return
} }
window.location.href=NODE_ENVS+'/api/uploadSku/downResult?id='+this.multipleSelection[0]['id'] window.location.href = NODE_ENVS + '/api/uploadSku/downResult?id=' + this.multipleSelection[0]['id']
}, },
downwj() { downwj() {
this.$http('get', "/api/uploadSku/downUploadCsv", {}).then(res => { this.$http('get', "/api/uploadSku/downUploadCsv", {}).then(res => {
...@@ -176,7 +197,7 @@ ...@@ -176,7 +197,7 @@
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.page=val; this.page = val;
this.getData(); this.getData();
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
......
src/views/Store/list.vue
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<el-input v-model="scope.row.dlhq" placeholder="如:2-5"> <el-input v-model="scope.row.dlhq" placeholder="如:2-5">
</el-input> </el-input>
<div class="selectdw"> <div class="selectdw">
<el-select v-model="scope.row.dlhqdw"> <el-select v-model="scope.row.dlhqdw" placeholder="天" class="placehoload">
<el-option label="天" value="天"></el-option> <el-option label="天" value="天"></el-option>
<el-option label="周" value="周"></el-option> <el-option label="周" value="周"></el-option>
</el-select> </el-select>
...@@ -178,10 +178,10 @@ ...@@ -178,10 +178,10 @@
<el-table-column label="修改香港交期" min-width="20%"> <el-table-column label="修改香港交期" min-width="20%">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="updatebox"> <div class="updatebox">
<el-input v-model="scope.row.hkhq" placeholder="如:2-5"> <el-input v-model="scope.row.hkhq" placeholder="如:2-5" >
</el-input> </el-input>
<div class="selectdw"> <div class="selectdw">
<el-select v-model="scope.row.hkhqdw"> <el-select v-model="scope.row.hkhqdw" placeholder="天" class="placehoload">
<el-option label="天" value="天"></el-option> <el-option label="天" value="天"></el-option>
<el-option label="周" value="周"></el-option> <el-option label="周" value="周"></el-option>
</el-select> </el-select>
...@@ -356,6 +356,7 @@ ...@@ -356,6 +356,7 @@
//修改货期弹窗 //修改货期弹窗
this.dialogVisible2 = true this.dialogVisible2 = true
this.huoqidata = this.selectData this.huoqidata = this.selectData
} }
}, },
submitHq() { submitHq() {
......
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