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

package/dist/index.esm.js

@@ -916,9 +916,12 @@ var ImportGoods = /*#__PURE__*/_createClass(function ImportGoods() {
     dataIndex: 'unit',
     key: 'unit'
   }, {
-    title: '税率（%）',
+    title: '税率',
     dataIndex: 'taxRate',
-    key: 'taxRate'
+    key: 'taxRate',
+    render: function render(text) {
+      return text || text === 0 ? "".concat(text, "%") : '';
+    }
   }, {
     title: '单价(含税)',
     dataIndex: 'priceIncludeTax',
@@ -13757,7 +13760,7 @@ var useColumns = (function (form) {
     }, {
       title: /*#__PURE__*/React.createElement(TitleText, {
         required: true
-      }, "\u7A0E\u7387%"),
+      }, "\u7A0E\u7387"),
       dataIndex: 'taxRate',
       key: 'taxRate',
       align: 'right',
@@ -13797,7 +13800,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, value, "%");
+          }, isDutyFree(record) ? '免税' : "".concat(value, "%"));
         }
       }
     }, {
@@ -13821,7 +13824,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, parseFloat(value).toFixed(2));
+          }, isDutyFree(record) ? '***' : parseFloat(value).toFixed(2));
         }
       }
     }, {
@@ -14098,6 +14101,13 @@ function dcoding(v) {
     return e ? String.fromCharCode(parseInt(e.replace('E', ''))) : '';
   }).join('');
 }
+/** 是否免税 */
+
+
+function isDutyFree(record) {
+  console.log(record);
+  return record.taxFreeType === 1 && record.favouredPolicyName === '免税';
+}
 
 var useOnRow = (function () {
   /** 控制器 */
@@ -15603,52 +15613,68 @@ function useSalesGifts() {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
+            _context.next = 2;
+            return controller.saveEditGood();
+
+          case 2:
+            _context.next = 4;
+            return controller.wait();
+
+          case 4:
+            if (!controller.state.goodsListState.editGood) {
+              _context.next = 6;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 6:
             _iterator = _createForOfIteratorHelper(giveaways);
-            _context.prev = 1;
+            _context.prev = 7;
 
             _iterator.s();
 
-          case 3:
+          case 9:
             if ((_step = _iterator.n()).done) {
-              _context.next = 10;
+              _context.next = 16;
               break;
             }
 
             g = _step.value;
             g.lineAttribute = LineAttributeType$1.正常;
-            _context.next = 8;
+            _context.next = 14;
             return controller.addGoodDiscountV2([{
               $index: g.$index,
               discolineAmountunt: g.lineAmountIncludeTax || 0
             }]);
 
-          case 8:
-            _context.next = 3;
+          case 14:
+            _context.next = 9;
             break;
 
-          case 10:
-            _context.next = 15;
+          case 16:
+            _context.next = 21;
             break;
 
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](1);
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](7);
 
             _iterator.e(_context.t0);
 
-          case 15:
-            _context.prev = 15;
+          case 21:
+            _context.prev = 21;
 
             _iterator.f();
 
-            return _context.finish(15);
+            return _context.finish(21);
 
-          case 18:
+          case 24:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 12, 15, 18]]);
+    }, _callee, null, [[7, 18, 21, 24]]);
   })), [controller, giveaways]);
   var onClickManual = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var _controller$state$goo, goodsMap, _selectedGoodIndex, _giveaways, _iterator2, _step2, g;
