✨ feat(ID1000829):【临】剪版下单米数调整为0.3米,每次新增时,整数累加,不要0.3+1这样累加
This commit is contained in:
parent
f1c11737a7
commit
f91e014db5
@ -51,12 +51,21 @@ const CounterDisplayName = (props: params) => {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setValue({ count: defaultNum })
|
setValue({ count: defaultNum })
|
||||||
}, [defaultNum])
|
}, [defaultNum])
|
||||||
|
|
||||||
|
// 判断是否整数类型
|
||||||
|
function isInteger(obj) {
|
||||||
|
return (obj | 0) === obj
|
||||||
|
}
|
||||||
|
|
||||||
const onPlus = () => {
|
const onPlus = () => {
|
||||||
if (disabled) { return false }
|
if (disabled) { return false }
|
||||||
const count = value.count
|
const count = value.count
|
||||||
let num_res = Big(count).add(step).toNumber()
|
let num_res = Big(count).add(step).toNumber()
|
||||||
num_res = num_res >= maxNum ? maxNum : num_res
|
|
||||||
num_res = formatDigits(num_res)
|
num_res = formatDigits(num_res)
|
||||||
|
if (!isInteger(num_res)) {
|
||||||
|
num_res = Math.trunc(num_res)
|
||||||
|
}
|
||||||
|
num_res = num_res >= maxNum ? maxNum : num_res
|
||||||
setValue({ ...value, count: num_res })
|
setValue({ ...value, count: num_res })
|
||||||
onChange?.(parseFloat(num_res))
|
onChange?.(parseFloat(num_res))
|
||||||
onClickBtn?.(parseFloat(num_res))
|
onClickBtn?.(parseFloat(num_res))
|
||||||
@ -64,11 +73,19 @@ const CounterDisplayName = (props: params) => {
|
|||||||
const minus = () => {
|
const minus = () => {
|
||||||
if (disabled) { return false }
|
if (disabled) { return false }
|
||||||
const count = value.count
|
const count = value.count
|
||||||
let num_res = Big(count).minus(step).toNumber()
|
let num_res = value.count
|
||||||
|
// let num_res = Big(count).minus(step).toNumber()
|
||||||
if (returnZero) {
|
if (returnZero) {
|
||||||
num_res = num_res < minNum ? 0 : num_res
|
num_res = num_res < minNum ? 0 : num_res
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
// num_res = num_res < minNum ? minNum : num_res
|
||||||
|
if (!isInteger(num_res)) {
|
||||||
|
num_res = Math.trunc(num_res)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
num_res = Big(count).minus(step).toNumber()
|
||||||
|
}
|
||||||
num_res = num_res < minNum ? minNum : num_res
|
num_res = num_res < minNum ? minNum : num_res
|
||||||
}
|
}
|
||||||
setValue({ ...value, count: num_res })
|
setValue({ ...value, count: num_res })
|
||||||
|
|||||||
@ -42,7 +42,7 @@ interface modelClassType {
|
|||||||
const ShopCart = ({ show = false, onClose, intoStatus = 'shop', default_sale_mode }: param) => {
|
const ShopCart = ({ show = false, onClose, intoStatus = 'shop', default_sale_mode }: param) => {
|
||||||
const selectList: modelClassType[] = [
|
const selectList: modelClassType[] = [
|
||||||
{ value: 0, title: '大货', unit: '条', eunit: 'kg', step: 1, digits: 0, minNum: 1, maxNum: 100000, defaultNum: 1 },
|
{ value: 0, title: '大货', unit: '条', eunit: 'kg', step: 1, digits: 0, minNum: 1, maxNum: 100000, defaultNum: 1 },
|
||||||
{ value: 1, title: '剪板', unit: '米', eunit: 'm', step: 1, digits: 2, minNum: 0.5, maxNum: 9.99, defaultNum: 1 },
|
{ value: 1, title: '剪板', unit: '米', eunit: 'm', step: 1, digits: 2, minNum: 0.3, maxNum: 100000, defaultNum: 0.3 },
|
||||||
{ value: 2, title: '散剪', unit: '米', eunit: 'kg', step: 1, digits: 2, minNum: 3, maxNum: 100000, defaultNum: 3 },
|
{ value: 2, title: '散剪', unit: '米', eunit: 'kg', step: 1, digits: 2, minNum: 3, maxNum: 100000, defaultNum: 3 },
|
||||||
]
|
]
|
||||||
const bindSalesManDialogRef = useRef<SalesManDialogRef | null>(null)
|
const bindSalesManDialogRef = useRef<SalesManDialogRef | null>(null)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user