kts-component-invoice-operate 3.2.154 → 3.2.155

package/dist/index.esm.js

@@ -1094,6 +1094,7 @@ var GoodsListState = /*#__PURE__*/_createClass(function GoodsListState() {
   this.goodMax = void 0;
   this.isSwitchTax = void 0;
   this.isRecalculateWhenSwitchTax = false;
+  this.isUpdateGoodsTaxRateList = false;
   this.isAddDiscount = void 0;
   this.isAddRow = true;
   this.isRemRow = true;
@@ -9739,6 +9740,7 @@ var InvoiceController = /*#__PURE__*/function (_InvoiceControllerFor) {
     _this.getGoodsList = void 0;
     _this.getTaxCategoryCodeList = void 0;
     _this.getGoodsSearch = getGoodsSearch;
+    _this.getGoodsTaxRateList = void 0;
     return _this;
   } // ----------------- 发票头 模块相关 -----------------
 
@@ -10164,8 +10166,8 @@ function TableVirtual (props) {
     var cont = self.querySelector('.kts-invoice-operate-goods-table-virtual .ktsAntX-table-body');
     if (!cont) return;
     cont.scrollTop = 0;
-  }, [(_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.length]);
-  console.log('===> pointer', pointer, dataSource);
+  }, [(_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.length]); // console.log('===> pointer', pointer, dataSource);
+
   return /*#__PURE__*/React.createElement("span", {
     className: "kts-invoice-operate-goods-table-virtual",
     ref: function ref(e) {
@@ -14007,7 +14009,7 @@ var useColumns = (function (form) {
               setChangeField('taxRate');
               onChangeTaxRate(controller, form, record);
             }
-          }, taxRateList.map(function (e, i) {
+          }, (record.goodsTaxRateList || taxRateList).map(function (e, i) {
             return /*#__PURE__*/React.createElement(Select.Option, {
               key: i,
               value: e
@@ -14371,7 +14373,7 @@ var useOnRow = (function () {
 
             case 7:
               if (!editGood) {
-                _context2.next = 18;
+                _context2.next = 22;
                 break;
               }
 
@@ -14391,7 +14393,19 @@ var useOnRow = (function () {
               return controller.wait();
 
             case 14:
-              _context2.next = 16;
+              if (!(controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList)) {
+                _context2.next = 18;
+                break;
+              }
+
+              _context2.next = 17;
+              return controller.getGoodsTaxRateList(record.taxClassificationCode);
+
+            case 17:
+              record.goodsTaxRateList = _context2.sent;
+
+            case 18:
+              _context2.next = 20;
               return controller.pipeline( /*#__PURE__*/function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -14421,15 +14435,27 @@ var useOnRow = (function () {
                 };
               }())();
 
-            case 16:
-              _context2.next = 20;
+            case 20:
+              _context2.next = 28;
               break;
 
-            case 18:
-              _context2.next = 20;
+            case 22:
+              if (!(controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList)) {
+                _context2.next = 26;
+                break;
+              }
+
+              _context2.next = 25;
+              return controller.getGoodsTaxRateList(record.taxClassificationCode);
+
+            case 25:
+              record.goodsTaxRateList = _context2.sent;
+
+            case 26:
+              _context2.next = 28;
               return controller.setEditGood(record);
 
-            case 20:
+            case 28:
             case "end":
               return _context2.stop();
           }
@@ -14809,7 +14835,7 @@ var useRowSelection = (function () {
     onSelect: onSelect,
     selectedRowKeys: selectedRowKeys,
     getCheckboxProps: function getCheckboxProps(record) {
-      console.log('===> getCheckboxProps', record, record.level);
+      // console.log('===> getCheckboxProps', record, record.level)
       return {
         disabled: record.level > 0,
         style: record.level > 0 ? {
@@ -20225,6 +20251,11 @@ var useColumns$1 = (function (form) {
   var model = controller.useMemo(function (e) {
     return e.model;
   }, []);
+  /** 计算类型 */
+
+  var calculateType = controller.useMemo(function (e) {
+    return e.goodsListState.calculateType;
+  }, []);
   /** 是否显示我方 */
 
   var isMyShow = controller.useMemo(function (e) {
@@ -20351,7 +20382,7 @@ var useColumns$1 = (function (form) {
       }, "\u9879\u76EE\u540D\u79F0"),
       key: 'itemName',
       render: function render(_, record) {
-        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('itemName')) {
+        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('itemName') && model !== 'prefab') {
           return /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement("div", {
             style: {
               display: 'flex'
@@ -20461,7 +20492,7 @@ var useColumns$1 = (function (form) {
       key: 'itemModelName',
       width: 119,
       render: function render(_, record) {
-        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('itemModelName')) {
+        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('itemModelName') && model !== 'prefab') {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('itemModelName', {
             initialValue: isMyShow ? editGood.itemModelNameSelf : editGood.itemModelName,
             rules: getReplenishRules('itemModelName')
@@ -20512,7 +20543,7 @@ var useColumns$1 = (function (form) {
       key: 'unit',
       width: 70,
       render: function render(_, record) {
-        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('unit')) {
+        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('unit') && model !== 'prefab') {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('unit', {
             initialValue: editGood.unit,
             rules: getReplenishRules('unit')
@@ -20570,7 +20601,7 @@ var useColumns$1 = (function (form) {
       align: 'right',
       width: 149,
       render: function render(value, record) {
-        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('quantity')) {
+        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('quantity') && model !== 'prefab') {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('quantity', {
             initialValue: nonScientificNotation(editGood.quantity),
             getValueFromEvent: onNumberValueChange,
@@ -20665,7 +20696,7 @@ var useColumns$1 = (function (form) {
       align: 'right',
       width: 149,
       render: function render(value, record) {
-        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('priceIncludeTax')) {
+        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('priceIncludeTax') && model !== 'prefab') {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('priceIncludeTax', {
             initialValue: nonScientificNotation(editGood.priceIncludeTax),
             getValueFromEvent: onNumberValueChange,
@@ -20740,7 +20771,7 @@ var useColumns$1 = (function (form) {
       align: 'right',
       width: 149,
       render: function render(value, record) {
-        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('priceExcludeTax')) {
+        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('priceExcludeTax') && model !== 'prefab') {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('priceExcludeTax', {
             initialValue: nonScientificNotation(editGood.priceExcludeTax),
             getValueFromEvent: onNumberValueChange,
@@ -20815,7 +20846,7 @@ var useColumns$1 = (function (form) {
       width: 119,
       align: 'right',
       render: function render(value, record) {
-        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('lineAmountIncludeTax')) {
+        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('lineAmountIncludeTax') && model !== 'prefab') {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('lineAmountIncludeTax', {
             initialValue: editGood.lineAmountIncludeTax,
             getValueFromEvent: onNumberValueChange,
@@ -20903,7 +20934,7 @@ var useColumns$1 = (function (form) {
       align: 'right',
       width: 119,
       render: function render(value, record) {
-        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('lineAmountExcludeTax')) {
+        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('lineAmountExcludeTax') && model !== 'prefab') {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('lineAmountExcludeTax', {
             initialValue: editGood.lineAmountExcludeTax,
             getValueFromEvent: onNumberValueChange,
@@ -20966,7 +20997,7 @@ var useColumns$1 = (function (form) {
       align: 'right',
       width: 70,
       render: function render(value, record) {
-        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('taxRate')) {
+        if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index && !disableds.includes('taxRate') && !(model === 'prefab' && calculateType === '3')) {
           return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('taxRate', {
             initialValue: editGood.taxRate,
             rules: [].concat(_toConsumableArray(getReplenishRules('taxRate')), [{
@@ -20990,7 +21021,7 @@ var useColumns$1 = (function (form) {
               setChangeField('taxRate');
               onChangeTaxRate$1(controller, form, record);
             }
-          }, taxRateList.map(function (e, i) {
+          }, (record.goodsTaxRateList || taxRateList).map(function (e, i) {
             return /*#__PURE__*/React.createElement(Select$1.Option, {
               key: i,
               value: e
@@ -21058,7 +21089,7 @@ var useColumns$1 = (function (form) {
         ellipsis: true
       });
     });
-  }, [isTaxIncluded, editGood, controller, taxRateList, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, isStart]); // React.useEffect(() => {
+  }, [isTaxIncluded, editGood, controller, taxRateList, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, isStart, calculateType]); // React.useEffect(() => {
   //   clearTimeout(t)
   //   const t = setTimeout(() => { setChangeField('') }, 1000);
   //   return () => { clearTimeout(t) }
@@ -21258,7 +21289,7 @@ var useOnRow$1 = (function () {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(model === 'prefab')) {
+              if (!(model === 'readOnly')) {
                 _context2.next = 2;
                 break;
               }
@@ -21266,46 +21297,50 @@ var useOnRow$1 = (function () {
               return _context2.abrupt("return");
 
             case 2:
-              if (!(model === 'readOnly')) {
-                _context2.next = 4;
-                break;
-              }
-
-              return _context2.abrupt("return");
-
-            case 4:
               editGood = controller.state.goodsListState.editGood;
 
               if (!(record.lineAttribute !== LineAttributeType$1.正常)) {
-                _context2.next = 7;
+                _context2.next = 5;
                 break;
               }
 
               return _context2.abrupt("return");
 
-            case 7:
+            case 5:
               if (!editGood) {
-                _context2.next = 18;
+                _context2.next = 20;
                 break;
               }
 
               if (!(editGood.$index === record.$index)) {
-                _context2.next = 10;
+                _context2.next = 8;
                 break;
               }
 
               return _context2.abrupt("return");
 
+            case 8:
+              _context2.next = 10;
+              return controller.saveEditGood();
+
             case 10:
               _context2.next = 12;
-              return controller.saveEditGood();
+              return controller.wait();
 
             case 12:
-              _context2.next = 14;
-              return controller.wait();
+              if (!(controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList)) {
+                _context2.next = 16;
+                break;
+              }
 
-            case 14:
-              _context2.next = 16;
+              _context2.next = 15;
+              return controller.getGoodsTaxRateList(record.taxClassificationCode);
+
+            case 15:
+              record.goodsTaxRateList = _context2.sent;
+
+            case 16:
+              _context2.next = 18;
               return controller.pipeline( /*#__PURE__*/function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(s) {
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -21335,15 +21370,27 @@ var useOnRow$1 = (function () {
                 };
               }())();
 
-            case 16:
-              _context2.next = 20;
+            case 18:
+              _context2.next = 26;
               break;
 
-            case 18:
-              _context2.next = 20;
+            case 20:
+              if (!(controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList)) {
+                _context2.next = 24;
+                break;
+              }
+
+              _context2.next = 23;
+              return controller.getGoodsTaxRateList(record.taxClassificationCode);
+
+            case 23:
+              record.goodsTaxRateList = _context2.sent;
+
+            case 24:
+              _context2.next = 26;
               return controller.setEditGood(record);
 
-            case 20:
+            case 26:
             case "end":
               return _context2.stop();
           }
@@ -23645,7 +23692,7 @@ var EndowCodeDrawer = (function () {
     if (visible) {
       controller.pipeline( /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(s) {
-          var endowcodeGoodIndex, good, getDefaultValue;
+          var endowcodeGoodIndex, good, getDefaultValue, goodsTaxRateList;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
@@ -23679,19 +23726,40 @@ var EndowCodeDrawer = (function () {
                 case 9:
                   _context2.t1 = _context2.sent;
                   (0, _context2.t0)(_context2.t1);
-                  _context2.next = 14;
+                  _context2.next = 23;
                   break;
 
                 case 13:
-                  if (endowcodeGoodIndex.length === 1) {
-                    setDefaultValue(good);
-                  } else {
-                    setDefaultValue({
-                      taxRate: good.taxRate
-                    });
+                  if (!(endowcodeGoodIndex.length === 1)) {
+                    _context2.next = 22;
+                    break;
+                  }
+
+                  if (!(controller.state.goodsListState.isUpdateGoodsTaxRateList && controller.getGoodsTaxRateList && good.taxClassificationCode)) {
+                    _context2.next = 19;
+                    break;
                   }
 
-                case 14:
+                  _context2.next = 17;
+                  return controller.getGoodsTaxRateList(good.taxClassificationCode);
+
+                case 17:
+                  goodsTaxRateList = _context2.sent;
+                  good.goodsTaxRateList = goodsTaxRateList; // if (good.taxRate !== undefined && good.taxRate !== null && !goodsTaxRateList.includes(good.taxRate)) {
+                  //   good.taxRate = undefined;
+                  // }
+
+                case 19:
+                  setDefaultValue(good);
+                  _context2.next = 23;
+                  break;
+
+                case 22:
+                  setDefaultValue({
+                    taxRate: good.taxRate
+                  });
+
+                case 23:
                 case "end":
                   return _context2.stop();
               }
@@ -23757,12 +23825,7 @@ var DrawerBody$3 = function DrawerBody(props) {
   /** 税率列表 */
 
   var taxRateList = controller.useMemo(function (s) {
-    return s.goodsListState.taxRateList.map(function (e) {
-      return {
-        label: "".concat(e, "%"),
-        value: e
-      };
-    });
+    return s.goodsListState.taxRateList;
   }, []);
   /** 免税类型 列表 */
 
@@ -23783,14 +23846,29 @@ var DrawerBody$3 = function DrawerBody(props) {
       _React$useState4 = _slicedToArray(_React$useState3, 2),
       taxRate = _React$useState4[0],
       setTaxRate = _React$useState4[1];
-  /** 税收分类编码 选择组件 */
+  /** 商品可用税率 */
+
 
+  var _React$useState5 = React.useState(defaultValue.goodsTaxRateList),
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      goodsTaxRateList = _React$useState6[0],
+      setGoodsTaxRateList = _React$useState6[1];
+
+  var formattedTaxRateList = React.useMemo(function () {
+    return (goodsTaxRateList || taxRateList).map(function (e) {
+      return {
+        label: "".concat(e, "%"),
+        value: e
+      };
+    });
+  }, [goodsTaxRateList, taxRateList]);
+  /** 税收分类编码 选择组件 */
 
   var ShowSearch = React.useCallback(function (props) {
-    var _React$useState5 = React.useState([]),
-        _React$useState6 = _slicedToArray(_React$useState5, 2),
-        dataSource = _React$useState6[0],
-        setDataSource = _React$useState6[1];
+    var _React$useState7 = React.useState([]),
+        _React$useState8 = _slicedToArray(_React$useState7, 2),
+        dataSource = _React$useState8[0],
+        setDataSource = _React$useState8[1];
 
     var onSearch = React.useCallback( /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e) {
@@ -23873,22 +23951,22 @@ var DrawerBody$3 = function DrawerBody(props) {
 
   var ShowSearch2 = React.useCallback(function (props) {
     // 是否显示
-    var _React$useState7 = React.useState(false),
-        _React$useState8 = _slicedToArray(_React$useState7, 2),
-        visible = _React$useState8[0],
-        setVisible = _React$useState8[1]; // 税收分类编码树
-
-
-    var _React$useState9 = React.useState(),
+    var _React$useState9 = React.useState(false),
         _React$useState10 = _slicedToArray(_React$useState9, 2),
-        list = _React$useState10[0],
-        setList = _React$useState10[1]; // 搜索条件
+        visible = _React$useState10[0],
+        setVisible = _React$useState10[1]; // 税收分类编码树
 
 
     var _React$useState11 = React.useState(),
         _React$useState12 = _slicedToArray(_React$useState11, 2),
-        filter = _React$useState12[0],
-        setFilter = _React$useState12[1];
+        list = _React$useState12[0],
+        setList = _React$useState12[1]; // 搜索条件
+
+
+    var _React$useState13 = React.useState(),
+        _React$useState14 = _slicedToArray(_React$useState13, 2),
+        filter = _React$useState14[0],
+        setFilter = _React$useState14[1];
     /** 创建 树节点 */
 
 
@@ -24074,15 +24152,15 @@ var DrawerBody$3 = function DrawerBody(props) {
   /** 税收分类编码 选择组件3 */
 
   var ShowSearch3 = React.useCallback(function (props) {
-    var _React$useState13 = React.useState(false),
-        _React$useState14 = _slicedToArray(_React$useState13, 2),
-        open = _React$useState14[0],
-        setOpen = _React$useState14[1];
-
-    var _React$useState15 = React.useState([]),
+    var _React$useState15 = React.useState(false),
         _React$useState16 = _slicedToArray(_React$useState15, 2),
-        list = _React$useState16[0],
-        setList = _React$useState16[1];
+        open = _React$useState16[0],
+        setOpen = _React$useState16[1];
+
+    var _React$useState17 = React.useState([]),
+        _React$useState18 = _slicedToArray(_React$useState17, 2),
+        list = _React$useState18[0],
+        setList = _React$useState18[1];
 
     var onSearch = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
       var _value$target;
@@ -24190,16 +24268,55 @@ var DrawerBody$3 = function DrawerBody(props) {
       }, _callee11);
     })), []);
     var onSelect = React.useCallback(function (key, info) {
-      // !readOnlyTaxRate && actions.setFieldState('taxRate', async s => {
+      // 根据税编改变税率列表
+      // 如果只有一个，默认选中，有多个时，置空，用户手选
+      if (controller.state.goodsListState.isUpdateGoodsTaxRateList) {
+        var _info$node$taxRateLis;
+
+        if ((_info$node$taxRateLis = info.node.taxRateList) === null || _info$node$taxRateLis === void 0 ? void 0 : _info$node$taxRateLis.length) {
+          setGoodsTaxRateList(info.node.taxRateList);
+        }
+
+        if (!readOnlyTaxRate) {
+          actions.setFieldState('taxRate', /*#__PURE__*/function () {
+            var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(s) {
+              var _info$node$taxRateLis2;
+
+              return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+                while (1) {
+                  switch (_context12.prev = _context12.next) {
+                    case 0:
+                      if (info.node.taxRateList && ((_info$node$taxRateLis2 = info.node.taxRateList) === null || _info$node$taxRateLis2 === void 0 ? void 0 : _info$node$taxRateLis2.length) === 1) {
+                        s.value = info.node.taxRateList[0];
+                      } else {
+                        s.value = undefined;
+                      }
+
+                    case 1:
+                    case "end":
+                      return _context12.stop();
+                  }
+                }
+              }, _callee12);
+            }));
+
+            return function (_x8) {
+              return _ref12.apply(this, arguments);
+            };
+          }());
+        }
+      } // !readOnlyTaxRate && actions.setFieldState('taxRate', async s => {
       //   if (info.node.taxRate || info.taxRate === 0) {
       //     s.value = info.node.taxRate
       //   }
       // });
+
+
       actions.setFieldState('taxClassificationCode', /*#__PURE__*/function () {
-        var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(s) {
-          return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+        var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(s) {
+          return _regeneratorRuntime().wrap(function _callee13$(_context13) {
             while (1) {
-              switch (_context12.prev = _context12.next) {
+              switch (_context13.prev = _context13.next) {
                 case 0:
                   if (info.node.taxCategoryCode) {
                     s.value = info.node.taxCategoryCode;
@@ -24207,21 +24324,21 @@ var DrawerBody$3 = function DrawerBody(props) {
 
                 case 1:
                 case "end":
-                  return _context12.stop();
+                  return _context13.stop();
               }
             }
-          }, _callee12);
+          }, _callee13);
         }));
 
-        return function (_x8) {
-          return _ref12.apply(this, arguments);
+        return function (_x9) {
+          return _ref13.apply(this, arguments);
         };
       }());
       actions.setFieldState('shorthand', /*#__PURE__*/function () {
-        var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(s) {
-          return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+        var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(s) {
+          return _regeneratorRuntime().wrap(function _callee14$(_context14) {
             while (1) {
-              switch (_context13.prev = _context13.next) {
+              switch (_context14.prev = _context14.next) {
                 case 0:
                   if (info.node.shorthand) {
                     s.value = info.node.shorthand;
@@ -24229,14 +24346,14 @@ var DrawerBody$3 = function DrawerBody(props) {
 
                 case 1:
                 case "end":
-                  return _context13.stop();
+                  return _context14.stop();
               }
             }
-          }, _callee13);
+          }, _callee14);
         }));
 
-        return function (_x9) {
-          return _ref13.apply(this, arguments);
+        return function (_x10) {
+          return _ref14.apply(this, arguments);
         };
       }());
       setOpen(false);
@@ -24287,19 +24404,19 @@ var DrawerBody$3 = function DrawerBody(props) {
     }));
   }, [controller, actions]); // 是否享受优惠政策
 
-  var _React$useState17 = React.useState(0),
-      _React$useState18 = _slicedToArray(_React$useState17, 2),
-      favouredPolicyMark = _React$useState18[0],
-      setFavouredPolicyMark = _React$useState18[1]; // 确定
+  var _React$useState19 = React.useState(0),
+      _React$useState20 = _slicedToArray(_React$useState19, 2),
+      favouredPolicyMark = _React$useState20[0],
+      setFavouredPolicyMark = _React$useState20[1]; // 确定
 
 
   var onSubmit = React.useCallback(function (values) {
     controller.pipeline( /*#__PURE__*/function () {
-      var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(s) {
+      var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(s) {
         var endowCodeGood;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) {
-            switch (_context14.prev = _context14.next) {
+            switch (_context15.prev = _context15.next) {
               case 0:
                 endowCodeGood = s.goodsListState.endowCode.endowcodeGoodIndex.map(function (e) {
                   return s.goodsListState.goodsMap.get(e);
@@ -24322,46 +24439,49 @@ var DrawerBody$3 = function DrawerBody(props) {
 
                   if (good.lineAmountExcludeTax && good.quantity) {
                     good.priceExcludeTax = countPrice(good.lineAmountExcludeTax, good.quantity, controller.state.calculatingDigits);
-                  }
+                  } //赋值商品的可用税率
+
+
+                  good.goodsTaxRateList = goodsTaxRateList;
                 });
                 s.goodsListState.goodsList = s.goodsListState.goodsList.slice();
                 s.goodsListState.endowCode.endowcodeGoodIndex = [];
 
               case 4:
               case "end":
-                return _context14.stop();
+                return _context15.stop();
             }
           }
-        }, _callee14);
+        }, _callee15);
       }));
 
-      return function (_x10) {
-        return _ref14.apply(this, arguments);
+      return function (_x11) {
+        return _ref15.apply(this, arguments);
       };
     }())();
-  }, [controller]);
+  }, [controller, goodsTaxRateList]);
   var effects = React.useCallback(function () {
     // 税率变化
     FormEffectHooks.onFieldValueChange$('taxRate').subscribe(function (e) {
       setTaxRate(e.value);
       actions.setFieldState('taxFreeType', /*#__PURE__*/function () {
-        var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(s) {
-          return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+        var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(s) {
+          return _regeneratorRuntime().wrap(function _callee16$(_context16) {
             while (1) {
-              switch (_context15.prev = _context15.next) {
+              switch (_context16.prev = _context16.next) {
                 case 0:
                   if (e.value !== 0) s.value = undefined;
 
                 case 1:
                 case "end":
-                  return _context15.stop();
+                  return _context16.stop();
               }
             }
-          }, _callee15);
+          }, _callee16);
         }));
 
-        return function (_x11) {
-          return _ref15.apply(this, arguments);
+        return function (_x12) {
+          return _ref16.apply(this, arguments);
         };
       }());
     }); // 是否享受优惠政策
@@ -24369,23 +24489,23 @@ var DrawerBody$3 = function DrawerBody(props) {
     FormEffectHooks.onFieldValueChange$('favouredPolicyMark').subscribe(function (e) {
       setFavouredPolicyMark(e.value);
       actions.setFieldState('favouredPolicyName', /*#__PURE__*/function () {
-        var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(s) {
-          return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+        var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(s) {
+          return _regeneratorRuntime().wrap(function _callee17$(_context17) {
             while (1) {
-              switch (_context16.prev = _context16.next) {
+              switch (_context17.prev = _context17.next) {
                 case 0:
                   if (e.value === 0) s.value = undefined;
 
                 case 1:
                 case "end":
-                  return _context16.stop();
+                  return _context17.stop();
               }
             }
-          }, _callee16);
+          }, _callee17);
         }));
 
-        return function (_x12) {
-          return _ref16.apply(this, arguments);
+        return function (_x13) {
+          return _ref17.apply(this, arguments);
         };
       }());
     });
@@ -24425,7 +24545,7 @@ var DrawerBody$3 = function DrawerBody(props) {
       disabled: readOnlyTaxRate
     },
     default: (_defaultValue$taxRate = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.taxRate) !== null && _defaultValue$taxRate !== void 0 ? _defaultValue$taxRate : 0,
-    enum: taxRateList,
+    enum: formattedTaxRateList,
     "x-rules": [{
       message: '请选择税率',
       required: true
@@ -24485,23 +24605,23 @@ var DrawerBody$3 = function DrawerBody(props) {
   }, "\u786E\u5B9A"), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       controller.pipeline( /*#__PURE__*/function () {
-        var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(s) {
-          return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+        var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(s) {
+          return _regeneratorRuntime().wrap(function _callee18$(_context18) {
             while (1) {
-              switch (_context17.prev = _context17.next) {
+              switch (_context18.prev = _context18.next) {
                 case 0:
-                  return _context17.abrupt("return", s.goodsListState.endowCode.endowcodeGoodIndex = []);
+                  return _context18.abrupt("return", s.goodsListState.endowCode.endowcodeGoodIndex = []);
 
                 case 1:
                 case "end":
-                  return _context17.stop();
+                  return _context18.stop();
               }
             }
-          }, _callee17);
+          }, _callee18);
         }));
 
-        return function (_x13) {
-          return _ref17.apply(this, arguments);
+        return function (_x14) {
+          return _ref18.apply(this, arguments);
         };
       }())();
     }