|
|
@@ -33,11 +33,11 @@
|
|
|
<el-option label="否" value="0"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item>
|
|
|
+ <!-- <el-form-item>
|
|
|
<el-date-picker v-model.trim="orderDate" style="width:410px;" type="daterange" value-format="yyyy-MM-dd"
|
|
|
@change="searchOrderDate" range-separator="至" :picker-options="{ firstDayOfWeek: 1 }" start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"></el-date-picker>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
<el-form-item>
|
|
|
<el-button type="danger" @click="getList">搜索</el-button>
|
|
|
<el-button type="primary" @click="onReset">重置</el-button>
|
|
|
@@ -114,10 +114,14 @@
|
|
|
<template slot-scope="scope">
|
|
|
<!-- 组合商品没有进货清单按钮 -->
|
|
|
<el-button v-if="!scope.row.complementGoodsIdList" type="text">进货清单</el-button>
|
|
|
- <el-button v-if="scope.row.status == 0" v-permission="'goods/update'" @click="onUpdate(scope.row)" type="text">上架</el-button>
|
|
|
+ <el-popconfirm title="你是否上架该商品？" @onConfirm="onUpdate(scope.row)" v-if="scope.row.status == 0" v-permission="'goods/update'">
|
|
|
+ <el-button slot="reference" type="text">上架</el-button>
|
|
|
+ </el-popconfirm>
|
|
|
<el-button v-if="scope.row.status == 0" v-permission="'/shopOperation'" @click="onShopOperation('update', scope.row)"
|
|
|
type="text">修改</el-button>
|
|
|
- <el-button v-if="scope.row.status == 1" v-permission="'goods/update'" @click="onUpdate(scope.row)" type="text">下架</el-button>
|
|
|
+ <el-popconfirm title="你是否下架该商品？" @onConfirm="onUpdate(scope.row)" v-if="scope.row.status == 1" v-permission="'goods/update'">
|
|
|
+ <el-button slot="reference" type="text">下架</el-button>
|
|
|
+ </el-popconfirm>
|
|
|
<!-- <el-button v-if="scope.row.status == 0"
|
|
|
v-permission="'goods/del'"
|
|
|
@click="onDelete(scope.row)"
|
|
|
@@ -516,7 +520,7 @@
|
|
|
goodsQuery({
|
|
|
rows: 9999,
|
|
|
page: 1,
|
|
|
- status: 1
|
|
|
+ groupGoods: 0
|
|
|
}).then(res => {
|
|
|
if (res.code == 200 && res.data) {
|
|
|
this.selectGoodsList = res.data.rows
|
|
|
@@ -647,7 +651,7 @@
|
|
|
if (this.form.id) { // 判断有没有Id，如果有则删除
|
|
|
delete this.form.id
|
|
|
}
|
|
|
- form.status = 'YES' // 默认上架
|
|
|
+ form.status = 'NO' // 默认上架
|
|
|
goodsAdd(cleanDeep(form)).then(res => {
|
|
|
this.messageTips('添加', res)
|
|
|
})
|
