caoliancun
/
PointsMall_Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '商品库存记录' (#7) from lc into master

Browse Source 
Reviewed-on: #7
pull/9/head^2
骆超 1 year ago
parent 6bce2b80c2 aedc739a3d
commit 07db2398dc
3 changed files with 236 additions and 67 deletions
Unified View
  1. 131
      src/api/product/productAttr.js
  2. 16
      src/router/index.js
  3. 156
      src/views/product/inventoryRecords/index.vue

131
src/api/product/productAttr.js
Unescape View File

@ -1,208 +1,215 @@
import request from '@/utils/request' import request from '@/utils/request'
var service_name = 'oil-mall' var service_name = 'oil-mall'
export default { export default {
productAddGetSites(productId) { productAddGetSites(productId) {
return request({ return request({
url: `/${service_name}/mallProductSiteRelation/get/${productId}`, url: `/${service_name}/mallProductSiteRelation/get/${productId}`,
method: 'GET', method: 'GET',
}) })
}, },
productAddGetEdit(productId) { productAddGetEdit(productId) {
return request({ return request({
url: `/${service_name}/mallProductInfo/getEdit/${productId}`, url: `/${service_name}/mallProductInfo/getEdit/${productId}`,
method: 'GET', method: 'GET',
}) })
}, },
productListAuditingDetailgetByPage(productId) { productListAuditingDetailgetByPage(productId) {
return request({ return request({
url: `/${service_name}/mallProductAuditHistory/getListByProductId/${productId}`, url: `/${service_name}/mallProductAuditHistory/getListByProductId/${productId}`,
method: 'GET', method: 'GET',
}) })
}, },
productListDelete(data) { productListDelete(data) {
return request({ return request({
url: `/${service_name}/mallProductInfo/delete`, url: `/${service_name}/mallProductInfo/delete`,
method: 'post', method: 'post',
data data
}) })
}, },
productListAuditProduct(data) { productListAuditProduct(data) {
return request({ return request({
url: `/${service_name}/mallProductInfo/auditProduct`, url: `/${service_name}/mallProductInfo/auditProduct`,
method: 'post', method: 'post',
data data
}) })
}, },
productListUpdateBatchList(data) { productListUpdateBatchList(data) {
return request({ return request({
url: `/${service_name}/mallProductStock/updateBatchList`, url: `/${service_name}/mallProductStock/updateBatchList`,
method: 'post', method: 'post',
data data
}) })
}, },
productListGetByPage(data) { productListGetByPage(data) {
return request({ return request({
url: `/${service_name}/mallProductInfo/getByPage`, url: `/${service_name}/mallProductInfo/getByPage`,
method: 'post', method: 'post',
data data
}) })
}, },
addUpdate(data) { addUpdate(data) {
return request({ return request({
url: `/${service_name}/mallProductInfo/update`, url: `/${service_name}/mallProductInfo/update`,
method: 'post', method: 'post',
data data
}) })
}, },
addSave(data) { addSave(data) {
return request({ return request({
url: `/${service_name}/mallProductInfo/save`, url: `/${service_name}/mallProductInfo/save`,
method: 'post', method: 'post',
data data
}) })
}, },
getAllSites(data) { getAllSites(data) {
return request({ return request({
url: `/${service_name}/mallProductSiteRelation/getAllSites`, url: `/${service_name}/mallProductSiteRelation/getAllSites`,
method: 'post', method: 'post',
data data
}) })
}, },
brandGetAll(data) { brandGetAll(data) {
return request({ return request({
url: `/${service_name}/mallProductBrands/getAll`, url: `/${service_name}/mallProductBrands/getAll`,
method: 'post', method: 'post',
data data
}) })
}, },
brandUpdate(data) { brandUpdate(data) {
return request({ return request({
url: `/${service_name}/mallProductBrands/update`, url: `/${service_name}/mallProductBrands/update`,
method: 'post', method: 'post',
data data
}) })
}, },
brandDelete(data) { brandDelete(data) {
return request({ return request({
url: `/${service_name}/mallProductBrands/delete`, url: `/${service_name}/mallProductBrands/delete`,
method: 'post', method: 'post',
data data
}) })
}, },
brandSave(data) { brandSave(data) {
return request({ return request({
url: `/${service_name}/mallProductBrands/save`, url: `/${service_name}/mallProductBrands/save`,
method: 'post', method: 'post',
data data
}) })
}, },
brandGetByPage(data) { brandGetByPage(data) {
return request({ return request({
url: `/${service_name}/mallProductBrands/getByPage`, url: `/${service_name}/mallProductBrands/getByPage`,
method: 'post', method: 'post',
data data
}) })
}, },
getAllAttributesType() { getAllAttributesType() {
return request({ return request({
url: `/${service_name}/mallProductAttributesType/getAllAttributesType`, url: `/${service_name}/mallProductAttributesType/getAllAttributesType`,
method: 'get', method: 'get',
}) })
}, },
getClassificationTree() { getClassificationTree() {
return request({ return request({
url: `/${service_name}/mallProductClassification/getClassificationTree`, url: `/${service_name}/mallProductClassification/getClassificationTree`,
method: 'get', method: 'get',
}) })
}, },
classifySave(page) { classifySave(page) {
return request({ return request({
url: `/${service_name}/mallProductClassification/save`, url: `/${service_name}/mallProductClassification/save`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
classifyUpdate(page) { classifyUpdate(page) {
return request({ return request({
url: `/${service_name}/mallProductClassification/update`, url: `/${service_name}/mallProductClassification/update`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
classifyGetByPage(page) { // 分页查询 classifyGetByPage(page) { // 分页查询
return request({ return request({
url: `/${service_name}/mallProductClassification/getByPage`, url: `/${service_name}/mallProductClassification/getByPage`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
typeFindByPage(page) { // 分页查询 typeFindByPage(page) { // 分页查询
return request({ return request({
url: `/${service_name}/mallProductAttributesType/getByPage`, url: `/${service_name}/mallProductAttributesType/getByPage`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
getByPage(page) { // 分页查询 getByPage(page) { // 分页查询
return request({ return request({
url: `/${service_name}/mallProductAttributes/getByPage`, url: `/${service_name}/mallProductAttributes/getByPage`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
getAttrList(id) { // 分页查询 getAttrList(id) { // 分页查询
return request({ return request({
url: `/${service_name}/mallProductAttributes/get/${id}`, url: `/${service_name}/mallProductAttributes/get/${id}`,
method: 'GET', method: 'GET',
}) })
}, },
delete(page) { delete(page) {
return request({ return request({
url: `/${service_name}/mallProductAttributes/delete`, url: `/${service_name}/mallProductAttributes/delete`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
classifyDelete(page) { classifyDelete(page) {
return request({ return request({
url: `/${service_name}/mallProductClassification/delete`, url: `/${service_name}/mallProductClassification/delete`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
typeSave(page) { typeSave(page) {
return request({ return request({
url: `/${service_name}/mallProductAttributesType/save`, url: `/${service_name}/mallProductAttributesType/save`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
save(page) { save(page) {
return request({ return request({
url: `/${service_name}/mallProductAttributes/save`, url: `/${service_name}/mallProductAttributes/save`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
typeUpdate(page) { typeUpdate(page) {
return request({ return request({
url: `/${service_name}/mallProductAttributes/update`, url: `/${service_name}/mallProductAttributes/update`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
update(page) { update(page) {
return request({ return request({
url: `/${service_name}/mallProductAttributesType/update`, url: `/${service_name}/mallProductAttributesType/update`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
typeDelete(page) { typeDelete(page) {
return request({ return request({
url: `/${service_name}/mallProductAttributesType/delete`, url: `/${service_name}/mallProductAttributesType/delete`,
method: 'post', method: 'post',
data: page data: page
}) })
}, },
getInventoryRecords(page) {
return request({
url: `/oil-mongo-log/updateStock/getRecords`,
method: 'post',
data: page
})
},
} }

16
src/router/index.js
Unescape View File

@ -24,7 +24,7 @@ export const constantRoutes = [{
redirect: 'productList', redirect: 'productList',
meta: { title: '商品', icon: 'iconkongzhitai', affix: true }, meta: { title: '商品', icon: 'iconkongzhitai', affix: true },
children: [ children: [
{ {
path: '/productList', path: '/productList',
component: () => import('@/views/product/productList/index'), component: () => import('@/views/product/productList/index'),
name: 'productList', name: 'productList',
@ -53,10 +53,16 @@ export const constantRoutes = [{
component: () => import('@/views/product/productAttr/index'), component: () => import('@/views/product/productAttr/index'),
name: 'productAttr', name: 'productAttr',
meta: { title: '商品属性', icon: 'iconkongzhitai', affix: true } meta: { title: '商品属性', icon: 'iconkongzhitai', affix: true }
}, },
{
path: '/inventoryRecords',
component: () => import('@/views/product/inventoryRecords/index'),
name: 'inventoryRecords',
meta: { title: '库存记录', icon: 'iconkongzhitai', affix: true }
},
] ]
}, },
{ path: '/CustomerMarket', component: CustomerMarket }, { path: '/CustomerMarket', component: CustomerMarket },
{ {
path: '/profile', path: '/profile',
component: Layout, component: Layout,
@ -70,7 +76,7 @@ export const constantRoutes = [{
meta: { title: '个人中心', icon: 'user', noCache: true } meta: { title: '个人中心', icon: 'user', noCache: true }
} }
] ]
}, },
{ {
path: '/redirect', path: '/redirect',
component: Layout, component: Layout,
@ -91,7 +97,7 @@ export const constantRoutes = [{
path: '/login', path: '/login',
component: () => import('@/views/login/index'), component: () => import('@/views/login/index'),
hidden: true hidden: true
}, },
{ {
path: '/distribution', path: '/distribution',
component: () => import('@/views/distribution/distribution'), component: () => import('@/views/distribution/distribution'),

156
src/views/product/inventoryRecords/index.vue
Unescape View File

@ -0,0 +1,156 @@
<template>
<div>
<el-card :bordered="false" shadow="never" class="ivu-mt" :body-style="{ padding: 0 }">
<div class="padding-add">
<el-form ref="artFrom" :model="page" label-width="80px" label-position="right" class="tabform"
@submit.native.prevent inline>
<el-form-item align="center" label="输入搜索">
<el-input clearable v-model="page.params.productName" placeholder="商品名称"
class="form_content_width"></el-input>
</el-form-item>
<el-form-item align="center" label="操作类型">
<el-select clearable v-model="page.params.operateType" placeholder="请选择">
<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-option label="积分兑换" value="积分兑换"></el-option>
<el-option label="商品退单" value="商品退单"></el-option>
</el-select>
</el-form-item>
<el-form-item align="center" label="操作时间">
<el-date-picker
v-model="page.params.timeRangeArr"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
:picker-options="pickerOptions"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
align="right">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getPage">查询</el-button>
</el-form-item>
</el-form>
</div>
</el-card>
<el-card :bordered="false" shadow="never" class="ivu-mt-16">
<el-table ref="table" :data="tableData" v-loading="loading"
highlight-current-row empty-text="暂无数据"
class="mt14">
<el-table-column align="center" label="id" width="220px" prop="id"></el-table-column>
<el-table-column align="center" label="商品图片" width="100px" prop="productImage">
<template slot-scope="scope">
<el-image style="width: 50px; height: 50px" :src="scope.row.productImage"
:preview-src-list="[scope.row.productImage]">
</el-image>
</template>
</el-table-column>
<el-table-column align="center" label="商品名称" prop="productName"></el-table-column>
<el-table-column header-align="center" align="left" label="货号/属性" width="300px">
<template slot-scope="scope">
货号：<span>{{ scope.row.skuNum }}</span><br>
规格：<span>【{{ scope.row.attributes }}】</span>
</template>
</el-table-column>
<el-table-column align="center" label="订单号" prop="mallOrderNum" width="150px"></el-table-column>
<el-table-column align="center" label="操作类型" prop="operateType"></el-table-column>
<el-table-column align="left" label="库存" width="120px">
<template slot-scope="scope">
数量：<span>{{ scope.row.operateQantity }}</span><br>
剩余：<span>{{ scope.row.stockResidue }}</span>
</template>
</el-table-column>
<el-table-column header-align="center" align="left" label="操作信息">
<template slot-scope="scope">
操作人：<span>{{ scope.row.operateUser }}</span><br>
操作时间：<span>{{ scope.row.operateTime }}</span>
</template>
</el-table-column>
</el-table>
<div class="acea-row row-right page">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page="page.currentPage" :page-sizes="[10, 15, 20, 30]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper" :total="page.totalCount" />
</div>
</el-card>
</div>
</template>
<script>
import productApi from '@/api/product/productAttr.js'
export default {
data() {
return {
loading: false,
page: {
'currentPage': 1,
'pageSize': 10,
'params': {
timeRangeArr:[]
},
totalCount: 0
},
tableData: [],
total: 0,
pickerOptions: {
shortcuts: [
{
text: '最近一天',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', [start, end]);
}
},
{
text: '最近三天',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
picker.$emit('pick', [start, end]);
}
},
{
text: '最近一周',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}]
},
}
},
created() {
this.getPage()
},
methods: {
// 获取分页列表
getPage() {
productApi.getInventoryRecords(this.page).then(res => {
if (res.code === 20000) {
this.tableData = res.data.list
this.page.totalCount = parseInt(res.data.totalCount)
}
})
},
handleCurrentChange(val) {
this.page.currentPage = val
this.getPage()
},
handleSizeChange(val) {
this.page.pageSize = val
this.getPage()
}
}
}
</script>
<style scoped></style>
Write Preview
Loading…
Cancel
Save