|
|
@@ -53,6 +53,16 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
+ <el-select v-model.trim="searchForm.status"
|
|
|
+ clearable
|
|
|
+ placeholder="是否是上架">
|
|
|
+ <el-option label="是"
|
|
|
+ value="1"></el-option>
|
|
|
+ <el-option label="否"
|
|
|
+ value="0"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item>
|
|
|
<el-select v-model.trim="searchForm.groupGoods"
|
|
|
clearable
|
|
|
placeholder="是否是组合商品">
|
|
|
@@ -231,6 +241,10 @@
|
|
|
<el-button slot="reference"
|
|
|
type="text">下架</el-button>
|
|
|
</el-popconfirm>
|
|
|
+ <el-button v-if="scope.row.status == 1"
|
|
|
+ v-permission="scope.row.complementGoodsIdList ? 'goods/update' : '/shopOperation'"
|
|
|
+ @click="onShopOperation('look', scope.row)"
|
|
|
+ type="text">查看</el-button>
|
|
|
<!-- <el-button v-if="scope.row.status == 0"
|
|
|
v-permission="'goods/del'"
|
|
|
@click="onDelete(scope.row)"
|
|
|
@@ -466,6 +480,7 @@ export default {
|
|
|
search: null,
|
|
|
groupGoods: null,
|
|
|
type: null,
|
|
|
+ status: null,
|
|
|
goodsCategoryId: null,
|
|
|
startTime: null,
|
|
|
endTime: null
|
|
|
@@ -733,6 +748,7 @@ export default {
|
|
|
search: null,
|
|
|
groupGoods: null,
|
|
|
type: null,
|
|
|
+ status: null,
|
|
|
goodsCategoryId: null,
|
|
|
startTime: null,
|
|
|
endTime: null
|
|
|
@@ -794,7 +810,7 @@ export default {
|
|
|
let searchForm = JSON.stringify(this.searchForm)
|
|
|
let paramInfo = JSON.stringify(params)
|
|
|
// 判断是否是修改组合商品
|
|
|
- if (type == 'update' && row.complementGoodsIdList) {
|
|
|
+ if (type == 'update' || type == 'look' && row.complementGoodsIdList) {
|
|
|
this.routeShopStatus = true
|
|
|
this.isAdd = false
|
|
|
|