@@ -15658,70 +15684,86 @@ function useSalesGifts() {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
+            _context2.next = 3;
+            return controller.saveEditGood();
+
+          case 3:
+            _context2.next = 5;
+            return controller.wait();
+
+          case 5:
+            if (!controller.state.goodsListState.editGood) {
+              _context2.next = 7;
+              break;
+            }
+
+            return _context2.abrupt("return");
+
+          case 7:
             _controller$state$goo = controller.state.goodsListState, goodsMap = _controller$state$goo.goodsMap, _selectedGoodIndex = _controller$state$goo.selectedGoodIndex;
             _giveaways = _selectedGoodIndex.map(function (e) {
               return goodsMap.get(e);
             }).filter(function (e) {
               return !!e;
             });
-            _context2.next = 5;
+            _context2.next = 11;
             return checkLineAttribute(_giveaways);
 
-          case 5:
+          case 11:
             _iterator2 = _createForOfIteratorHelper(_giveaways);
-            _context2.prev = 6;
+            _context2.prev = 12;
 
             _iterator2.s();
 
-          case 8:
+          case 14:
             if ((_step2 = _iterator2.n()).done) {
-              _context2.next = 14;
+              _context2.next = 20;
               break;
             }
 
             g = _step2.value;
-            _context2.next = 12;
+            _context2.next = 18;
             return controller.addGoodDiscountV2([{
               $index: g.$index,
               discolineAmountunt: g.lineAmountIncludeTax || 0
             }]);
 
-          case 12:
-            _context2.next = 8;
+          case 18:
+            _context2.next = 14;
             break;
 
-          case 14:
-            _context2.next = 19;
+          case 20:
+            _context2.next = 25;
             break;
 
-          case 16:
-            _context2.prev = 16;
-            _context2.t0 = _context2["catch"](6);
+          case 22:
+            _context2.prev = 22;
+            _context2.t0 = _context2["catch"](12);
 
             _iterator2.e(_context2.t0);
 
-          case 19:
-            _context2.prev = 19;
+          case 25:
+            _context2.prev = 25;
 
             _iterator2.f();
 
-            return _context2.finish(19);
+            return _context2.finish(25);
 
-          case 22:
+          case 28:
             controller.state.goodsListState.selectedGoodIndex = [];
-            _context2.next = 27;
+            _context2.next = 33;
             break;
 
-          case 25:
-            _context2.prev = 25;
+          case 31:
+            _context2.prev = 31;
             _context2.t1 = _context2["catch"](0);
 
-          case 27:
+          case 33:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[0, 25], [6, 16, 19, 22]]);
+    }, _callee2, null, [[0, 31], [12, 22, 25, 28]]);
   })), [controller]);
   var items = React.useMemo(function () {
     return [{
@@ -20603,7 +20645,7 @@ var useColumns$1 = (function (form) {
     }, {
       title: /*#__PURE__*/React.createElement(TitleText$1, {
         required: true
-      }, "\u7A0E\u7387%"),
+      }, "\u7A0E\u7387"),
       dataIndex: 'taxRate',
       key: 'taxRate',
       align: 'right',
@@ -20641,7 +20683,7 @@ var useColumns$1 = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, value, "%");
+          }, isDutyFree$1(record) ? '免税' : "".concat(value, "%"));
         }
       }
     }, {
@@ -20665,7 +20707,7 @@ var useColumns$1 = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, parseFloat(value).toFixed(2));
+          }, isDutyFree$1(record) ? '***' : parseFloat(value).toFixed(2));
         }
       }
     } // {
@@ -20869,6 +20911,13 @@ function dcoding$1(v) {
     return e ? String.fromCharCode(parseInt(e.replace('E', ''))) : '';
   }).join('');
 }
+/** 是否免税 */
+
+
+function isDutyFree$1(record) {
+  console.log(record);
+  return record.taxFreeType === 1 && record.favouredPolicyName === '免税';
+}
 
 var MyItemNameStyle = {
   padding: '0px 10px',

package/dist/index.js

@@ -926,9 +926,12 @@ var ImportGoods = /*#__PURE__*/_createClass(function ImportGoods() {
     dataIndex: 'unit',
     key: 'unit'
   }, {
-    title: '税率（%）',
+    title: '税率',
     dataIndex: 'taxRate',
-    key: 'taxRate'
+    key: 'taxRate',
+    render: function render(text) {
+      return text || text === 0 ? "".concat(text, "%") : '';
+    }
   }, {
     title: '单价(含税)',
     dataIndex: 'priceIncludeTax',
@@ -13767,7 +13770,7 @@ var useColumns = (function (form) {
     }, {
       title: /*#__PURE__*/React__default['default'].createElement(TitleText, {
         required: true
-      }, "\u7A0E\u7387%"),
+      }, "\u7A0E\u7387"),
       dataIndex: 'taxRate',
       key: 'taxRate',
       align: 'right',
@@ -13807,7 +13810,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, value, "%");
+          }, isDutyFree(record) ? '免税' : "".concat(value, "%"));
         }
       }
     }, {
@@ -13831,7 +13834,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, parseFloat(value).toFixed(2));
+          }, isDutyFree(record) ? '***' : parseFloat(value).toFixed(2));
         }
       }
     }, {
@@ -14108,6 +14111,13 @@ function dcoding(v) {
     return e ? String.fromCharCode(parseInt(e.replace('E', ''))) : '';
   }).join('');
 }
