kts-component-invoice-operate 3.2.246 → 3.2.247

package/dist/index.esm.js

@@ -14769,40 +14769,40 @@ var useColumns = (function (form) {
       key: 'taxAmount',
       align: 'right',
       width: 119,
-      rules: [].concat(_toConsumableArray(getReplenishRules('taxAmount')), [{
-        required: isEnables('taxAmount'),
-        message: '税额不能为空'
-      }, {
-        pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
-        message: '税额必须为数字'
-      }, {
-        validator: function validator(rule, value, callback) {
-          //含税金额  
-          var lineAmountIncludeTax = (editGood === null || editGood === void 0 ? void 0 : editGood.lineAmountIncludeTax) || 0; //不含税金额
-          // const lineAmountExcludeTax = lineAmountIncludeTax-value;
-
-          var lineAmountExcludeTax = chain$1(bignumber(lineAmountIncludeTax || 0)).subtract(bignumber(value || 0));
-          var taxRate = editGood === null || editGood === void 0 ? void 0 : editGood.taxRate;
-
-          if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
-            // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
-            var total = lineAmountExcludeTax.multiply(bignumber(taxRate || 0)).divide(bignumber(100)); // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
-
-            if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.01) {
-              callback();
-            } else {
-              callback('税额填写错误，请重新输入');
-            }
-          } else {
-            callback();
-          }
-        }
-      }]),
       render: function render(value, record) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
