From 52d74f5c4f4d3f99cad548155c3cb57e7c8ec290 Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Fri, 17 Jun 2022 13:44:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E8=BE=93=E5=85=A5=E6=A1=86=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=8F=B7=E6=90=9C=E7=B4=A2=20=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=BD=92=E5=B1=9E?=
 =?UTF-8?q?key=E6=89=B9=E6=AC=A1=E5=AD=97=E7=AB=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/list/list.js   | 25 +++++++++++++++++++++++++
 src/pages/order/list/list.less | 10 +++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

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;
+}
+

From f73e7384f1b802ebc73de69b544fc36963bdce3a Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Fri, 17 Jun 2022 13:58:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=90=A5=E9=94=80=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E3=80=90=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=91=20key=E6=89=B9=E6=AC=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E3=80=90=E6=9B=B4=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/plan/key/list.js  | 7 +++++++
 src/pages/plan/list/list.js | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js
index 9251cd66..252ad89c 100644
--- a/src/pages/plan/key/list.js
+++ b/src/pages/plan/key/list.js
@@ -144,6 +144,13 @@ const Column = [
     prop: "end",
     width: "140px",
   },
+  {
+    title: "更新时间",
+    name: "update_time",
+    type: "normal",
+    prop: "update_time",
+    width: "140px",
+  },
   // {
   //   title: "发放总价(预估)",
   //   name: "grant_total",
diff --git a/src/pages/plan/list/list.js b/src/pages/plan/list/list.js
index f84925ee..8905c90d 100644
--- a/src/pages/plan/list/list.js
+++ b/src/pages/plan/list/list.js
@@ -660,6 +660,13 @@ export default class acclist extends React.Component {
         prop: "end",
         width: "auto",
       },
+      {
+        title: "更新时间",
+        name: "update_time",
+        type: "normal",
+        prop: "update_time",
+        width: "140px",
+      },
       // {
       //   title: "发放总价(预估)",
       //   name: "grant_total",