+/** 是否免税 */
+
+
+function isDutyFree(record) {
+  console.log(record);
+  return record.taxFreeType === 1 && record.favouredPolicyName === '免税';
+}
 
 var useOnRow = (function () {
   /** 控制器 */
@@ -15613,52 +15623,68 @@ function useSalesGifts() {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
+            _context.next = 2;
+            return controller.saveEditGood();
+
+          case 2:
+            _context.next = 4;
+            return controller.wait();
+
+          case 4:
+            if (!controller.state.goodsListState.editGood) {
+              _context.next = 6;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 6:
             _iterator = _createForOfIteratorHelper(giveaways);
-            _context.prev = 1;
+            _context.prev = 7;
 
             _iterator.s();
 
-          case 3:
+          case 9:
             if ((_step = _iterator.n()).done) {
-              _context.next = 10;
+              _context.next = 16;
               break;
             }
 
             g = _step.value;
             g.lineAttribute = LineAttributeType$1.正常;
-            _context.next = 8;
+            _context.next = 14;
             return controller.addGoodDiscountV2([{
               $index: g.$index,
               discolineAmountunt: g.lineAmountIncludeTax || 0
             }]);
 
-          case 8:
-            _context.next = 3;
+          case 14:
+            _context.next = 9;
             break;
 
-          case 10:
-            _context.next = 15;
+          case 16:
+            _context.next = 21;
             break;
 
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](1);
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](7);
 
             _iterator.e(_context.t0);
 
-          case 15:
-            _context.prev = 15;
+          case 21:
+            _context.prev = 21;
 
             _iterator.f();
 
-            return _context.finish(15);
+            return _context.finish(21);
 
-          case 18:
+          case 24:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 12, 15, 18]]);
+    }, _callee, null, [[7, 18, 21, 24]]);
   })), [controller, giveaways]);
   var onClickManual = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var _controller$state$goo, goodsMap, _selectedGoodIndex, _giveaways, _iterator2, _step2, g;
@@ -15668,70 +15694,86 @@ function useSalesGifts() {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
+            _context2.next = 3;
+            return controller.saveEditGood();
+
+          case 3:
+            _context2.next = 5;
+            return controller.wait();
+
+          case 5:
+            if (!controller.state.goodsListState.editGood) {
+              _context2.next = 7;
+              break;
+            }
+
+            return _context2.abrupt("return");
+
+          case 7:
             _controller$state$goo = controller.state.goodsListState, goodsMap = _controller$state$goo.goodsMap, _selectedGoodIndex = _controller$state$goo.selectedGoodIndex;
             _giveaways = _selectedGoodIndex.map(function (e) {
               return goodsMap.get(e);
             }).filter(function (e) {
               return !!e;
             });
-            _context2.next = 5;
+            _context2.next = 11;
             return checkLineAttribute(_giveaways);
 
-          case 5:
+          case 11:
             _iterator2 = _createForOfIteratorHelper(_giveaways);
-            _context2.prev = 6;
+            _context2.prev = 12;
 
             _iterator2.s();
 
-          case 8:
+          case 14:
             if ((_step2 = _iterator2.n()).done) {
-              _context2.next = 14;
+              _context2.next = 20;
               break;
             }
 
             g = _step2.value;
-            _context2.next = 12;
+            _context2.next = 18;
             return controller.addGoodDiscountV2([{
               $index: g.$index,
               discolineAmountunt: g.lineAmountIncludeTax || 0
             }]);
 
-          case 12:
-            _context2.next = 8;
+          case 18:
+            _context2.next = 14;
             break;
 
-          case 14:
-            _context2.next = 19;
+          case 20:
+            _context2.next = 25;
             break;
 
-          case 16:
-            _context2.prev = 16;
-            _context2.t0 = _context2["catch"](6);
+          case 22:
+            _context2.prev = 22;
+            _context2.t0 = _context2["catch"](12);
 
             _iterator2.e(_context2.t0);
 
-          case 19:
-            _context2.prev = 19;
+          case 25:
+            _context2.prev = 25;
 
             _iterator2.f();
 
-            return _context2.finish(19);
+            return _context2.finish(25);
 
-          case 22:
+          case 28:
             controller.state.goodsListState.selectedGoodIndex = [];
-            _context2.next = 27;
+            _context2.next = 33;
             break;
 
-          case 25:
-            _context2.prev = 25;
+          case 31:
+            _context2.prev = 31;
             _context2.t1 = _context2["catch"](0);
 
-          case 27:
+          case 33:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[0, 25], [6, 16, 19, 22]]);
+    }, _callee2, null, [[0, 31], [12, 22, 25, 28]]);
   })), [controller]);
   var items = React__default['default'].useMemo(function () {
     return [{
@@ -20613,7 +20655,7 @@ var useColumns$1 = (function (form) {
     }, {
       title: /*#__PURE__*/React__default['default'].createElement(TitleText$1, {
         required: true
-      }, "\u7A0E\u7387%"),
+      }, "\u7A0E\u7387"),
       dataIndex: 'taxRate',
       key: 'taxRate',
       align: 'right',
@@ -20651,7 +20693,7 @@ var useColumns$1 = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, value, "%");
+          }, isDutyFree$1(record) ? '免税' : "".concat(value, "%"));
         }
       }
     }, {
@@ -20675,7 +20717,7 @@ var useColumns$1 = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, parseFloat(value).toFixed(2));
+          }, isDutyFree$1(record) ? '***' : parseFloat(value).toFixed(2));
         }
       }
     } // {
