kts-component-invoice-operate 3.2.67 → 3.2.68

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 (6) hide show
  1. package/dist/index.esm.js +16 -11
  2. package/dist/index.js +16 -11
  3. package/package.json +1 -1
  4. package/src/Invoice/ui/default/GoodsList/hook/useColumns/index.tsx +2 -2
  5. package/src/Invoice/ui/default/GoodsList/index.less +5 -1
  6. package/src/Invoice/ui/default/ImportGoodsDrawer/index.tsx +3 -0
package/dist/index.esm.js CHANGED
@@ -13160,10 +13160,10 @@ var useColumns = (function (form) {
13160
13160
  initialValue: editGood.taxRate,
13161
13161
  rules: [].concat(_toConsumableArray(getReplenishRules('taxRate')), [{
13162
13162
  required: true,
13163
- message: ' '
13163
+ message: '请选择税率'
13164
13164
  }, {
13165
13165
  pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
13166
- message: ' '
13166
+ message: '请选择正确税率'
13167
13167
  }])
13168
13168
  })(React.createElement(Select, {
13169
13169
  className: "kts-invoice-operate-goods-list-table-tax-rate",
@@ -13905,7 +13905,7 @@ var useRowSelection = (function () {
13905
13905
  };
13906
13906
  });
13907
13907
 
13908
- var css_248z$a = ".kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-table-tax-rate .ktsAnt3x-select-selection-selected-value {\n float: right;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able {\n display: flex;\n padding: 10px;\n border-bottom: 1px solid #dcdcdc;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list {\n flex: 1;\n display: flex;\n gap: 10px;\n padding-right: 10px;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list button {\n padding-left: 10px;\n padding-right: 10px;\n border-radius: 12px;\n color: #0074ff;\n border: 1px solid #0074ff;\n height: 24px;\n line-height: 22px;\n cursor: pointer;\n font-size: 12px;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list button[disabled] {\n color: rgba(0, 0, 0, 0.25);\n border: 1px solid;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-extend {\n flex: none;\n display: flex;\n gap: 5px;\n}\n.kts-invoice-operate-goods-list .ktsAntX-table .ktsAntX-table-row.kts-invoice-operate-goods-be-discount .ktsAntX-table-cell,\n.kts-invoice-operate-goods-list .ktsAntX-table .ktsAntX-table-row.kts-invoice-operate-goods-discount .ktsAntX-table-cell {\n background: #f5f5f5;\n}\n.kts-invoice-operate-goods-list-table.kts-invoice-operate-prefab .ktsAnt3x-table-row {\n color: rgba(0, 0, 0, 0.25);\n background: #f5f5f5;\n}\n.kts-invoice-operate-goods-list-table-search-protrude {\n background: #ff0;\n color: #000;\n font-weight: bold;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-form-item {\n margin: 0;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-form-item-control {\n line-height: 1;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-input:focus {\n box-shadow: none;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-input,\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-select-selection--single {\n border: none;\n border-radius: 0;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-form-explain {\n display: none;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .has-error .ktsAnt3x-input {\n border: #f5222d solid 1px;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAntX-checkbox-wrapper .ktsAntX-checkbox-checked .ktsAntX-checkbox-inner::after {\n width: 5px;\n height: 10px;\n}\n";
13908
+ var css_248z$a = ".kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-table-tax-rate .ktsAnt3x-select-selection-selected-value {\n float: right;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able {\n display: flex;\n padding: 10px;\n border-bottom: 1px solid #dcdcdc;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list {\n flex: 1;\n display: flex;\n gap: 10px;\n padding-right: 10px;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list button {\n padding-left: 10px;\n padding-right: 10px;\n border-radius: 12px;\n color: #0074ff;\n border: 1px solid #0074ff;\n height: 24px;\n line-height: 22px;\n cursor: pointer;\n font-size: 12px;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list button[disabled] {\n color: rgba(0, 0, 0, 0.25);\n border: 1px solid;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-extend {\n flex: none;\n display: flex;\n gap: 5px;\n}\n.kts-invoice-operate-goods-list .ktsAntX-table .ktsAntX-table-row.kts-invoice-operate-goods-be-discount .ktsAntX-table-cell,\n.kts-invoice-operate-goods-list .ktsAntX-table .ktsAntX-table-row.kts-invoice-operate-goods-discount .ktsAntX-table-cell {\n background: #f5f5f5;\n}\n.kts-invoice-operate-goods-list-table.kts-invoice-operate-prefab .ktsAnt3x-table-row {\n color: rgba(0, 0, 0, 0.25);\n background: #f5f5f5;\n}\n.kts-invoice-operate-goods-list-table-search-protrude {\n background: #ff0;\n color: #000;\n font-weight: bold;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-form-item {\n margin: 0;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-form-item-control {\n line-height: 1;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-input:focus {\n box-shadow: none;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-input,\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-select-selection--single {\n border: none;\n border-radius: 0;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-form-explain {\n display: none;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .has-error .ktsAnt3x-input {\n border: #f5222d solid 1px;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .has-error .kts-invoice-operate-goods-list-table-tax-rate {\n border: #f5222d solid 1px;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAntX-checkbox-wrapper .ktsAntX-checkbox-checked .ktsAntX-checkbox-inner::after {\n width: 5px;\n height: 10px;\n}\n";
13909
13909
  styleInject(css_248z$a);
13910
13910
 
13911
13911
  var keys$1 = {};
@@ -21654,7 +21654,12 @@ var DrawerBody$2 = function DrawerBody() {
21654
21654
  // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
21655
21655
  record.quantity = undefined;
21656
21656
  record.lineAmountExcludeTax = undefined;
21657
- record.lineAmountIncludeTax = undefined; // 中间数据
21657
+ record.lineAmountIncludeTax = undefined;
21658
+
21659
+ if (!record.taxRate) {
21660
+ record.taxRate = null;
21661
+ } // 中间数据
21662
+
21658
21663
 
21659
21664
  between = _objectSpread2({}, record);
21660
21665
  between.itemName = getItemName(record, s.goodsListState.editGood);
@@ -21697,22 +21702,22 @@ var DrawerBody$2 = function DrawerBody() {
21697
21702
  s.goodsListState.importGoods.isVisibleDrawer = false;
21698
21703
 
21699
21704
  if (!s.goodsListState.isTaxIncluded) {
21700
- _context2.next = 26;
21705
+ _context2.next = 27;
21701
21706
  break;
21702
21707
  }
21703
21708
 
21704
- _context2.next = 24;
21709
+ _context2.next = 25;
21705
21710
  return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
21706
21711
 
21707
- case 24:
21708
- _context2.next = 28;
21712
+ case 25:
21713
+ _context2.next = 29;
21709
21714
  break;
21710
21715
 
21711
- case 26:
21712
- _context2.next = 28;
21716
+ case 27:
21717
+ _context2.next = 29;
21713
21718
  return updateUnitPriceTax(controller, s.goodsListState.form, record);
21714
21719
 
21715
- case 28:
21720
+ case 29:
21716
21721
  case "end":
21717
21722
  return _context2.stop();
21718
21723
  }
package/dist/index.js CHANGED
@@ -13170,10 +13170,10 @@ var useColumns = (function (form) {
13170
13170
  initialValue: editGood.taxRate,
13171
13171
  rules: [].concat(_toConsumableArray(getReplenishRules('taxRate')), [{
13172
13172
  required: true,
13173
- message: ' '
13173
+ message: '请选择税率'
13174
13174
  }, {
13175
13175
  pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
13176
- message: ' '
13176
+ message: '请选择正确税率'
13177
13177
  }])
13178
13178
  })(React__default['default'].createElement(ktsComponentsAntdX3.Select, {
13179
13179
  className: "kts-invoice-operate-goods-list-table-tax-rate",
@@ -13915,7 +13915,7 @@ var useRowSelection = (function () {
13915
13915
  };
13916
13916
  });
13917
13917
 
13918
- var css_248z$a = ".kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-table-tax-rate .ktsAnt3x-select-selection-selected-value {\n float: right;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able {\n display: flex;\n padding: 10px;\n border-bottom: 1px solid #dcdcdc;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list {\n flex: 1;\n display: flex;\n gap: 10px;\n padding-right: 10px;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list button {\n padding-left: 10px;\n padding-right: 10px;\n border-radius: 12px;\n color: #0074ff;\n border: 1px solid #0074ff;\n height: 24px;\n line-height: 22px;\n cursor: pointer;\n font-size: 12px;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list button[disabled] {\n color: rgba(0, 0, 0, 0.25);\n border: 1px solid;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-extend {\n flex: none;\n display: flex;\n gap: 5px;\n}\n.kts-invoice-operate-goods-list .ktsAntX-table .ktsAntX-table-row.kts-invoice-operate-goods-be-discount .ktsAntX-table-cell,\n.kts-invoice-operate-goods-list .ktsAntX-table .ktsAntX-table-row.kts-invoice-operate-goods-discount .ktsAntX-table-cell {\n background: #f5f5f5;\n}\n.kts-invoice-operate-goods-list-table.kts-invoice-operate-prefab .ktsAnt3x-table-row {\n color: rgba(0, 0, 0, 0.25);\n background: #f5f5f5;\n}\n.kts-invoice-operate-goods-list-table-search-protrude {\n background: #ff0;\n color: #000;\n font-weight: bold;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-form-item {\n margin: 0;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-form-item-control {\n line-height: 1;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-input:focus {\n box-shadow: none;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-input,\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-select-selection--single {\n border: none;\n border-radius: 0;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-form-explain {\n display: none;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .has-error .ktsAnt3x-input {\n border: #f5222d solid 1px;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAntX-checkbox-wrapper .ktsAntX-checkbox-checked .ktsAntX-checkbox-inner::after {\n width: 5px;\n height: 10px;\n}\n";
13918
+ var css_248z$a = ".kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-table-tax-rate .ktsAnt3x-select-selection-selected-value {\n float: right;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able {\n display: flex;\n padding: 10px;\n border-bottom: 1px solid #dcdcdc;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list {\n flex: 1;\n display: flex;\n gap: 10px;\n padding-right: 10px;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list button {\n padding-left: 10px;\n padding-right: 10px;\n border-radius: 12px;\n color: #0074ff;\n border: 1px solid #0074ff;\n height: 24px;\n line-height: 22px;\n cursor: pointer;\n font-size: 12px;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-list button[disabled] {\n color: rgba(0, 0, 0, 0.25);\n border: 1px solid;\n}\n.kts-invoice-operate-goods-list .kts-invoice-operate-goods-list-able-extend {\n flex: none;\n display: flex;\n gap: 5px;\n}\n.kts-invoice-operate-goods-list .ktsAntX-table .ktsAntX-table-row.kts-invoice-operate-goods-be-discount .ktsAntX-table-cell,\n.kts-invoice-operate-goods-list .ktsAntX-table .ktsAntX-table-row.kts-invoice-operate-goods-discount .ktsAntX-table-cell {\n background: #f5f5f5;\n}\n.kts-invoice-operate-goods-list-table.kts-invoice-operate-prefab .ktsAnt3x-table-row {\n color: rgba(0, 0, 0, 0.25);\n background: #f5f5f5;\n}\n.kts-invoice-operate-goods-list-table-search-protrude {\n background: #ff0;\n color: #000;\n font-weight: bold;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-form-item {\n margin: 0;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-form-item-control {\n line-height: 1;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-input:focus {\n box-shadow: none;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-input,\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-select-selection--single {\n border: none;\n border-radius: 0;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAnt3x-form-explain {\n display: none;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .has-error .ktsAnt3x-input {\n border: #f5222d solid 1px;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .has-error .kts-invoice-operate-goods-list-table-tax-rate {\n border: #f5222d solid 1px;\n}\n.kts-invoice-operate-goods-table-virtual .ktsAntX-table .ktsAntX-table-tbody .ktsAntX-checkbox-wrapper .ktsAntX-checkbox-checked .ktsAntX-checkbox-inner::after {\n width: 5px;\n height: 10px;\n}\n";
13919
13919
  styleInject(css_248z$a);
13920
13920
 
13921
13921
  var keys$1 = {};
@@ -21664,7 +21664,12 @@ var DrawerBody$2 = function DrawerBody() {
21664
21664
  // 导入时清空之前输入的值，使用导入的单价和税率(参考税局系统)
21665
21665
  record.quantity = undefined;
21666
21666
  record.lineAmountExcludeTax = undefined;
21667
- record.lineAmountIncludeTax = undefined; // 中间数据
21667
+ record.lineAmountIncludeTax = undefined;
21668
+
21669
+ if (!record.taxRate) {
21670
+ record.taxRate = null;
21671
+ } // 中间数据
21672
+
21668
21673
 
21669
21674
  between = _objectSpread2({}, record);
21670
21675
  between.itemName = getItemName(record, s.goodsListState.editGood);
@@ -21707,22 +21712,22 @@ var DrawerBody$2 = function DrawerBody() {
21707
21712
  s.goodsListState.importGoods.isVisibleDrawer = false;
21708
21713
 
21709
21714
  if (!s.goodsListState.isTaxIncluded) {
21710
- _context2.next = 26;
21715
+ _context2.next = 27;
21711
21716
  break;
21712
21717
  }
21713
21718
 
21714
- _context2.next = 24;
21719
+ _context2.next = 25;
21715
21720
  return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
21716
21721
 
21717
- case 24:
21718
- _context2.next = 28;
21722
+ case 25:
21723
+ _context2.next = 29;
21719
21724
  break;
21720
21725
 
21721
- case 26:
21722
- _context2.next = 28;
21726
+ case 27:
21727
+ _context2.next = 29;
21723
21728
  return updateUnitPriceTax(controller, s.goodsListState.form, record);
21724
21729
 
21725
- case 28:
21730
+ case 29:
21726
21731
  case "end":
21727
21732
  return _context2.stop();
21728
21733
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kts-component-invoice-operate",
3
- "version": "3.2.67",
3
+ "version": "3.2.68",
4
4
  "scripts": {
5
5
  "dev": "dumi dev",
6
6
  "start": "dumi dev",
package/src/Invoice/ui/default/GoodsList/hook/useColumns/index.tsx CHANGED
@@ -486,8 +486,8 @@ export default (form: WrappedFormUtils) => {
486
486
  initialValue: editGood.taxRate,
487
487
  rules: [
488
488
  ...getReplenishRules('taxRate'),
489
- { required: true, message: ' ' },
490
- { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: ' ' },
489
+ { required: true, message: '请选择税率' },
490
+ { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '请选择正确税率' },
491
491
  ],
492
492
  })(
493
493
  <Select
package/src/Invoice/ui/default/GoodsList/index.less CHANGED
@@ -171,8 +171,12 @@
171
171
  border: #f5222d solid 1px;
172
172
  }
173
173
 
174
+ .has-error .kts-invoice-operate-goods-list-table-tax-rate {
175
+ border: #f5222d solid 1px;
176
+ }
177
+
174
178
  .ktsAntX-checkbox-wrapper .ktsAntX-checkbox-checked .ktsAntX-checkbox-inner::after {
175
179
  width : 5px;
176
180
  height: 10px;
177
181
  }
178
- }
182
+ }
package/src/Invoice/ui/default/ImportGoodsDrawer/index.tsx CHANGED
@@ -75,6 +75,9 @@ const DrawerBody = () => {
75
75
  record.quantity = undefined;
76
76
  record.lineAmountExcludeTax = undefined;
77
77
  record.lineAmountIncludeTax = undefined;
78
+ if(!record.taxRate){
79
+ record.taxRate = null;
80
+ }
78
81
 
79
82
  // 中间数据
80
83
  const between = { ...record };