Commit f4f4cb49 authored by 卢均锐's avatar 卢均锐

fix : [19525] 本次对账数量需要限时不能输入负数和0

-请款金额,本次核销金额同样处理
parent 5bba90e7
......@@ -25,6 +25,8 @@ const TABLINK = [
{ id: 'fileLayout', title: intl.formatMessage({ id: 'balance.fujian' }), },
]
const reg = /(^[1-9]{1}[0-9]*$)|(^[0-9]*\.[0-9]{0,3}$)/
const Add = () => {
const {
query: {
......@@ -90,19 +92,21 @@ const Add = () => {
}
}]
},
{ label: intl.formatMessage({ id: 'balance.beizhu' }), name: 'remark', placeholder: '请输入对备注',rules: [
{
validator: (_, value) => {
let _str = value;
_str = _str.replace(/[\u4E00-\u9FA5]/g, "AA");
if (value.length > 60 * 2) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'detail.purchase.tips19' })}${60 * 2}${intl.formatMessage({ id: 'detail.purchase.tips20' })}`))
} else {
return Promise.resolve();
{
label: intl.formatMessage({ id: 'balance.beizhu' }), name: 'remark', placeholder: '请输入对备注', rules: [
{
validator: (_, value) => {
let _str = value;
_str = _str.replace(/[\u4E00-\u9FA5]/g, "AA");
if (value.length > 60 * 2) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'detail.purchase.tips19' })}${60 * 2}${intl.formatMessage({ id: 'detail.purchase.tips20' })}`))
} else {
return Promise.resolve();
}
}
}
}
] },
]
},
]
const basicFormColRight = [
......@@ -281,7 +285,13 @@ const Add = () => {
{ required: true, message: intl.formatMessage({ id: 'balance.qingshuruduizhangshuliang' }) },
{
validator: (_, value) => {
return value > record.reconciliationQuantity ? Promise.reject(new Error('不能大于待对账数量')) : Promise.resolve()
if (!reg.test(value)) {
return Promise.reject(new Error('数量需要大于0'))
}
if(value > record.reconciliationQuantity){
return Promise.reject(new Error('不能大于待对账数量'))
}
return Promise.resolve()
}
},
]}
......
......@@ -43,6 +43,9 @@ const TABLINK = [
{ id: 'billLayout', title: '请款明细' },
]
const reg = /(^[1-9]{1}[0-9]*$)|(^[0-9]*\.[0-9]{0,3}$)/
const createMonthOrDays = (number: number, type: string) => {
let _list = [];
for (let i = 1; i <= number; i++) {
......@@ -510,6 +513,9 @@ const Add = () => {
rules={[
{
validator: (_, value) => {
if (!reg.test(value)) {
return Promise.reject(new Error('请款金额需要大于0'))
}
if (value > (record.billAmount - record.paid - record.appliedUnpaid)) {
return Promise.reject(new Error('请款金额不能超过单据金额减去已付款及已请款待付款的和'))
}
......
......@@ -16,6 +16,8 @@ interface WriteOffDrawerProps {
onOk?: (rows: any[]) => void
}
const intl = getIntl();
const reg = /(^[1-9]{1}[0-9]*$)|(^[0-9]*\.[0-9]{0,3}$)/
const WriteOffDrawer: React.FC<WriteOffDrawerProps> = (props: WriteOffDrawerProps) => {
const { visible, record, editAble = false, onClose, onOk } = props;
const ref = useRef<any>({})
......@@ -119,7 +121,10 @@ const WriteOffDrawer: React.FC<WriteOffDrawerProps> = (props: WriteOffDrawerProp
rules={[
{
validator: (_, value) => {
return value > record.canWriteAmount ? Promise.reject(new Error('可以核销金额')) : Promise.resolve()
if (!reg.test(value)) {
return Promise.reject(new Error('本次核销金额需要大于0'))
}
return value > record.canWriteAmount ? Promise.reject(new Error('本次核销金额不能大于可以核销金额')) : Promise.resolve()
}
},
]}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment