diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js index 0d25255a..8148116c 100644 --- a/src/pages/order/list/list.js +++ b/src/pages/order/list/list.js @@ -44,7 +44,12 @@ const options = [ { key: '4', text: '兑换码批次ID' + }, + { + key: '5', + text: '平台批次号' } + ] const Column = [ { @@ -89,6 +94,13 @@ const Column = [ prop: 'reseller_name', width: 'auto' }, + { + title: '归属key批次', + name: 'key_batch_id', + prop: 'key_batch_id', + width: 'auto', + type: 'normal' + }, { title: '归属营销计划', name: 'plan_title', @@ -297,6 +309,11 @@ export default class orderlist extends React.Component { data.code_batch_id = key_word } } + if (option && option.key == 5) { + if (key_word) { + data.channel_activity_id = key_word + } + } if (this.state.selectiondata && this.state.selectiondata.length > 0) { let orders = this.state.selectiondata let orderNum = orders.map((item) => item.order_number) @@ -526,6 +543,11 @@ export default class orderlist extends React.Component { data.code_batch_id = key_word } } + if (option && option.key == 5) { + if (key_word) { + data.channel_activity_id = key_word + } + } getOrderList(data) .then((res) => { @@ -559,6 +581,9 @@ export default class orderlist extends React.Component { case 4: placeholder = '请输入兑换码批次ID搜索' break + case 5: + placeholder = '请输入平台批次号' + break default: placeholder = '请输入key搜索' break diff --git a/src/pages/order/list/list.less b/src/pages/order/list/list.less index 501c6fe6..58e991d6 100644 --- a/src/pages/order/list/list.less +++ b/src/pages/order/list/list.less @@ -4,9 +4,11 @@ border: none; } + .orderList .zent-select-v2[data-zv="9.11.0"] { margin-top: -8px; margin-right:-20px; + border:0; } .orderList .distable{ @@ -17,4 +19,10 @@ } .orderList .iptfillself .label { margin-right: 20px; -} \ No newline at end of file +} +.orderList .zent-select-v2[data-zv="9.12.7"]{ + border-top:0; + border-left:0; + border-right:0; +} +