diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index f6ece3d..151bba6 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -98,18 +98,18 @@ export default { if (store.getters.userInfo.role === 1) { this.menus = [] routes.children.map((val, index) => { - if (val.name == 'dataCenter') { + if (val.name == 'dataCenter') { this.menus = routes.children.slice(index, index + 1) - if(this.menus.length<1){ + if (this.menus.length < 1) { return } - this.menus[0].children.map((child,eq)=> { - if(child.path == '/goods/category/index') - this.menus[0].children.splice(eq,1) + this.menus[0].children.map((child, eq) => { + if (child.path == '/goods/category/index') this.menus[0].children.splice(eq, 1) }) } }) } + this.collapsed = !this.sidebarOpened }, mounted() { diff --git a/src/views/dataCenter/goods/Index.vue b/src/views/dataCenter/goods/Index.vue index da50cae..7a784bc 100644 --- a/src/views/dataCenter/goods/Index.vue +++ b/src/views/dataCenter/goods/Index.vue @@ -54,13 +54,17 @@
- - + -
- - + -
@@ -70,24 +74,40 @@ {{ item.name }} - -
- - -
-
+ + +
+ - + +
+
+ +
+ - + +
+
+ +
+ + +
搜索 @@ -221,8 +241,8 @@ - {{ text }} -

{{ text }}

+ {{ text }} +

{{ text }}

{{ text > 0 ? Number(text) + '%' : 0 }}

@@ -238,12 +258,8 @@

-

- {{ text == 0 ? '待处理' : '已归类' }} +

+ {{ text == 0 ? '待处理' : '已归类' }}

@@ -268,11 +284,11 @@ import * as GoodsApi from '@/api/goods' import { ContentHeader, STable } from '@/components' import CategoryModel from '@/common/model/Category' import * as Api from '@/api/store' -// import ElementUI from 'element-ui' -import 'element-ui/lib/theme-chalk/index.css' +// import ElementUI from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css' import store from '../../../store' import Vue from 'vue' -import { DatePicker }from "element-ui" +import { DatePicker } from 'element-ui' Vue.use(DatePicker) // 表格表头 const columns = [ @@ -313,6 +329,20 @@ const columns = [ scopedSlots: { customRender: 'goods_price_min' }, sorter: true, }, + { + title: '分销价', + width: '100px', + dataIndex: 'distribute_price', + scopedSlots: { customRender: 'distribute_price' }, + sorter: true, + }, + { + title: '铺货价', + width: '100px', + dataIndex: 'shop_price', + scopedSlots: { customRender: 'shop_price' }, + sorter: true, + }, { title: '利润', width: '80px', @@ -836,6 +866,14 @@ export default { (formData.profit_rate_max || '') + '&profit_rate_min=' + (formData.profit_rate_min || '') + + '&min_distribute_price=' + + (formData.min_distribute_price || '') + + '&max_distribute_price=' + + (formData.max_distribute_price || '') + + '&min_shop_price=' + + (formData.min_shop_price || '') + + '&max_shop_price=' + + (formData.max_shop_price || '') + '&categoryId=' + this.queryParam.categoryId + '&channel=' + @@ -847,10 +885,12 @@ export default { '&is_sale=' + this.queryParam.is_sale + '&is_self=' + - this.queryParam.is_self+ - '&goodsIds='+goodsIds+ - '&Access-Token='+store.getters.token - console.log(params) + this.queryParam.is_self + + '&goodsIds=' + + goodsIds + + '&Access-Token=' + + store.getters.token + console.log(params) window.open(resolve + '?s=/admin/goods/export' + params) }, // 删除记录