From 1d8b7df974e1fbdacff7632b05bdc30d78a6a8c1 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 25 Oct 2021 13:30:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html
index 6331095..6b8aec3 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html
@@ -44,6 +44,9 @@
<el-form-item label="中奖人名称" prop="yhmc" >
<el-input v-model="form.yhmc" placeholder="中奖人名称"></el-input>
</el-form-item>
+ <el-form-item label="输入活动名称/编码" prop="hdmcbm" >
+ <el-input v-model="form.hdmcbm" placeholder="输入活动名称/编码"></el-input>
+ </el-form-item>
<el-button type="primary" @click="searchFormSignReceive" >搜索</el-button>
<el-button @click="resetFormSignReceive('form')">重置</el-button>
</el-form>
@@ -57,21 +60,9 @@
stripe:true
@sort-change="sortChange">
<el-table-column
- prop="writeoffTime"
- label="核销时间"
+ prop="receiveName"
+ label="中奖者"
show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="writeoffUser"
- label="核销员"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- label="兑奖码"
- show-overflow-tooltip>
- <template slot-scope="scope">
- <span v-if="scope.row.state == 3">{{scope.row.writeoffCode}}</span>
- </template>
</el-table-column>
<el-table-column
prop="actName"
@@ -94,6 +85,7 @@
<span v-if="scope.row.state == 1">待兑换</span>
<span v-if="scope.row.state == 2">待发货</span>
<span v-if="scope.row.state == 3">已兑换</span>
+ <span v-if="scope.row.state == 4">已失效</span>
</template>
</el-table-column>
<el-table-column
@@ -105,9 +97,21 @@
</template>
</el-table-column>
<el-table-column
- prop="receiveName"
- label="中奖者"
+ prop="writeoffTime"
+ label="核销时间"
show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="writeoffUser"
+ label="核销员"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ label="兑奖码"
+ show-overflow-tooltip>
+ <template slot-scope="scope">
+ <span v-if="scope.row.state == 3">{{scope.row.writeoffCode}}</span>
+ </template>
</el-table-column>
<el-table-column
prop="receiveAddress"
@@ -116,9 +120,11 @@
</el-table-column>
<el-table-column label="操作" width="200">
<template slot-scope="scope">
- <el-button type="primary" v-if="scope.row.awardWay == 2 && scope.row.state == 1" @click="jumpTologistics(scope.row)" size="mini">发货</el-button>
+ <el-button type="primary" v-if="scope.row.awardWay == 2 && scope.row.state == 2" @click="jumpTologistics(scope.row)" size="mini">发货</el-button>
<el-button type="primary" v-if="scope.row.awardWay != 2 && scope.row.state == 1" @click="jumpToWriteOff(scope.row)" size="mini">核销</el-button>
- <el-button type="primary" @click="jumpToWriteOff(scope.row)" size="mini">查看</el-button>
+
+ <el-button type="primary" v-if="scope.row.awardWay == 2" @click="jumpTologistics(scope.row)" size="mini">查看</el-button>
+ <el-button type="primary" v-if="scope.row.awardWay != 2" @click="jumpToWriteOff(scope.row)" size="mini">查看</el-button>
</template>
</el-table-column>
@@ -187,6 +193,7 @@
// 条件查询
form:{
yhmc:'',
+ hdmcbm:'',
order:'',
sort:''
},
@@ -223,7 +230,7 @@
jumpTologistics(row){
layer.full(layer.open({
type: 2,
- title: "核销",
+ title: "发货",
maxmin: true,
area: [MUI.SIZE_L, '500px'],
content : [ basePath + '/admin/redirect/activity/activity-sign-logistics-info?writeoffId=' + row.id]
@@ -250,6 +257,7 @@
let _this = this;
return {
zjzxm:_this.form.yhmc,
+ hdmcbm:_this.form.hdmcbm,
order:_this.form.order,
sort:_this.form.sort,
}
--
Gitblit v1.9.1