@@ -20879,6 +20921,13 @@ function dcoding$1(v) {
     return e ? String.fromCharCode(parseInt(e.replace('E', ''))) : '';
   }).join('');
 }
+/** 是否免税 */
+
+
+function isDutyFree$1(record) {
+  console.log(record);
+  return record.taxFreeType === 1 && record.favouredPolicyName === '免税';
+}
 
 var MyItemNameStyle = {
   padding: '0px 10px',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.129",
+  "version": "3.2.130-2",
   "scripts": {
     "dev": "dumi dev",
     "start": "dumi dev",

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/ImportGoods/index.ts

@@ -37,9 +37,10 @@ export default class ImportGoods<ColumnType = any> {
       key: 'unit',
     },
     {
-      title: '税率（%）',
+      title: '税率',
       dataIndex: 'taxRate',
       key: 'taxRate',
+      render: text => text || text === 0 ? `${text}%` : ''
     },
     {
       title: '单价(含税)',

package/src/Invoice/ui/default/GoodsList/hook/useColumns/index.tsx

@@ -475,7 +475,7 @@ export default (form: WrappedFormUtils) => {
         },
       },
       {
-        title: <TitleText required >税率%</TitleText>,
+        title: <TitleText required >税率</TitleText>,
         dataIndex: 'taxRate',
         key: 'taxRate',
         align: 'right',
@@ -514,7 +514,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{value}%</span>;
+            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '免税' : `${value}%`}</span>;
           }
         },
       },
@@ -531,7 +531,7 @@ export default (form: WrappedFormUtils) => {
               rules: getReplenishRules('taxAmount'),
             })(<MyDiv loading={isCipher(changeField, 'taxAmount')} />);
           } else {
-            return <span style={{ padding: '0 10px' }}>{parseFloat(value).toFixed(2)}</span>;
+            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : parseFloat(value).toFixed(2)}</span>;
           }
         },
       },
@@ -686,3 +686,9 @@ function ucoding(v: string): string {
 function dcoding(v: string): string {
   return v.split('U').map(e => e ? String.fromCharCode(parseInt(e.replace('E', ''))) : '').join('');
 }
+
+/** 是否免税 */
+function isDutyFree(record: IGood): boolean {
+  console.log(record);
+  return (record.taxFreeType as any) === 1 && record.favouredPolicyName === '免税';
+}

package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useSalesGifts/index.tsx

@@ -19,6 +19,9 @@ export default function useSalesGifts() {
     const giveaways = React.useMemo(() => goodsList.filter(e => e.lineAttribute === LineAttributeType.赠品行), [goodsList])
 
     const onClickAuto = React.useCallback(async () => {
+        await controller.saveEditGood();
+        await controller.wait();
+        if (controller.state.goodsListState.editGood) return;
         for (let g of giveaways) {
             g.lineAttribute = LineAttributeType.正常;
             await controller.addGoodDiscountV2([{ $index: g.$index, discolineAmountunt: g.lineAmountIncludeTax || 0 }]);
@@ -27,6 +30,9 @@ export default function useSalesGifts() {
 
     const onClickManual = React.useCallback(async () => {
         try {
+            await controller.saveEditGood();
+            await controller.wait();
+            if (controller.state.goodsListState.editGood) return;
             const { goodsMap, selectedGoodIndex } = controller.state.goodsListState;
             const giveaways = selectedGoodIndex.map(e => goodsMap.get(e) as IGood).filter(e => !!e);
 

package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/index.tsx

@@ -445,7 +445,7 @@ export default (form: WrappedFormUtils) => {
         },
       },
       {
-        title: <TitleText required >税率%</TitleText>,
+        title: <TitleText required >税率</TitleText>,
         dataIndex: 'taxRate',
         key: 'taxRate',
         align: 'right',
@@ -484,7 +484,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{value}%</span>;
+            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '免税' : `${value}%`}</span>;
           }
         },
       },
@@ -501,7 +501,7 @@ export default (form: WrappedFormUtils) => {
               rules: getReplenishRules('taxAmount'),
             })(<MyDiv loading={isCipher(changeField, 'taxAmount')} />);
           } else {
-            return <span style={{ padding: '0 10px' }}>{parseFloat(value).toFixed(2)}</span>;
+            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : parseFloat(value).toFixed(2)}</span>;
           }
         },
       },
@@ -639,6 +639,12 @@ function dcoding(v: string): string {
   return v.split('U').map(e => e ? String.fromCharCode(parseInt(e.replace('E', ''))) : '').join('');
 }
 
+/** 是否免税 */
+function isDutyFree(record: IGood): boolean {
+  console.log(record);
+  return (record.taxFreeType as any) === 1 && record.favouredPolicyName === '免税';
+}
+
 const MyItemNameStyle: any = {
   padding: '0px 10px',
   whiteSpace: 'nowrap',