Commit bb230f206ad5c3fd24ab076d8c436acce758438a
1 parent
1b338a1f
fix: 修改弹窗
Showing
3 changed files
with
3 additions
and
6 deletions
src/pages/Order/OrderList/HirePurchaseUploadPayBillModal.tsx
@@ -79,8 +79,6 @@ const HirePurchaseUploadPayBillModal: React.FC< | @@ -79,8 +79,6 @@ const HirePurchaseUploadPayBillModal: React.FC< | ||
79 | 79 | ||
80 | // 验证回款金额不能超过待回款金额 | 80 | // 验证回款金额不能超过待回款金额 |
81 | const validateAmount = (_: any, value: string) => { | 81 | const validateAmount = (_: any, value: string) => { |
82 | - if (!value) return Promise.reject('请输入回款金额'); | ||
83 | - | ||
84 | // Check if the value is a valid number | 82 | // Check if the value is a valid number |
85 | if (isNaN(value)) return Promise.reject('请输入有效的数字'); | 83 | if (isNaN(value)) return Promise.reject('请输入有效的数字'); |
86 | 84 |
src/pages/Order/OrderList/ImagesViewerModal.tsx
@@ -3,7 +3,7 @@ import { Button, Divider, Image, Modal } from 'antd'; | @@ -3,7 +3,7 @@ import { Button, Divider, Image, Modal } from 'antd'; | ||
3 | import { useEffect, useState } from 'react'; | 3 | import { useEffect, useState } from 'react'; |
4 | export default ({ setVisible, optType, onClose, orderRow }) => { | 4 | export default ({ setVisible, optType, onClose, orderRow }) => { |
5 | const [images, setImages] = useState<any[]>([]); | 5 | const [images, setImages] = useState<any[]>([]); |
6 | - const [title, setTitle] = useState('收货凭证'); | 6 | + const [title, setTitle] = useState('收款凭证'); |
7 | const handleOk = () => { | 7 | const handleOk = () => { |
8 | onClose(); | 8 | onClose(); |
9 | setVisible(false); | 9 | setVisible(false); |
src/pages/Order/OrderList/OrderDrawer.tsx
@@ -310,10 +310,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -310,10 +310,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
310 | copyData.customerNameString = copyData.customerName; | 310 | copyData.customerNameString = copyData.customerName; |
311 | 311 | ||
312 | // 清空支付方式和支付渠道 | 312 | // 清空支付方式和支付渠道 |
313 | - if (copyData.paymentChannel === 'TAOBAO') { | ||
314 | - copyData.paymentChannel = ''; | ||
315 | - } | ||
316 | if ( | 313 | if ( |
314 | + copyData.paymentChannel === 'TAOBAO' || | ||
317 | [ | 315 | [ |
318 | 'UNPAID', | 316 | 'UNPAID', |
319 | 'TAOBAO_ORDER_HAS_BEEN_PAID', | 317 | 'TAOBAO_ORDER_HAS_BEEN_PAID', |
@@ -325,6 +323,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -325,6 +323,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
325 | ].includes(copyData.paymentMethod) | 323 | ].includes(copyData.paymentMethod) |
326 | ) { | 324 | ) { |
327 | copyData.paymentMethod = ''; | 325 | copyData.paymentMethod = ''; |
326 | + copyData.paymentChannel = ''; | ||
328 | } | 327 | } |
329 | 328 | ||
330 | setPaymentMethod(copyData.paymentMethod); | 329 | setPaymentMethod(copyData.paymentMethod); |