kts-component-invoice-operate 3.2.197 → 3.2.198
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.esm.js +19 -13
- package/dist/index.js +19 -13
- package/package.json +1 -1
- package/src/Invoice/Invoice-digtal/_test/easiest/index.tsx +3 -1
- package/src/Invoice/index.tsx +8 -1
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/autoFillFn/index.ts +16 -16
- package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/index.tsx +3 -2
package/dist/index.esm.js
CHANGED
|
@@ -19388,7 +19388,7 @@ var onChangeQuantity$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19388
19388
|
|
|
19389
19389
|
case 11:
|
|
19390
19390
|
calculatingDigits = controller.state.calculatingDigits;
|
|
19391
|
-
quantity =
|
|
19391
|
+
quantity = values.quantity;
|
|
19392
19392
|
_context3.next = 16;
|
|
19393
19393
|
return controller.setEditGood({
|
|
19394
19394
|
quantity: quantity
|
|
@@ -19410,7 +19410,7 @@ var onChangeQuantity$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19410
19410
|
}
|
|
19411
19411
|
|
|
19412
19412
|
// 可以找到 单价(含税)
|
|
19413
|
-
priceIncludeTax =
|
|
19413
|
+
priceIncludeTax = values.priceIncludeTax;
|
|
19414
19414
|
lineAmountIncludeTax = format2(evaluate("".concat(priceIncludeTax, " * ").concat(quantity)));
|
|
19415
19415
|
form.setFieldsValue({
|
|
19416
19416
|
lineAmountIncludeTax: lineAmountIncludeTax
|
|
@@ -19432,7 +19432,7 @@ var onChangeQuantity$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19432
19432
|
|
|
19433
19433
|
// 可以找到 金额(含税)
|
|
19434
19434
|
_lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
|
|
19435
|
-
_priceIncludeTax =
|
|
19435
|
+
_priceIncludeTax = evaluate("".concat(_lineAmountIncludeTax, " / ").concat(quantity));
|
|
19436
19436
|
form.setFieldsValue({
|
|
19437
19437
|
priceIncludeTax: _priceIncludeTax
|
|
19438
19438
|
});
|
|
@@ -19456,7 +19456,7 @@ var onChangeQuantity$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19456
19456
|
}
|
|
19457
19457
|
|
|
19458
19458
|
// 可以找到 单价(不含税)
|
|
19459
|
-
priceExcludeTax =
|
|
19459
|
+
priceExcludeTax = values.priceExcludeTax;
|
|
19460
19460
|
lineAmountExcludeTax = format2(evaluate("".concat(quantity, " * ").concat(priceExcludeTax)));
|
|
19461
19461
|
form.setFieldsValue({
|
|
19462
19462
|
lineAmountExcludeTax: lineAmountExcludeTax
|
|
@@ -19479,7 +19479,7 @@ var onChangeQuantity$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19479
19479
|
|
|
19480
19480
|
// 可以找到 金额(不含税)
|
|
19481
19481
|
_lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
|
|
19482
|
-
_priceExcludeTax =
|
|
19482
|
+
_priceExcludeTax = evaluate("".concat(_lineAmountExcludeTax, " / ").concat(quantity));
|
|
19483
19483
|
form.setFieldsValue({
|
|
19484
19484
|
priceExcludeTax: _priceExcludeTax
|
|
19485
19485
|
});
|
|
@@ -19555,7 +19555,7 @@ var onChangePriceIncludeTax$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19555
19555
|
|
|
19556
19556
|
case 11:
|
|
19557
19557
|
calculatingDigits = controller.state.calculatingDigits;
|
|
19558
|
-
priceIncludeTax =
|
|
19558
|
+
priceIncludeTax = values.priceIncludeTax;
|
|
19559
19559
|
_context4.next = 15;
|
|
19560
19560
|
return controller.setEditGood({
|
|
19561
19561
|
priceIncludeTax: priceIncludeTax
|
|
@@ -19571,7 +19571,7 @@ var onChangePriceIncludeTax$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19571
19571
|
break;
|
|
19572
19572
|
}
|
|
19573
19573
|
|
|
19574
|
-
quantity =
|
|
19574
|
+
quantity = values.quantity;
|
|
19575
19575
|
lineAmountIncludeTax = format2(evaluate("".concat(quantity, " * ").concat(priceIncludeTax)));
|
|
19576
19576
|
form.setFieldsValue({
|
|
19577
19577
|
lineAmountIncludeTax: lineAmountIncludeTax
|
|
@@ -19592,7 +19592,7 @@ var onChangePriceIncludeTax$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19592
19592
|
}
|
|
19593
19593
|
|
|
19594
19594
|
_lineAmountIncludeTax2 = format2(values.lineAmountIncludeTax);
|
|
19595
|
-
_quantity =
|
|
19595
|
+
_quantity = evaluate("".concat(_lineAmountIncludeTax2, " / ").concat(priceIncludeTax));
|
|
19596
19596
|
form.setFieldsValue({
|
|
19597
19597
|
quantity: _quantity
|
|
19598
19598
|
});
|
|
@@ -19667,7 +19667,7 @@ var onChangePriceExcludeTax$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19667
19667
|
|
|
19668
19668
|
case 11:
|
|
19669
19669
|
calculatingDigits = controller.state.calculatingDigits;
|
|
19670
|
-
priceExcludeTax =
|
|
19670
|
+
priceExcludeTax = values.priceExcludeTax;
|
|
19671
19671
|
_context5.next = 15;
|
|
19672
19672
|
return controller.setEditGood({
|
|
19673
19673
|
priceExcludeTax: priceExcludeTax
|
|
@@ -19683,7 +19683,7 @@ var onChangePriceExcludeTax$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19683
19683
|
break;
|
|
19684
19684
|
}
|
|
19685
19685
|
|
|
19686
|
-
quantity =
|
|
19686
|
+
quantity = values.quantity;
|
|
19687
19687
|
lineAmountExcludeTax = format2(evaluate("".concat(quantity, " * ").concat(priceExcludeTax)));
|
|
19688
19688
|
form.setFieldsValue({
|
|
19689
19689
|
lineAmountExcludeTax: lineAmountExcludeTax
|
|
@@ -19704,7 +19704,7 @@ var onChangePriceExcludeTax$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19704
19704
|
}
|
|
19705
19705
|
|
|
19706
19706
|
_lineAmountExcludeTax2 = format2(values.lineAmountExcludeTax);
|
|
19707
|
-
_quantity2 =
|
|
19707
|
+
_quantity2 = evaluate("".concat(_lineAmountExcludeTax2, " / ").concat(priceExcludeTax));
|
|
19708
19708
|
form.setFieldsValue({
|
|
19709
19709
|
quantity: _quantity2
|
|
19710
19710
|
});
|
|
@@ -22062,7 +22062,7 @@ var useColumns$1 = (function (form) {
|
|
|
22062
22062
|
message: '金额不能为空'
|
|
22063
22063
|
}, {
|
|
22064
22064
|
pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
|
|
22065
|
-
message: '
|
|
22065
|
+
message: '金额错误,请重新输入'
|
|
22066
22066
|
}, {
|
|
22067
22067
|
validator: function () {
|
|
22068
22068
|
var _validator5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(_, value, callback) {
|
|
@@ -22118,6 +22118,7 @@ var useColumns$1 = (function (form) {
|
|
|
22118
22118
|
style: {
|
|
22119
22119
|
textAlign: 'right'
|
|
22120
22120
|
},
|
|
22121
|
+
max: 99999999999999999999,
|
|
22121
22122
|
loading: isCipher$1(changeField, 'lineAmountIncludeTax'),
|
|
22122
22123
|
onChange: function onChange() {
|
|
22123
22124
|
setChangeField('lineAmountIncludeTax');
|
|
@@ -22150,7 +22151,7 @@ var useColumns$1 = (function (form) {
|
|
|
22150
22151
|
message: '金额不能为空'
|
|
22151
22152
|
}, {
|
|
22152
22153
|
pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
|
|
22153
|
-
message: '
|
|
22154
|
+
message: '金额错误,请重新输入'
|
|
22154
22155
|
}, {
|
|
22155
22156
|
validator: function () {
|
|
22156
22157
|
var _validator7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(_, value, callback) {
|
|
@@ -27754,6 +27755,11 @@ function AddComparisonDrawer() {
|
|
|
27754
27755
|
// })
|
|
27755
27756
|
// }
|
|
27756
27757
|
|
|
27758
|
+
var config = {
|
|
27759
|
+
number: 'BigNumber',
|
|
27760
|
+
precision: 64
|
|
27761
|
+
};
|
|
27762
|
+
create(all, config);
|
|
27757
27763
|
/** 发票组件的上下文 */
|
|
27758
27764
|
|
|
27759
27765
|
var InvoiceContext = /*#__PURE__*/React.createContext(undefined);
|
package/dist/index.js
CHANGED
|
@@ -19398,7 +19398,7 @@ var onChangeQuantity$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19398
19398
|
|
|
19399
19399
|
case 11:
|
|
19400
19400
|
calculatingDigits = controller.state.calculatingDigits;
|
|
19401
|
-
quantity =
|
|
19401
|
+
quantity = values.quantity;
|
|
19402
19402
|
_context3.next = 16;
|
|
19403
19403
|
return controller.setEditGood({
|
|
19404
19404
|
quantity: quantity
|
|
@@ -19420,7 +19420,7 @@ var onChangeQuantity$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19420
19420
|
}
|
|
19421
19421
|
|
|
19422
19422
|
// 可以找到 单价(含税)
|
|
19423
|
-
priceIncludeTax =
|
|
19423
|
+
priceIncludeTax = values.priceIncludeTax;
|
|
19424
19424
|
lineAmountIncludeTax = format2(evaluate("".concat(priceIncludeTax, " * ").concat(quantity)));
|
|
19425
19425
|
form.setFieldsValue({
|
|
19426
19426
|
lineAmountIncludeTax: lineAmountIncludeTax
|
|
@@ -19442,7 +19442,7 @@ var onChangeQuantity$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19442
19442
|
|
|
19443
19443
|
// 可以找到 金额(含税)
|
|
19444
19444
|
_lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
|
|
19445
|
-
_priceIncludeTax =
|
|
19445
|
+
_priceIncludeTax = evaluate("".concat(_lineAmountIncludeTax, " / ").concat(quantity));
|
|
19446
19446
|
form.setFieldsValue({
|
|
19447
19447
|
priceIncludeTax: _priceIncludeTax
|
|
19448
19448
|
});
|
|
@@ -19466,7 +19466,7 @@ var onChangeQuantity$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19466
19466
|
}
|
|
19467
19467
|
|
|
19468
19468
|
// 可以找到 单价(不含税)
|
|
19469
|
-
priceExcludeTax =
|
|
19469
|
+
priceExcludeTax = values.priceExcludeTax;
|
|
19470
19470
|
lineAmountExcludeTax = format2(evaluate("".concat(quantity, " * ").concat(priceExcludeTax)));
|
|
19471
19471
|
form.setFieldsValue({
|
|
19472
19472
|
lineAmountExcludeTax: lineAmountExcludeTax
|
|
@@ -19489,7 +19489,7 @@ var onChangeQuantity$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19489
19489
|
|
|
19490
19490
|
// 可以找到 金额(不含税)
|
|
19491
19491
|
_lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
|
|
19492
|
-
_priceExcludeTax =
|
|
19492
|
+
_priceExcludeTax = evaluate("".concat(_lineAmountExcludeTax, " / ").concat(quantity));
|
|
19493
19493
|
form.setFieldsValue({
|
|
19494
19494
|
priceExcludeTax: _priceExcludeTax
|
|
19495
19495
|
});
|
|
@@ -19565,7 +19565,7 @@ var onChangePriceIncludeTax$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19565
19565
|
|
|
19566
19566
|
case 11:
|
|
19567
19567
|
calculatingDigits = controller.state.calculatingDigits;
|
|
19568
|
-
priceIncludeTax =
|
|
19568
|
+
priceIncludeTax = values.priceIncludeTax;
|
|
19569
19569
|
_context4.next = 15;
|
|
19570
19570
|
return controller.setEditGood({
|
|
19571
19571
|
priceIncludeTax: priceIncludeTax
|
|
@@ -19581,7 +19581,7 @@ var onChangePriceIncludeTax$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19581
19581
|
break;
|
|
19582
19582
|
}
|
|
19583
19583
|
|
|
19584
|
-
quantity =
|
|
19584
|
+
quantity = values.quantity;
|
|
19585
19585
|
lineAmountIncludeTax = format2(evaluate("".concat(quantity, " * ").concat(priceIncludeTax)));
|
|
19586
19586
|
form.setFieldsValue({
|
|
19587
19587
|
lineAmountIncludeTax: lineAmountIncludeTax
|
|
@@ -19602,7 +19602,7 @@ var onChangePriceIncludeTax$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19602
19602
|
}
|
|
19603
19603
|
|
|
19604
19604
|
_lineAmountIncludeTax2 = format2(values.lineAmountIncludeTax);
|
|
19605
|
-
_quantity =
|
|
19605
|
+
_quantity = evaluate("".concat(_lineAmountIncludeTax2, " / ").concat(priceIncludeTax));
|
|
19606
19606
|
form.setFieldsValue({
|
|
19607
19607
|
quantity: _quantity
|
|
19608
19608
|
});
|
|
@@ -19677,7 +19677,7 @@ var onChangePriceExcludeTax$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19677
19677
|
|
|
19678
19678
|
case 11:
|
|
19679
19679
|
calculatingDigits = controller.state.calculatingDigits;
|
|
19680
|
-
priceExcludeTax =
|
|
19680
|
+
priceExcludeTax = values.priceExcludeTax;
|
|
19681
19681
|
_context5.next = 15;
|
|
19682
19682
|
return controller.setEditGood({
|
|
19683
19683
|
priceExcludeTax: priceExcludeTax
|
|
@@ -19693,7 +19693,7 @@ var onChangePriceExcludeTax$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19693
19693
|
break;
|
|
19694
19694
|
}
|
|
19695
19695
|
|
|
19696
|
-
quantity =
|
|
19696
|
+
quantity = values.quantity;
|
|
19697
19697
|
lineAmountExcludeTax = format2(evaluate("".concat(quantity, " * ").concat(priceExcludeTax)));
|
|
19698
19698
|
form.setFieldsValue({
|
|
19699
19699
|
lineAmountExcludeTax: lineAmountExcludeTax
|
|
@@ -19714,7 +19714,7 @@ var onChangePriceExcludeTax$1 = lazyFn$2(function (controller, form, record) {
|
|
|
19714
19714
|
}
|
|
19715
19715
|
|
|
19716
19716
|
_lineAmountExcludeTax2 = format2(values.lineAmountExcludeTax);
|
|
19717
|
-
_quantity2 =
|
|
19717
|
+
_quantity2 = evaluate("".concat(_lineAmountExcludeTax2, " / ").concat(priceExcludeTax));
|
|
19718
19718
|
form.setFieldsValue({
|
|
19719
19719
|
quantity: _quantity2
|
|
19720
19720
|
});
|
|
@@ -22072,7 +22072,7 @@ var useColumns$1 = (function (form) {
|
|
|
22072
22072
|
message: '金额不能为空'
|
|
22073
22073
|
}, {
|
|
22074
22074
|
pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
|
|
22075
|
-
message: '
|
|
22075
|
+
message: '金额错误,请重新输入'
|
|
22076
22076
|
}, {
|
|
22077
22077
|
validator: function () {
|
|
22078
22078
|
var _validator5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(_, value, callback) {
|
|
@@ -22128,6 +22128,7 @@ var useColumns$1 = (function (form) {
|
|
|
22128
22128
|
style: {
|
|
22129
22129
|
textAlign: 'right'
|
|
22130
22130
|
},
|
|
22131
|
+
max: 99999999999999999999,
|
|
22131
22132
|
loading: isCipher$1(changeField, 'lineAmountIncludeTax'),
|
|
22132
22133
|
onChange: function onChange() {
|
|
22133
22134
|
setChangeField('lineAmountIncludeTax');
|
|
@@ -22160,7 +22161,7 @@ var useColumns$1 = (function (form) {
|
|
|
22160
22161
|
message: '金额不能为空'
|
|
22161
22162
|
}, {
|
|
22162
22163
|
pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
|
|
22163
|
-
message: '
|
|
22164
|
+
message: '金额错误,请重新输入'
|
|
22164
22165
|
}, {
|
|
22165
22166
|
validator: function () {
|
|
22166
22167
|
var _validator7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(_, value, callback) {
|
|
@@ -27764,6 +27765,11 @@ function AddComparisonDrawer() {
|
|
|
27764
27765
|
// })
|
|
27765
27766
|
// }
|
|
27766
27767
|
|
|
27768
|
+
var config = {
|
|
27769
|
+
number: 'BigNumber',
|
|
27770
|
+
precision: 64
|
|
27771
|
+
};
|
|
27772
|
+
mathjs.create(mathjs.all, config);
|
|
27767
27773
|
/** 发票组件的上下文 */
|
|
27768
27774
|
|
|
27769
27775
|
var InvoiceContext = /*#__PURE__*/React__default['default'].createContext(undefined);
|
package/package.json
CHANGED
|
@@ -11,7 +11,9 @@ export default () => {
|
|
|
11
11
|
|
|
12
12
|
React.useEffect(() => {
|
|
13
13
|
controller.run(async s=>{
|
|
14
|
-
s.stakeholder.enables = ['taxAmount']
|
|
14
|
+
s.stakeholder.enables = ['taxAmount'];
|
|
15
|
+
s.priceIntegerDigit = 25;
|
|
16
|
+
s.calculatingDigits=25;
|
|
15
17
|
})
|
|
16
18
|
}, [controller])
|
|
17
19
|
return (
|
package/src/Invoice/index.tsx
CHANGED
|
@@ -26,6 +26,13 @@ import ImportBuyerDrawer from './ui/default/ImportBuyerDrawer';
|
|
|
26
26
|
import ImportGoodsDrawer from './ui/default/ImportGoodsDrawer';
|
|
27
27
|
import EndowCodeDrawer from './ui/default/EndowCodeDrawer';
|
|
28
28
|
import AddComparisonDrawer from './ui/default/AddComparisonDrawer';
|
|
29
|
+
import { create, all } from 'mathjs';
|
|
30
|
+
const config = {
|
|
31
|
+
number: 'BigNumber',
|
|
32
|
+
precision: 64,
|
|
33
|
+
}
|
|
34
|
+
create(all, config);
|
|
35
|
+
|
|
29
36
|
|
|
30
37
|
/** 发票组件的上下文 */
|
|
31
38
|
export const InvoiceContext = React.createContext<InvoiceController>(
|
|
@@ -97,7 +104,7 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
|
|
|
97
104
|
|
|
98
105
|
/** 特殊信息-不动产经营租赁服务(数电) */
|
|
99
106
|
static readonly RealEstateInfo = RealEstateInfo;
|
|
100
|
-
|
|
107
|
+
|
|
101
108
|
/** 特殊信息-建筑服务(数电) */
|
|
102
109
|
static readonly Architecture = Architecture;
|
|
103
110
|
|
|
@@ -67,7 +67,7 @@ export const onChangeQuantity = lazyFn(
|
|
|
67
67
|
};
|
|
68
68
|
|
|
69
69
|
const calculatingDigits = controller.state.calculatingDigits;
|
|
70
|
-
const quantity =
|
|
70
|
+
const quantity = values.quantity;
|
|
71
71
|
await controller.setEditGood({ quantity });
|
|
72
72
|
form.setFieldsValue({ quantity });
|
|
73
73
|
|
|
@@ -76,16 +76,16 @@ export const onChangeQuantity = lazyFn(
|
|
|
76
76
|
// 含税
|
|
77
77
|
if (!err.priceIncludeTax && values.priceIncludeTax) {
|
|
78
78
|
// 可以找到 单价(含税)
|
|
79
|
-
const priceIncludeTax =
|
|
79
|
+
const priceIncludeTax = values.priceIncludeTax;
|
|
80
80
|
const lineAmountIncludeTax = format2(evaluate(`${priceIncludeTax} * ${quantity}`));
|
|
81
81
|
form.setFieldsValue({ lineAmountIncludeTax });
|
|
82
82
|
await controller.setEditGood({ lineAmountIncludeTax });
|
|
83
83
|
} else if (!err.lineAmountIncludeTax && values.lineAmountIncludeTax) {
|
|
84
84
|
// 可以找到 金额(含税)
|
|
85
85
|
const lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
|
|
86
|
-
const priceIncludeTax =
|
|
87
|
-
evaluate(`${lineAmountIncludeTax} / ${quantity}`)
|
|
88
|
-
|
|
86
|
+
const priceIncludeTax =
|
|
87
|
+
evaluate(`${lineAmountIncludeTax} / ${quantity}`)
|
|
88
|
+
;
|
|
89
89
|
form.setFieldsValue({ priceIncludeTax });
|
|
90
90
|
await controller.setEditGood({ priceIncludeTax });
|
|
91
91
|
}
|
|
@@ -96,14 +96,14 @@ export const onChangeQuantity = lazyFn(
|
|
|
96
96
|
// 不含税
|
|
97
97
|
if (!err.priceExcludeTax && values.priceExcludeTax) {
|
|
98
98
|
// 可以找到 单价(不含税)
|
|
99
|
-
const priceExcludeTax =
|
|
99
|
+
const priceExcludeTax = values.priceExcludeTax;
|
|
100
100
|
const lineAmountExcludeTax = format2(evaluate(`${quantity} * ${priceExcludeTax}`));
|
|
101
101
|
form.setFieldsValue({ lineAmountExcludeTax });
|
|
102
102
|
await controller.setEditGood({ lineAmountExcludeTax, quantity });
|
|
103
103
|
} else if (!err.lineAmountExcludeTax && values.lineAmountExcludeTax) {
|
|
104
104
|
// 可以找到 金额(不含税)
|
|
105
105
|
const lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
|
|
106
|
-
const priceExcludeTax =
|
|
106
|
+
const priceExcludeTax = evaluate(`${lineAmountExcludeTax} / ${quantity}`);
|
|
107
107
|
form.setFieldsValue({ priceExcludeTax });
|
|
108
108
|
await controller.setEditGood({ priceExcludeTax, quantity });
|
|
109
109
|
}
|
|
@@ -136,19 +136,19 @@ export const onChangePriceIncludeTax = lazyFn(
|
|
|
136
136
|
}
|
|
137
137
|
|
|
138
138
|
const calculatingDigits = controller.state.calculatingDigits;
|
|
139
|
-
const priceIncludeTax =
|
|
139
|
+
const priceIncludeTax = values.priceIncludeTax;
|
|
140
140
|
await controller.setEditGood({ priceIncludeTax });
|
|
141
141
|
form.setFieldsValue({ priceIncludeTax });
|
|
142
142
|
|
|
143
143
|
// 是否有数量
|
|
144
144
|
if (!err.quantity && values.quantity) {
|
|
145
|
-
const quantity =
|
|
145
|
+
const quantity = values.quantity;
|
|
146
146
|
const lineAmountIncludeTax = format2(evaluate(`${quantity} * ${priceIncludeTax}`));
|
|
147
147
|
form.setFieldsValue({ lineAmountIncludeTax });
|
|
148
148
|
await controller.setEditGood({ lineAmountIncludeTax });
|
|
149
149
|
} else if (!err.lineAmountIncludeTax && values.lineAmountIncludeTax) {
|
|
150
150
|
const lineAmountIncludeTax = format2(values.lineAmountIncludeTax);
|
|
151
|
-
const quantity =
|
|
151
|
+
const quantity = evaluate(`${lineAmountIncludeTax} / ${priceIncludeTax}`);
|
|
152
152
|
form.setFieldsValue({ quantity });
|
|
153
153
|
await controller.setEditGood({ quantity });
|
|
154
154
|
}
|
|
@@ -180,22 +180,22 @@ export const onChangePriceExcludeTax = lazyFn(
|
|
|
180
180
|
}
|
|
181
181
|
|
|
182
182
|
const calculatingDigits = controller.state.calculatingDigits;
|
|
183
|
-
const priceExcludeTax =
|
|
183
|
+
const priceExcludeTax = values.priceExcludeTax;
|
|
184
184
|
await controller.setEditGood({ priceExcludeTax });
|
|
185
185
|
form.setFieldsValue({ priceExcludeTax });
|
|
186
186
|
|
|
187
187
|
// 是否有数量
|
|
188
188
|
if (!err.quantity && values.quantity) {
|
|
189
|
-
const quantity =
|
|
189
|
+
const quantity = values.quantity;
|
|
190
190
|
const lineAmountExcludeTax = format2(evaluate(`${quantity} * ${priceExcludeTax}`));
|
|
191
191
|
form.setFieldsValue({ lineAmountExcludeTax });
|
|
192
192
|
await controller.setEditGood({ lineAmountExcludeTax });
|
|
193
193
|
} else if (!err.lineAmountExcludeTax && values.lineAmountExcludeTax) {
|
|
194
194
|
const lineAmountExcludeTax = format2(values.lineAmountExcludeTax);
|
|
195
|
-
const quantity =
|
|
196
|
-
evaluate(`${lineAmountExcludeTax} / ${priceExcludeTax}`)
|
|
197
|
-
|
|
198
|
-
|
|
195
|
+
const quantity =
|
|
196
|
+
evaluate(`${lineAmountExcludeTax} / ${priceExcludeTax}`)
|
|
197
|
+
|
|
198
|
+
;
|
|
199
199
|
form.setFieldsValue({ quantity });
|
|
200
200
|
await controller.setEditGood({ quantity });
|
|
201
201
|
}
|
|
@@ -381,7 +381,7 @@ export default (form: WrappedFormUtils) => {
|
|
|
381
381
|
rules: [
|
|
382
382
|
...getReplenishRules('lineAmountIncludeTax'),
|
|
383
383
|
{ required: true, message: '金额不能为空' },
|
|
384
|
-
{ pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '
|
|
384
|
+
{ pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '金额错误,请重新输入' },
|
|
385
385
|
{
|
|
386
386
|
validator: async (_, value, callback) => {
|
|
387
387
|
if (`${value}`.split('.')[0].length > priceIntegerDigit) {
|
|
@@ -400,6 +400,7 @@ export default (form: WrappedFormUtils) => {
|
|
|
400
400
|
})(
|
|
401
401
|
<MyInput
|
|
402
402
|
style={{ textAlign: 'right' }}
|
|
403
|
+
max={99999999999999999999}
|
|
403
404
|
loading={isCipher(changeField, 'lineAmountIncludeTax')}
|
|
404
405
|
onChange={() => {
|
|
405
406
|
setChangeField('lineAmountIncludeTax');
|
|
@@ -430,7 +431,7 @@ export default (form: WrappedFormUtils) => {
|
|
|
430
431
|
rules: [
|
|
431
432
|
...getReplenishRules('lineAmountExcludeTax'),
|
|
432
433
|
{ required: true, message: '金额不能为空' },
|
|
433
|
-
{ pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '
|
|
434
|
+
{ pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '金额错误,请重新输入' },
|
|
434
435
|
{
|
|
435
436
|
validator: async (_, value: string, callback) => {
|
|
436
437
|
if (`${value}`.split('.')[0].length > priceIntegerDigit) {
|