1.3版本发布

This commit is contained in:
hupeng
2019-11-22 10:02:09 +08:00
parent 4faa83dc0c
commit 185fc51e1d
5 changed files with 49 additions and 61 deletions

View File

@ -3,51 +3,41 @@
<!--工具栏-->
<div class="head-container">
<!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-permission="['ADMIN','YXSTOREPINK_ALL','YXSTOREPINK_CREATE']"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="add">新增</el-button>
</div>
</div>
<!--表单组件-->
<eForm ref="form" :is-add="isAdd"/>
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="id" label="id"/>
<el-table-column prop="uid" label="用户id"/>
<el-table-column prop="orderId" label="订单id 生成"/>
<el-table-column prop="orderIdKey" label="订单id 数据库"/>
<el-table-column prop="totalNum" label="购买商品个数"/>
<el-table-column prop="totalPrice" label="购买总金额"/>
<el-table-column prop="cid" label="拼团产品id"/>
<el-table-column prop="pid" label="产品id"/>
<el-table-column prop="people" label="拼图总人数"/>
<el-table-column prop="price" label="拼团产品单价"/>
<el-table-column prop="addTime" label="开始时间"/>
<el-table-column prop="stopTime" label="stopTime"/>
<el-table-column prop="kId" label="团长id 0为团长"/>
<el-table-column prop="isTpl" label="是否发送模板消息0未发送1已发送"/>
<el-table-column prop="isRefund" label="是否退款 0未退款 1已退款"/>
<el-table-column prop="status" label="状态1进行中2已完成3未完成"/>
<el-table-column v-if="checkPermission(['ADMIN','YXSTOREPINK_ALL','YXSTOREPINK_EDIT','YXSTOREPINK_DELETE'])" label="操作" width="150px" align="center">
<el-table-column prop="uid" label="开团团长" width="150">
<template slot-scope="scope">
<el-button v-permission="['ADMIN','YXSTOREPINK_ALL','YXSTOREPINK_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
<el-popover
v-permission="['ADMIN','YXSTOREPINK_ALL','YXSTOREPINK_DELETE']"
:ref="scope.row.id"
placement="top"
width="180">
<p>确定删除本条数据吗</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
</div>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
</el-popover>
<span>{{ scope.row.nickname }}/{{ scope.row.uid }}</span>
</template>
</el-table-column>
<el-table-column label="开团时间">
<template slot-scope="scope">
<span>{{ formatTimeTwo(scope.row.addTime) }}</span>
</template>
</el-table-column>
<el-table-column label="拼团产品">
<template slot-scope="scope">
<span>{{ scope.row.title }}/{{ scope.row.cid }}</span>
</template>
</el-table-column>
<el-table-column prop="orderId" label="订单号" width="150"/>
<el-table-column prop="totalPrice" label="拼团价"/>
<el-table-column prop="people" label="几人团"/>
<el-table-column prop="countPeople" label="几人参加"/>
<el-table-column label="结束时间">
<template slot-scope="scope">
<span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
</template>
</el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<span v-if="scope.row.status == 1">进行中</span>
<span v-else-if="scope.row.status == 2">已完成</span>
<span v-else>未完成</span>
</template>
</el-table-column>
</el-table>
@ -67,6 +57,7 @@ import checkPermission from '@/utils/permission'
import initData from '@/mixins/initData'
import { del } from '@/api/yxStorePink'
import eForm from './form'
import { formatTimeTwo, parseTime } from '@/utils/index'
export default {
components: { eForm },
mixins: [initData],
@ -81,6 +72,8 @@ export default {
})
},
methods: {
parseTime,
formatTimeTwo,
checkPermission,
beforeInit() {
this.url = 'api/yxStorePink'