|
|
@ -54,13 +54,13 @@ |
|
|
|
</a-form-item> |
|
|
|
</a-form-item> |
|
|
|
<a-form-item label="前台价"> |
|
|
|
<a-form-item label="前台价"> |
|
|
|
<div style="display: flex" class="goodsType"> |
|
|
|
<div style="display: flex" class="goodsType"> |
|
|
|
<a-input v-decorator="['goods_price_min']" placeholder="请输入" />- |
|
|
|
<a-input v-decorator="['goods_price_min']" placeholder="请输入" /><span style="padding: 0 3px 0 5px;">-</span> |
|
|
|
<a-input style="margin-left: 5px" v-decorator="['goods_price_max']" placeholder="请输入" /> |
|
|
|
<a-input style="margin-left: 5px" v-decorator="['goods_price_max']" placeholder="请输入" /> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</a-form-item> |
|
|
|
</a-form-item> |
|
|
|
<a-form-item label="利润率"> |
|
|
|
<a-form-item label="利润率"> |
|
|
|
<div style="display: flex" class="goodsType"> |
|
|
|
<div style="display: flex" class="goodsType"> |
|
|
|
<a-input v-decorator="['profit_rate_min']" placeholder="请输入" />- |
|
|
|
<a-input v-decorator="['profit_rate_min']" placeholder="请输入" /><span style="padding: 0 3px 0 5px;">-</span> |
|
|
|
<a-input style="margin-left: 5px" v-decorator="['profit_rate_max']" placeholder="请输入" /> |
|
|
|
<a-input style="margin-left: 5px" v-decorator="['profit_rate_max']" placeholder="请输入" /> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</a-form-item> |
|
|
|
</a-form-item> |
|
|
@ -221,8 +221,8 @@ |
|
|
|
</span> |
|
|
|
</span> |
|
|
|
<!-- 商品名称 --> |
|
|
|
<!-- 商品名称 --> |
|
|
|
<span slot="goods_name" slot-scope="text, item"> |
|
|
|
<span slot="goods_name" slot-scope="text, item"> |
|
|
|
<a v-if="item.link" :href="item.link" target="_blank">{{ text }}</a> |
|
|
|
<a v-if="item.link" :href="item.link" style="white-space:pre-wrap;" target="_blank">{{ text }}</a> |
|
|
|
<p v-else>{{ text }}</p> |
|
|
|
<p v-else style="white-space:pre-wrap" >{{ text }}</p> |
|
|
|
</span> |
|
|
|
</span> |
|
|
|
<span slot="profit_rate" slot-scope="text, item"> |
|
|
|
<span slot="profit_rate" slot-scope="text, item"> |
|
|
|
<p>{{ text > 0 ? Number(text) + '%' : 0 }}</p> |
|
|
|
<p>{{ text > 0 ? Number(text) + '%' : 0 }}</p> |
|
|
@ -270,6 +270,7 @@ import CategoryModel from '@/common/model/Category' |
|
|
|
import * as Api from '@/api/store' |
|
|
|
import * as Api from '@/api/store' |
|
|
|
// import ElementUI from 'element-ui' |
|
|
|
// import ElementUI from 'element-ui' |
|
|
|
import 'element-ui/lib/theme-chalk/index.css' |
|
|
|
import 'element-ui/lib/theme-chalk/index.css' |
|
|
|
|
|
|
|
import store from '../../../store' |
|
|
|
import Vue from 'vue' |
|
|
|
import Vue from 'vue' |
|
|
|
import { DatePicker }from "element-ui" |
|
|
|
import { DatePicker }from "element-ui" |
|
|
|
Vue.use(DatePicker) |
|
|
|
Vue.use(DatePicker) |
|
|
@ -847,7 +848,8 @@ export default { |
|
|
|
this.queryParam.is_sale + |
|
|
|
this.queryParam.is_sale + |
|
|
|
'&is_self=' + |
|
|
|
'&is_self=' + |
|
|
|
this.queryParam.is_self+ |
|
|
|
this.queryParam.is_self+ |
|
|
|
'&goodsIds='+goodsIds |
|
|
|
'&goodsIds='+goodsIds+ |
|
|
|
|
|
|
|
'&Access-Token='+store.getters.token |
|
|
|
console.log(params) |
|
|
|
console.log(params) |
|
|
|
window.open(resolve + '?s=/admin/goods/export' + params) |
|
|
|
window.open(resolve + '?s=/admin/goods/export' + params) |
|
|
|
}, |
|
|
|
}, |
|
|
|