diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js index 9b4afc82..6767efe7 100644 --- a/src/pages/order/list/list.js +++ b/src/pages/order/list/list.js @@ -25,7 +25,22 @@ import Ipt from "@/components/input/main" import TabPage from "@/components/tabPage/main.js" import { intersection } from "lodash-es" import React from "react" -import { Alert, Button, CombinedDateRangePicker, Dialog, Notify, Select, Sweetalert } from "zent" +import { + Alert, + Button, + CombinedDateRangePicker, + Dialog, + Notify, + Select, + Sweetalert, + Dropdown, + DropdownClickTrigger, + Icon, + DropdownContent, + Menu, + MenuItem, + DropdownPosition +} from "zent" import "./list.less" import { Column, filterList, options, rules } from "./utils" var moment = require("moment") @@ -47,6 +62,7 @@ export default class orderList extends React.Component { ], allcheck: false, itemcheck: false, + menuVisible: false, combinedValue: [], tableHeight: 500, status: null, @@ -598,29 +614,29 @@ export default class orderList extends React.Component { ) } - /* 事件通知 */ - eventNotify(order_number, event) { - notifyReseller({ order_number, event }).then(({ code, message }) => { - Notify.clear() - if (code === 200) { - Notify.success(message) - } else { - Notify.error(message) - } - }) - } - - /* 核销查询 */ - writeOffQuery(order_number) { - voucherUsageQuery({ order_number }).then(({ code, message }) => { - Notify.clear() - if (code === 200) { - this.getOrderFn() - Notify.success(message) - } else { - Notify.error(message) - } - }) + menuItemClick(event, order_number) { + /* 核销查询 */ + if (event == 0) { + voucherUsageQuery({ order_number }).then(({ code, message }) => { + Notify.clear() + if (code === 200) { + this.getOrderFn() + Notify.success(message) + } else { + Notify.error(message) + } + }) + } else { + /* 事件通知 */ + notifyReseller({ order_number, event }).then(({ code, message }) => { + Notify.clear() + if (code === 200) { + Notify.success(message) + } else { + Notify.error(message) + } + }) + } } //过滤表格枚举状态 @@ -662,19 +678,6 @@ export default class orderList extends React.Component { }} /> - - + + )} - {rowData.notifyEvent && - rowData.notifyEvent.map((item) => ( - this.eventNotify(rowData.order_number, item.event)} - > - {item.name} - - ))} - - {rowData.type === 2 && - rowData.orderVoucher && - rowData.orderVoucher.status === 1 && ( - this.writeOffQuery(rowData.order_number)} - > - 核销查询 - - )} + this.setState({ visible1: v })} + > + +
+ 更多 +
+
+ + this.menuItemClick(key, rowData.order_number)}> + {rowData.notifyEvent && + rowData.notifyEvent.map((item) => ( + {item.name} + ))} + {rowData.type === 2 && + rowData.orderVoucher && + rowData.orderVoucher.status === 1 && ( + 核销查询 + )} + + +
) } diff --git a/src/pages/order/list/utils.js b/src/pages/order/list/utils.js index 007ca5fc..d8380a8a 100644 --- a/src/pages/order/list/utils.js +++ b/src/pages/order/list/utils.js @@ -88,7 +88,7 @@ export const Column = [ prop: "opearo", name: "opearo", type: "slot", - width: "160px" + width: "220px" }, { title: "批次号",