Commit 8f9fa91685a148f3ce58c994713e09c6ee142bd7
1 parent
88ebf2c0
fix: 修改支付方式
Showing
3 changed files
with
4 additions
and
3 deletions
src/pages/Order/Order/index.tsx
| @@ -120,7 +120,7 @@ const OrderPage = () => { | @@ -120,7 +120,7 @@ const OrderPage = () => { | ||
| 120 | <div className="order-page-container"> | 120 | <div className="order-page-container"> |
| 121 | <div id="resizeDiv"></div> | 121 | <div id="resizeDiv"></div> |
| 122 | <div id="resizeDiv"></div> | 122 | <div id="resizeDiv"></div> |
| 123 | - {roleCode !== 'SALES_MANAGER' && ( | 123 | + {roleCode !== 'SALES_MANAGER' && roleCode !== 'ADMIN' && ( |
| 124 | <Modal | 124 | <Modal |
| 125 | title="订单预警提醒" | 125 | title="订单预警提醒" |
| 126 | open={open} | 126 | open={open} |
src/pages/Order/OrderList/InvoicingDrawerForm.tsx
| @@ -135,6 +135,8 @@ export default ({ | @@ -135,6 +135,8 @@ export default ({ | ||
| 135 | autoFocusFirstInput | 135 | autoFocusFirstInput |
| 136 | drawerProps={{ | 136 | drawerProps={{ |
| 137 | destroyOnClose: true, | 137 | destroyOnClose: true, |
| 138 | + maskClosable: false, | ||
| 139 | + onClose: () => setVisible(false), | ||
| 138 | }} | 140 | }} |
| 139 | submitter={{ | 141 | submitter={{ |
| 140 | render: (props, defaultDoms) => { | 142 | render: (props, defaultDoms) => { |
src/pages/Order/constant.ts
| @@ -29,8 +29,7 @@ export const PAYMENT_METHOD_OPTIONS = { | @@ -29,8 +29,7 @@ export const PAYMENT_METHOD_OPTIONS = { | ||
| 29 | OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网已付', | 29 | OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网已付', |
| 30 | PAYMENT_IN_ADVANCE: '预付', | 30 | PAYMENT_IN_ADVANCE: '预付', |
| 31 | PAYMENT_IN_TAOBAO: '淘宝', | 31 | PAYMENT_IN_TAOBAO: '淘宝', |
| 32 | - WITHHOLDING_ADVANCE_DEPOSIT: '预付(扣预存)', | ||
| 33 | - PLATFORM_SETTLEMENT: '平台结算', | 32 | + // WITHHOLDING_ADVANCE_DEPOSIT: '预付(扣预存)', |
| 34 | CASH_ON_DELIVERY: '货到付款', | 33 | CASH_ON_DELIVERY: '货到付款', |
| 35 | HIRE_PURCHASE: '分期付款', | 34 | HIRE_PURCHASE: '分期付款', |
| 36 | // PAYMENT_RECEIPT: '已回款', | 35 | // PAYMENT_RECEIPT: '已回款', |