kts-component-invoice-operate 3.2.67 → 3.2.69

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.
@@ -2,6 +2,7 @@ declare enum LineAttributeType {
2
2
  正常 = 0,
3
3
  折扣行 = 1,
4
4
  被折扣行 = 2,
5
- 折让行 = 3
5
+ 折让行 = 3,
6
+ 赠品行 = 4
6
7
  }
7
8
  export default LineAttributeType;
package/dist/index.esm.js CHANGED
@@ -917,6 +917,7 @@ var LineAttributeType;
917
917
  LineAttributeType[LineAttributeType["\u6298\u6263\u884C"] = 1] = "\u6298\u6263\u884C";
918
918
  LineAttributeType[LineAttributeType["\u88AB\u6298\u6263\u884C"] = 2] = "\u88AB\u6298\u6263\u884C";
919
919
  LineAttributeType[LineAttributeType["\u6298\u8BA9\u884C"] = 3] = "\u6298\u8BA9\u884C";
920
+ LineAttributeType[LineAttributeType["\u8D60\u54C1\u884C"] = 4] = "\u8D60\u54C1\u884C";
920
921
  })(LineAttributeType || (LineAttributeType = {}));
921
922
 
922
923
  var LineAttributeType$1 = LineAttributeType;
@@ -13160,10 +13161,10 @@ var useColumns = (function (form) {
13160
13161
  initialValue: editGood.taxRate,
13161
13162
  rules: [].concat(_toConsumableArray(getReplenishRules('taxRate')), [{
13162
13163
  required: true,
13163
- message: ' '
13164
+ message: '请选择税率'
13164
13165
  }, {
13165
13166
  pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
13166
- message: ' '
13167
+ message: '请选择正确税率'
13167
13168
  }])
13168
13169
  })(React.createElement(Select, {
13169
13170
  className: "kts-invoice-operate-goods-list-table-tax-rate",
@@ -13905,7 +13906,7 @@ var useRowSelection = (function () {
13905
13906
  };
13906
13907
  });
13907
13908
 
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";
13909
+ 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 .ktsAntX-checkbox-wrapper .ktsAntX-checkbox-checked .ktsAntX-checkbox-inner::after {\n width: 5px;\n height: 10px;\n}\n.kts-invoice-operate-goods-list-table .ktsAnt3x-form-item-control.has-error {\n border: 1px solid #f00;\n}\n";
13909
13910
  styleInject(css_248z$a);
13910
13911
 
13911
13912
  var keys$1 = {};
@@ -21654,7 +21655,12 @@ var DrawerBody$2 = function DrawerBody() {
21654
21655
  // 导入时清空之前输入的值,使用导入的单价和税率(参考税局系统)
21655
21656
  record.quantity = undefined;
21656
21657
  record.lineAmountExcludeTax = undefined;
21657
- record.lineAmountIncludeTax = undefined; // 中间数据
21658
+ record.lineAmountIncludeTax = undefined;
21659
+
21660
+ if (!record.taxRate) {
21661
+ record.taxRate = null;
21662
+ } // 中间数据
21663
+
21658
21664
 
21659
21665
  between = _objectSpread2({}, record);
21660
21666
  between.itemName = getItemName(record, s.goodsListState.editGood);
@@ -21697,22 +21703,22 @@ var DrawerBody$2 = function DrawerBody() {
21697
21703
  s.goodsListState.importGoods.isVisibleDrawer = false;
21698
21704
 
21699
21705
  if (!s.goodsListState.isTaxIncluded) {
21700
- _context2.next = 26;
21706
+ _context2.next = 27;
21701
21707
  break;
21702
21708
  }
21703
21709
 
21704
- _context2.next = 24;
21710
+ _context2.next = 25;
21705
21711
  return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
21706
21712
 
21707
- case 24:
21708
- _context2.next = 28;
21713
+ case 25:
21714
+ _context2.next = 29;
21709
21715
  break;
21710
21716
 
21711
- case 26:
21712
- _context2.next = 28;
21717
+ case 27:
21718
+ _context2.next = 29;
21713
21719
  return updateUnitPriceTax(controller, s.goodsListState.form, record);
21714
21720
 
21715
- case 28:
21721
+ case 29:
21716
21722
  case "end":
21717
21723
  return _context2.stop();
21718
21724
  }
package/dist/index.js CHANGED
@@ -927,6 +927,7 @@ var LineAttributeType;
927
927
  LineAttributeType[LineAttributeType["\u6298\u6263\u884C"] = 1] = "\u6298\u6263\u884C";
928
928
  LineAttributeType[LineAttributeType["\u88AB\u6298\u6263\u884C"] = 2] = "\u88AB\u6298\u6263\u884C";
929
929
  LineAttributeType[LineAttributeType["\u6298\u8BA9\u884C"] = 3] = "\u6298\u8BA9\u884C";
930
+ LineAttributeType[LineAttributeType["\u8D60\u54C1\u884C"] = 4] = "\u8D60\u54C1\u884C";
930
931
  })(LineAttributeType || (LineAttributeType = {}));
931
932
 
932
933
  var LineAttributeType$1 = LineAttributeType;
@@ -13170,10 +13171,10 @@ var useColumns = (function (form) {
13170
13171
  initialValue: editGood.taxRate,
13171
13172
  rules: [].concat(_toConsumableArray(getReplenishRules('taxRate')), [{
13172
13173
  required: true,
13173
- message: ' '
13174
+ message: '请选择税率'
13174
13175
  }, {
13175
13176
  pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
13176
- message: ' '
13177
+ message: '请选择正确税率'
13177
13178
  }])
13178
13179
  })(React__default['default'].createElement(ktsComponentsAntdX3.Select, {
13179
13180
  className: "kts-invoice-operate-goods-list-table-tax-rate",
@@ -13915,7 +13916,7 @@ var useRowSelection = (function () {
13915
13916
  };
13916
13917
  });
13917
13918
 
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";
13919
+ 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 .ktsAntX-checkbox-wrapper .ktsAntX-checkbox-checked .ktsAntX-checkbox-inner::after {\n width: 5px;\n height: 10px;\n}\n.kts-invoice-operate-goods-list-table .ktsAnt3x-form-item-control.has-error {\n border: 1px solid #f00;\n}\n";
13919
13920
  styleInject(css_248z$a);
13920
13921
 
13921
13922
  var keys$1 = {};
@@ -21664,7 +21665,12 @@ var DrawerBody$2 = function DrawerBody() {
21664
21665
  // 导入时清空之前输入的值,使用导入的单价和税率(参考税局系统)
21665
21666
  record.quantity = undefined;
21666
21667
  record.lineAmountExcludeTax = undefined;
21667
- record.lineAmountIncludeTax = undefined; // 中间数据
21668
+ record.lineAmountIncludeTax = undefined;
21669
+
21670
+ if (!record.taxRate) {
21671
+ record.taxRate = null;
21672
+ } // 中间数据
21673
+
21668
21674
 
21669
21675
  between = _objectSpread2({}, record);
21670
21676
  between.itemName = getItemName(record, s.goodsListState.editGood);
@@ -21707,22 +21713,22 @@ var DrawerBody$2 = function DrawerBody() {
21707
21713
  s.goodsListState.importGoods.isVisibleDrawer = false;
21708
21714
 
21709
21715
  if (!s.goodsListState.isTaxIncluded) {
21710
- _context2.next = 26;
21716
+ _context2.next = 27;
21711
21717
  break;
21712
21718
  }
21713
21719
 
21714
- _context2.next = 24;
21720
+ _context2.next = 25;
21715
21721
  return updateUnitPriceExcludingTax(controller, s.goodsListState.form, record);
21716
21722
 
21717
- case 24:
21718
- _context2.next = 28;
21723
+ case 25:
21724
+ _context2.next = 29;
21719
21725
  break;
21720
21726
 
21721
- case 26:
21722
- _context2.next = 28;
21727
+ case 27:
21728
+ _context2.next = 29;
21723
21729
  return updateUnitPriceTax(controller, s.goodsListState.form, record);
21724
21730
 
21725
- case 28:
21731
+ case 29:
21726
21732
  case "end":
21727
21733
  return _context2.stop();
21728
21734
  }
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.69",
4
4
  "scripts": {
5
5
  "dev": "dumi dev",
6
6
  "start": "dumi dev",
@@ -3,5 +3,6 @@ enum LineAttributeType {
3
3
  折扣行 = 1,
4
4
  被折扣行 = 2,
5
5
  折让行 = 3,
6
+ 赠品行 = 4,
6
7
  }
7
8
  export default LineAttributeType;
@@ -73,5 +73,5 @@ export default class InvoiceController extends InvoiceControllerForm {
73
73
  getTaxCategoryCodeList?: () => Promise<any>;
74
74
 
75
75
  /** 获取筛选后的列表 */
76
- getGoodsSearch = getGoodsSearch
76
+ getGoodsSearch = getGoodsSearch;
77
77
  }
@@ -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
@@ -167,12 +167,13 @@
167
167
  display: none;
168
168
  }
169
169
 
170
- .has-error .ktsAnt3x-input {
171
- border: #f5222d solid 1px;
172
- }
173
-
174
170
  .ktsAntX-checkbox-wrapper .ktsAntX-checkbox-checked .ktsAntX-checkbox-inner::after {
175
171
  width : 5px;
176
172
  height: 10px;
177
173
  }
178
- }
174
+ }
175
+ .kts-invoice-operate-goods-list-table {
176
+ .ktsAnt3x-form-item-control.has-error {
177
+ border: 1px solid #f00;
178
+ }
179
+ }
@@ -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 };