修复线上营销计划删除草稿状态，订单查询

src/assets/api.js

@@ -354,6 +354,11 @@ export const keysIsSend = (id, params) => {
 export const cancelKey = (id, params) => {
   return req("put", baseurl + "/keys/cancel/" + id, params);
 };
+//删除草稿key批次
+export const deldraftCode = (id) => {
+  return req("delete", baseurl + "/plan/delete/" + id);
+};
+
 
 //发送密钥邮件
 export const postKeyEmail = (id, params) => {

src/pages/exchangecode/list/list.js

@@ -3,7 +3,6 @@ import React, { Component } from "react";
 import { Link } from "react-router-dom";
 import {
   Button,
-  Tag,
   Sweetalert,
   CombinedDateRangePicker,
   Notify,

src/pages/order/list/list.less

@@ -11,4 +11,10 @@
 
 .orderList .distable{
   margin-bottom: 10px;
+}
+.orderList .iptfillself {
+  margin-bottom: 5px;
+}
+.orderList .iptfillself .label {
+  margin-right: 20px;
 }

src/pages/plan/list/list.js

@@ -29,6 +29,7 @@ import Filterbar from "../../../components/filterbar/main.js";
 import {
   planIsSend,
   planCancel,
+  deldraftCode,
   getPlanList,
   handelResponse,
   startOrStopPlan,
@@ -165,7 +166,7 @@ export default class acclist extends React.Component {
           this.setState({ distdata: req.data });
           this.setState({ dataCount: req.total });
         },
-        (err) => {}
+        (err) => { }
       );
     });
   }
@@ -295,7 +296,7 @@ export default class acclist extends React.Component {
     }
   }
   //输入值变化
-  onInputChange(e) {}
+  onInputChange(e) { }
   //营销系统名称
   linkTo(row) {
     sessionStorage.setItem("showflag", true);
@@ -319,7 +320,8 @@ export default class acclist extends React.Component {
   menuItemClick(e, key, row) {
     this.setState({ plan_id: row.id });
 
-    if (row.status == 6 || row.status == 0) {
+    if (row.status == 6) {
+      Notify.clear();
       Notify.error("该状态下的数据不允许编辑");
       return;
     }
@@ -373,6 +375,44 @@ export default class acclist extends React.Component {
         parentComponent: this,
       });
     }
+    //删除
+    if (key == 4) {
+      let self = this;
+      Sweetalert.confirm({
+        type: "warning",
+        closeBtn: true,
+        title: "确认操作",
+        content: <p>是否确定删除[{row.title}]？</p>,
+        onConfirm: () => {
+          deldraftCode(row.id).then((res) => {
+            handelResponse(
+              res,
+              (req, msg) => {
+                Notify.success(msg);
+                self.setState({ page: 1 });
+                self.setState({ limit: 10 });
+                let data = {
+                  page: 1,
+                  limit: 10,
+                  status: this.state.status,
+                  key_word: this.state.key_word,
+                };
+                if (data.key_word === "") {
+                  delete data.key_word;
+                }
+                self.getPlanList(data);
+              },
+              (err) => {
+                Notify.error(err);
+              }
+            );
+          });
+        },
+        onCancel: this.onCancel,
+        className: "questModal",
+        parentComponent: this,
+      });
+    }
   }
 
   //清空
@@ -775,7 +815,7 @@ export default class acclist extends React.Component {
                       </a>
                       <Dropdown position={DropdownPosition.RightTop}>
                         <DropdownClickTrigger>
-                          <div className="linkmore" onClick={(e) => {}}>
+                          <div className="linkmore" onClick={(e) => { }}>
                             {" "}
                             更多 <Icon type={"down"} />{" "}
                           </div>
@@ -834,19 +874,26 @@ export default class acclist extends React.Component {
                           <DropdownClickTrigger>
                             <div
                               className="linkmore"
-                              style={{ paddingLeft: "2px", color: "#d8dbdd" }}
-                              onClick={(e) => {}}
+                              style={{ paddingLeft: "2px"}}
+                              onClick={(e) => { }}
                             >
                               {" "}
                               更多 <Icon type={"down"} />{" "}
                             </div>
                           </DropdownClickTrigger>
-                          <DropdownContent></DropdownContent>
+                          <DropdownContent>
+                            <Menu
+                              onClick={(e, key) =>
+                                this.menuItemClick(e, key, rowData)
+                              }
+                            >
+                              <MenuItem key="4">删除</MenuItem>
+                            </Menu>
+                          </DropdownContent>
                         </Dropdown>
                       </div>
                     );
                   }
-
                   if (rowData.status == 6) {
                     str = (
                       <div>
@@ -859,7 +906,7 @@ export default class acclist extends React.Component {
                             <div
                               className="linkmore"
                               style={{ paddingLeft: "2px", color: "#d8dbdd" }}
-                              onClick={(e) => {}}
+                              onClick={(e) => { }}
                             >
                               {" "}
                               更多 <Icon type={"down"} />{" "}
@@ -870,7 +917,6 @@ export default class acclist extends React.Component {
                       </div>
                     );
                   }
-
                   return str;
                 }
               }}

src/pages/system/menu/menuright/menuright.less

@@ -3,4 +3,7 @@
     display: flex;
     justify-content: flex-end;
   }
+}
+#systemMenu  .zent-card[data-zv="9.12.7"]{
+  overflow: scroll;
 }