kts-component-invoice-operate 3.2.130-2 → 3.2.130-4

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.
Files changed (5) hide show
  1. package/dist/index.esm.js +9 -9
  2. package/dist/index.js +9 -9
  3. package/package.json +1 -1
  4. package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/index.tsx +2 -2
  5. package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/index.tsx +7 -6
package/dist/index.esm.js CHANGED
@@ -20656,10 +20656,10 @@ var useColumns$1 = (function (form) {
20656
20656
  initialValue: editGood.taxRate,
20657
20657
  rules: [].concat(_toConsumableArray(getReplenishRules('taxRate')), [{
20658
20658
  required: true,
20659
- message: ' '
20659
+ message: '请选择税率'
20660
20660
  }, {
20661
20661
  pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
20662
- message: ' '
20662
+ message: '请选择正确税率'
20663
20663
  }])
20664
20664
  })( /*#__PURE__*/React.createElement(Select$1, {
20665
20665
  className: "kts-invoice-operate-goods-list-table-tax-rate",
@@ -21902,8 +21902,8 @@ function AddDiscountRowDrawer(props) {
21902
21902
  label: '按比例折扣',
21903
21903
  value: '2'
21904
21904
  }]
21905
- })), (formValues === null || formValues === void 0 ? void 0 : formValues.discolineType) === '1' ? /*#__PURE__*/React.createElement(Form$1.Item, {
21906
- label: "\u6298\u6263\u91D1\u989D\uFF08\u5143\uFF09\uFF08\u542B\u7A0E\uFF09",
21905
+ })), (formValues === null || formValues === void 0 ? void 0 : formValues.discolineType) === '2' ? /*#__PURE__*/React.createElement(Form$1.Item, {
21906
+ label: "\u6298\u6263\u6BD4\u4F8B\uFF08%\uFF09\uFF08\u542B\u7A0E\uFF09",
21907
21907
  name: 'discolineValue',
21908
21908
  rules: [{
21909
21909
  required: true,
@@ -21931,12 +21931,12 @@ function AddDiscountRowDrawer(props) {
21931
21931
  throw new Error('需大于0');
21932
21932
 
21933
21933
  case 4:
21934
- if (!(value > totalAmount)) {
21934
+ if (!(value > 100)) {
21935
21935
  _context7.next = 6;
21936
21936
  break;
21937
21937
  }
21938
21938
 
21939
- throw new Error('不可以大于商品金额');
21939
+ throw new Error('不可以大于100');
21940
21940
 
21941
21941
  case 6:
21942
21942
  case "end":
@@ -21958,7 +21958,7 @@ function AddDiscountRowDrawer(props) {
21958
21958
  width: '100%'
21959
21959
  }
21960
21960
  })) : /*#__PURE__*/React.createElement(Form$1.Item, {
21961
- label: "\u6298\u6263\u6BD4\u4F8B\uFF08%\uFF09\uFF08\u542B\u7A0E\uFF09",
21961
+ label: "\u6298\u6263\u91D1\u989D\uFF08\u5143\uFF09\uFF08\u542B\u7A0E\uFF09",
21962
21962
  name: 'discolineValue',
21963
21963
  rules: [{
21964
21964
  required: true,
@@ -21986,12 +21986,12 @@ function AddDiscountRowDrawer(props) {
21986
21986
  throw new Error('需大于0');
21987
21987
 
21988
21988
  case 4:
21989
- if (!(value > 100)) {
21989
+ if (!(value > totalAmount)) {
21990
21990
  _context8.next = 6;
21991
21991
  break;
21992
21992
  }
21993
21993
 
21994
- throw new Error('不可以大于100');
21994
+ throw new Error('不可以大于商品金额');
21995
21995
 
21996
21996
  case 6:
21997
21997
  case "end":
package/dist/index.js CHANGED
@@ -20666,10 +20666,10 @@ var useColumns$1 = (function (form) {
20666
20666
  initialValue: editGood.taxRate,
20667
20667
  rules: [].concat(_toConsumableArray(getReplenishRules('taxRate')), [{
20668
20668
  required: true,
20669
- message: ' '
20669
+ message: '请选择税率'
20670
20670
  }, {
20671
20671
  pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
20672
- message: ' '
20672
+ message: '请选择正确税率'
20673
20673
  }])
20674
20674
  })( /*#__PURE__*/React__default['default'].createElement(ktsXui.Select, {
20675
20675
  className: "kts-invoice-operate-goods-list-table-tax-rate",
@@ -21912,8 +21912,8 @@ function AddDiscountRowDrawer(props) {
21912
21912
  label: '按比例折扣',
21913
21913
  value: '2'
21914
21914
  }]
21915
- })), (formValues === null || formValues === void 0 ? void 0 : formValues.discolineType) === '1' ? /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
21916
- label: "\u6298\u6263\u91D1\u989D\uFF08\u5143\uFF09\uFF08\u542B\u7A0E\uFF09",
21915
+ })), (formValues === null || formValues === void 0 ? void 0 : formValues.discolineType) === '2' ? /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
21916
+ label: "\u6298\u6263\u6BD4\u4F8B\uFF08%\uFF09\uFF08\u542B\u7A0E\uFF09",
21917
21917
  name: 'discolineValue',
21918
21918
  rules: [{
21919
21919
  required: true,
@@ -21941,12 +21941,12 @@ function AddDiscountRowDrawer(props) {
21941
21941
  throw new Error('需大于0');
21942
21942
 
21943
21943
  case 4:
21944
- if (!(value > totalAmount)) {
21944
+ if (!(value > 100)) {
21945
21945
  _context7.next = 6;
21946
21946
  break;
21947
21947
  }
21948
21948
 
21949
- throw new Error('不可以大于商品金额');
21949
+ throw new Error('不可以大于100');
21950
21950
 
21951
21951
  case 6:
21952
21952
  case "end":
@@ -21968,7 +21968,7 @@ function AddDiscountRowDrawer(props) {
21968
21968
  width: '100%'
21969
21969
  }
21970
21970
  })) : /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
21971
- label: "\u6298\u6263\u6BD4\u4F8B\uFF08%\uFF09\uFF08\u542B\u7A0E\uFF09",
21971
+ label: "\u6298\u6263\u91D1\u989D\uFF08\u5143\uFF09\uFF08\u542B\u7A0E\uFF09",
21972
21972
  name: 'discolineValue',
21973
21973
  rules: [{
21974
21974
  required: true,
@@ -21996,12 +21996,12 @@ function AddDiscountRowDrawer(props) {
21996
21996
  throw new Error('需大于0');
21997
21997
 
21998
21998
  case 4:
21999
- if (!(value > 100)) {
21999
+ if (!(value > totalAmount)) {
22000
22000
  _context8.next = 6;
22001
22001
  break;
22002
22002
  }
22003
22003
 
22004
- throw new Error('不可以大于100');
22004
+ throw new Error('不可以大于商品金额');
22005
22005
 
22006
22006
  case 6:
22007
22007
  case "end":
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kts-component-invoice-operate",
3
- "version": "3.2.130-2",
3
+ "version": "3.2.130-4",
4
4
  "scripts": {
5
5
  "dev": "dumi dev",
6
6
  "start": "dumi dev",
package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/index.tsx CHANGED
@@ -458,8 +458,8 @@ export default (form: WrappedFormUtils) => {
458
458
  initialValue: editGood.taxRate,
459
459
  rules: [
460
460
  ...getReplenishRules('taxRate'),
461
- { required: true, message: ' ' },
462
- { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: ' ' },
461
+ { required: true, message: '请选择税率' },
462
+ { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '请选择正确税率' },
463
463
  ],
464
464
  })(
465
465
  <Select
package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/index.tsx CHANGED
@@ -273,10 +273,10 @@ function AddDiscountRowDrawer(props: {
273
273
  ]} />
274
274
  </Form.Item>
275
275
  {
276
- formValues?.discolineType === '1' ?
276
+ formValues?.discolineType === '2' ?
277
277
  (
278
278
  <Form.Item
279
- label='折扣金额（元）（含税）'
279
+ label='折扣比例（%）（含税）'
280
280
  name='discolineValue'
281
281
  rules={[
282
282
  { required: true, message: '必填' },
@@ -284,16 +284,17 @@ function AddDiscountRowDrawer(props: {
284
284
  validator: async (_, value) => {
285
285
  if (isNaN(parseFloat(value))) return;
286
286
  if (value <= 0) throw new Error('需大于0');
287
- if (value > totalAmount) throw new Error('不可以大于商品金额');
287
+ if (value > 100) throw new Error('不可以大于100');
288
288
  }
289
289
  }
290
290
  ]}
291
291
  >
292
292
  <InputNumber style={{ width: '100%' }} />
293
293
  </Form.Item>
294
- ) : (
294
+ ) :
295
+ (
295
296
  <Form.Item
296
- label='折扣比例（%）（含税）'
297
+ label='折扣金额（元）（含税）'
297
298
  name='discolineValue'
298
299
  rules={[
299
300
  { required: true, message: '必填' },
@@ -301,7 +302,7 @@ function AddDiscountRowDrawer(props: {
301
302
  validator: async (_, value) => {
302
303
  if (isNaN(parseFloat(value))) return;
303
304
  if (value <= 0) throw new Error('需大于0');
304
- if (value > 100) throw new Error('不可以大于100');
305
+ if (value > totalAmount) throw new Error('不可以大于商品金额');
305
306
  }
306
307
  }
307
308
  ]}