-          return getFieldDecorator('taxAmount', {
+          return /*#__PURE__*/React.createElement(Form.Item, null, getFieldDecorator('taxAmount', {
             initialValue: editGood.taxAmount,
-            rules: getReplenishRules('taxAmount')
+            // rules: getReplenishRules('taxAmount'),
+            rules: [].concat(_toConsumableArray(getReplenishRules('taxAmount')), [{
+              required: isEnables('taxAmount'),
+              message: '税额不能为空'
+            }, {
+              pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
+              message: '税额必须为数字'
+            }, {
+              validator: function validator(rule, value, callback) {
+                //含税金额  
+                var lineAmountIncludeTax = (editGood === null || editGood === void 0 ? void 0 : editGood.lineAmountIncludeTax) || 0; //不含税金额
+                // const lineAmountExcludeTax = lineAmountIncludeTax-value;
+
+                var lineAmountExcludeTax = chain$1(bignumber(lineAmountIncludeTax || 0)).subtract(bignumber(value || 0));
+                var taxRate = editGood === null || editGood === void 0 ? void 0 : editGood.taxRate;
+
+                if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
+                  // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
+                  var total = lineAmountExcludeTax.multiply(bignumber(taxRate || 0)).divide(bignumber(100)); // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
+
+                  if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.01) {
+                    callback();
+                  } else {
+                    callback('税额填写错误，请重新输入');
+                  }
+                } else {
+                  callback();
+                }
+              }
+            }])
           })(isEnables('taxAmount') ? /*#__PURE__*/React.createElement(MyInput, {
             style: {
               textAlign: 'right'
@@ -14814,7 +14814,7 @@ var useColumns = (function (form) {
             }
           }) : /*#__PURE__*/React.createElement(MyDiv, {
             loading: isCipher(changeField, 'taxAmount')
-          }));
+          })));
         } else {
           return /*#__PURE__*/React.createElement("span", {
             style: {

package/dist/index.js

@@ -14779,40 +14779,40 @@ var useColumns = (function (form) {
       key: 'taxAmount',
       align: 'right',
       width: 119,
-      rules: [].concat(_toConsumableArray(getReplenishRules('taxAmount')), [{
-        required: isEnables('taxAmount'),
-        message: '税额不能为空'
-      }, {
-        pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
-        message: '税额必须为数字'
-      }, {
-        validator: function validator(rule, value, callback) {
-          //含税金额  
-          var lineAmountIncludeTax = (editGood === null || editGood === void 0 ? void 0 : editGood.lineAmountIncludeTax) || 0; //不含税金额
-          // const lineAmountExcludeTax = lineAmountIncludeTax-value;
-
-          var lineAmountExcludeTax = mathjs.chain(mathjs.bignumber(lineAmountIncludeTax || 0)).subtract(mathjs.bignumber(value || 0));
-          var taxRate = editGood === null || editGood === void 0 ? void 0 : editGood.taxRate;
-
-          if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
-            // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
-            var total = lineAmountExcludeTax.multiply(mathjs.bignumber(taxRate || 0)).divide(mathjs.bignumber(100)); // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
-
-            if (Math.abs(total.subtract(mathjs.bignumber(value || 0)).done().toNumber()) <= 0.01) {
-              callback();
-            } else {
-              callback('税额填写错误，请重新输入');
-            }
-          } else {
-            callback();
-          }
-        }
-      }]),
       render: function render(value, record) {
         if ((editGood === null || editGood === void 0 ? void 0 : editGood.$index) === record.$index) {
-          return getFieldDecorator('taxAmount', {
+          return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, null, getFieldDecorator('taxAmount', {
             initialValue: editGood.taxAmount,
-            rules: getReplenishRules('taxAmount')
+            // rules: getReplenishRules('taxAmount'),
+            rules: [].concat(_toConsumableArray(getReplenishRules('taxAmount')), [{
+              required: isEnables('taxAmount'),
+              message: '税额不能为空'
+            }, {
+              pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
+              message: '税额必须为数字'
+            }, {
+              validator: function validator(rule, value, callback) {
+                //含税金额  
+                var lineAmountIncludeTax = (editGood === null || editGood === void 0 ? void 0 : editGood.lineAmountIncludeTax) || 0; //不含税金额
+                // const lineAmountExcludeTax = lineAmountIncludeTax-value;
+
+                var lineAmountExcludeTax = mathjs.chain(mathjs.bignumber(lineAmountIncludeTax || 0)).subtract(mathjs.bignumber(value || 0));
+                var taxRate = editGood === null || editGood === void 0 ? void 0 : editGood.taxRate;
+
+                if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
+                  // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
+                  var total = lineAmountExcludeTax.multiply(mathjs.bignumber(taxRate || 0)).divide(mathjs.bignumber(100)); // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
+
+                  if (Math.abs(total.subtract(mathjs.bignumber(value || 0)).done().toNumber()) <= 0.01) {
+                    callback();
+                  } else {
+                    callback('税额填写错误，请重新输入');
+                  }
+                } else {
+                  callback();
+                }
+              }
+            }])
           })(isEnables('taxAmount') ? /*#__PURE__*/React__default['default'].createElement(MyInput, {
             style: {
               textAlign: 'right'
@@ -14824,7 +14824,7 @@ var useColumns = (function (form) {
             }
           }) : /*#__PURE__*/React__default['default'].createElement(MyDiv, {
             loading: isCipher(changeField, 'taxAmount')
-          }));
+          })));
         } else {
           return /*#__PURE__*/React__default['default'].createElement("span", {
             style: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.246",
+  "version": "3.2.247",
   "scripts": {
     "dev": "dumi dev --max-old-space-size=6096",
     "start": "dumi dev",

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

@@ -24,6 +24,7 @@ import { getItemNameWithShorthand } from '../../../../../tools/itemName';
 import Drag from './ui/Drag';
 import { nonScientificNotation } from '../../../../../tools/calculate';
 import Expand from './ui/Expand';
+import { render } from 'react-dom';
 
 export default (form: WrappedFormUtils) => {
   const { getFieldDecorator, getFieldValue } = form;
@@ -552,50 +553,53 @@ export default (form: WrappedFormUtils) => {
         key: 'taxAmount',
         align: 'right',
         width: 119,
-        rules: [
-          ...getReplenishRules('taxAmount'),
-          { required: isEnables('taxAmount'), message: '税额不能为空' },
-          { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '税额必须为数字' },
-          {
-            validator: (rule: any, value: any, callback: any) => {
-              //含税金额  
-              const lineAmountIncludeTax = editGood?.lineAmountIncludeTax || 0;
-              //不含税金额
-              // const lineAmountExcludeTax = lineAmountIncludeTax-value;
-              const lineAmountExcludeTax = chain(bignumber(lineAmountIncludeTax || 0)).subtract(bignumber(value || 0));
-              const taxRate = editGood?.taxRate;
-              if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
-                // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
-                const total = lineAmountExcludeTax.multiply(bignumber(taxRate || 0)).divide(bignumber(100));
-                // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
-                if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.01) {
-                  callback();
-                } else {
-                  callback('税额填写错误，请重新输入')
-                }
-              } else {
-                callback();
-              }
-            }
-          },
-        ],
+
         render: (value: string, record: IGood) => {
           if (editGood?.$index === record.$index) {
-            return getFieldDecorator('taxAmount', {
-              initialValue: editGood.taxAmount,
-              rules: getReplenishRules('taxAmount'),
-            })(
-              isEnables('taxAmount')
-                ? <MyInput
-                  style={{ textAlign: 'right' }}
-                  loading={isCipher(changeField, 'taxAmount')}
-                  onChange={() => {
-                    setChangeField('taxAmount');
-                    onChangeTaxAmount(controller, form, record);
-                  }}
-                />
-                : <MyDiv loading={isCipher(changeField, 'taxAmount')} />
-            );
+            return <Form.Item>
+              {getFieldDecorator('taxAmount', {
+                initialValue: editGood.taxAmount,
+                // rules: getReplenishRules('taxAmount'),
+                rules: [
+                  ...getReplenishRules('taxAmount'),
+                  { required: isEnables('taxAmount'), message: '税额不能为空' },
+                  { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '税额必须为数字' },
+                  {
+                    validator: (rule: any, value: any, callback: any) => {
+                      //含税金额  
+                      const lineAmountIncludeTax = editGood?.lineAmountIncludeTax || 0;
+                      //不含税金额
+                      // const lineAmountExcludeTax = lineAmountIncludeTax-value;
+                      const lineAmountExcludeTax = chain(bignumber(lineAmountIncludeTax || 0)).subtract(bignumber(value || 0));
+                      const taxRate = editGood?.taxRate;
+                      if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
+                        // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
+                        const total = lineAmountExcludeTax.multiply(bignumber(taxRate || 0)).divide(bignumber(100));
+                        // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
+                        if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.01) {
+                          callback();
+                        } else {
+                          callback('税额填写错误，请重新输入')
+                        }
+                      } else {
+                        callback();
+                      }
+                    }
+                  },
+                ],
+              })(
+                isEnables('taxAmount')
+                  ? <MyInput
+                    style={{ textAlign: 'right' }}
+                    loading={isCipher(changeField, 'taxAmount')}
+                    onChange={() => {
+                      setChangeField('taxAmount');
+                      onChangeTaxAmount(controller, form, record);
+                    }}
+                  />
+                  : <MyDiv loading={isCipher(changeField, 'taxAmount')} />
+              )}
+            </Form.Item>
           } else {
             return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : value === '' ? '' : parseFloat(value).toFixed(2)}</span>;
           }
@@ -628,7 +632,6 @@ export default (form: WrappedFormUtils) => {
         dataIndex: 'remarks',
         key: 'remarks',
         width: 150,
-
       },
       {
         title: '操作',