Skip to content

肖康 / cloudSystem

Go to a project
Commit f4466472 by liangjianmin
Options

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

# Conflicts:
#	src/assets/css/public/common.min.css
#	src/assets/css/store/listDetail.min.css
parents dd1a856d 2171cc37
Expand all
Inline Side-by-side
Showing with 128 additions and 21 deletions
src/assets/css/public/common.less
...@@ -328,7 +328,7 @@ body { ...@@ -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, // .el-table td,
......
src/views/Store/enter.vue
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<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" :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>
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
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) {
console.log(res)
this.tableData = res.data.list || []; this.tableData = res.data.list || [];
this.total =res.data.total||0; this.total =res.data.total||0;
} else { } else {
......
src/views/Store/listDetail.vue
<template> <template>
<div class="listDetail pagex"> <div class="listDetail pagex">
<div class="detail-nav"> <div class="detail-nav" v-if="detailInfo">
<span>单号：SD202104060008</span> <span>单号：{{detailInfo.up_sn}}</span>
<span>文件名：圣和堂-联营数据上传.csv</span> <span>文件名：{{detailInfo.file_name}}</span>
<span>上传时间：2021-03-30</span> <span>上传时间：{{detailInfo.create_time}}</span>
<span>状态：处理中</span> <span>状态：
</div> <span v-if="detailInfo.status==1" class="f-green">待处理</span>
<Menu/> <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> </div>
<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> </template>
<script> <script>
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 { import {
Button, Table,
Message TableColumn,
Message,
Pagination
} from 'element-ui' } from 'element-ui'
Vue.use(Button) Vue.use(Pagination).use(TableColumn).use(Table)
export default { export default {
name: "listDetail", name: "listDetail",
data() { data() {
return {}; return {
detailInfo: "",
total: 0,
limit: 10,
page: 1,
tableData: "",
maxPrice: []
};
}, },
watch: {}, watch: {},
created() { created() {
this.getInfo() this.getInfo()
console.log(this.$route.query.params) this.getList()
}, },
computed: {}, computed: {},
methods: { methods: {
getInfo(){ getInfo() {
this.$http('get', "/api/uploadSku/info", { this.$http('get', "/api/uploadSku/info", {
id: this.$route.query.id id: this.$route.query.id
}).then(res => { }).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: { components: {
Menu Menu
...@@ -46,5 +152,5 @@ ...@@ -46,5 +152,5 @@
}; };
</script> </script>
<style scoped> <style scoped>
@import "../../assets/css/store/listDetail.min.css"; @import "../../assets/css/store/listDetail.min.css";
</style> </style>
\ No newline at end of file
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