Commit cb4f8c55 authored by chenwei's avatar chenwei

Merge branch 'cherry-pick-3d196b22' into 'hotfix/preReleaseDefect'

Merge branch 'feature/099_customer_filter' into 'dev'

See merge request !33
parents 08db7893 9158702a
......@@ -111,6 +111,16 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('兑换记录ID')">
<el-input
v-model.trim="queryParams.redemptionNumber"
style="width: 300px"
:placeholder="$t('请输入')"
clearable
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
$t("搜索")
......@@ -493,6 +503,7 @@ export default {
startTime: "",
endTime: "",
nodeId: "",
redemptionNumber: null,
pageNo: 1,
pageSize: 10,
},
......@@ -747,6 +758,7 @@ export default {
holdScore: null,
holdScoreOperate: null,
key: null,
redemptionNumber: null,
pageNo: 1,
pageSize: 10,
startTime: null,
......@@ -791,6 +803,7 @@ export default {
key: null,
pageNo: 1,
pageSize: 10,
redemptionNumber: null,
startTime: null,
usedScore: null,
usedScoreOperate: null,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment