From 0df561aa2c21423f1d4bd78040c4c3507b89e259 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 12 Apr 2021 18:11:59 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 806f771..3c585e0 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>
@@ -189,6 +192,7 @@
// 条件查询
form:{
yhmc:'',
+ hdmcbm:'',
order:'',
sort:''
},
@@ -225,7 +229,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]
@@ -252,6 +256,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