kts-component-invoice-operate 3.2.99 → 3.2.101

package/dist/index.esm.js

@@ -2246,7 +2246,7 @@ function mergeDiscount(_x) {
 
 function _mergeDiscount() {
   _mergeDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state) {
-    var goodsList, i, good, sum, zk;
+    var goodsList, i, good, sum, zk, calculatingDigits;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -2277,8 +2277,9 @@ function _mergeDiscount() {
                 sum.quantity = good.quantity;
 
                 if (sum.quantity) {
-                  sum.priceExcludeTax = chain$1(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
-                  sum.priceIncludeTax = chain$1(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
+                  calculatingDigits = state.calculatingDigits;
+                  sum.priceExcludeTax = format15(chain$1(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber(), calculatingDigits) || 0;
+                  sum.priceIncludeTax = format15(chain$1(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber(), calculatingDigits) || 0;
                 }
 
                 goodsList.splice(i, 2, sum);
@@ -10968,22 +10969,20 @@ function ItemNameInput(props) {
               return _context3.abrupt("return");
 
             case 3:
-              _context3.next = 5;
+              setValue(record.itemName);
+              setSelectLine(record);
+              _context3.next = 7;
               return controller.setEditGood({
                 itemName: record.itemName
               });
 
-            case 5:
-              _context3.next = 7;
-              return controller.importGoodsDrawer(record);
-
             case 7:
-              setValue(record.itemName);
-              setSelectLine(record[0]);
-              controller.importGoodsDrawer(record);
-              setOptions([]);
+              _context3.next = 9;
+              return controller.importGoodsDrawer(_objectSpread2(_objectSpread2({}, record), {}, {
+                $index: undefined
+              }));
 
-            case 11:
+            case 9:
             case "end":
               return _context3.stop();
           }
@@ -11007,7 +11006,7 @@ function ItemNameInput(props) {
     }
   }, "*", props.shorthand, "*"), React.createElement(AutoComplete$1, {
     onSearch: onSearch,
-    value: value,
+    value: props.value,
     options: options.map(function (e) {
       return {
         value: e.$index,
@@ -11020,6 +11019,7 @@ function ItemNameInput(props) {
       height: '100%',
       border: 'none'
     },
+    value: value,
     onChange: onChange,
     onBlur: onBlur
   })));

package/dist/index.js

@@ -2256,7 +2256,7 @@ function mergeDiscount(_x) {
 
 function _mergeDiscount() {
   _mergeDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(state) {
-    var goodsList, i, good, sum, zk;
+    var goodsList, i, good, sum, zk, calculatingDigits;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -2287,8 +2287,9 @@ function _mergeDiscount() {
                 sum.quantity = good.quantity;
 
                 if (sum.quantity) {
-                  sum.priceExcludeTax = mathjs.chain(mathjs.bignumber(sum.lineAmountExcludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber();
-                  sum.priceIncludeTax = mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber();
+                  calculatingDigits = state.calculatingDigits;
+                  sum.priceExcludeTax = format15(mathjs.chain(mathjs.bignumber(sum.lineAmountExcludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber(), calculatingDigits) || 0;
+                  sum.priceIncludeTax = format15(mathjs.chain(mathjs.bignumber(sum.lineAmountIncludeTax)).divide(mathjs.bignumber(sum.quantity)).done().toNumber(), calculatingDigits) || 0;
                 }
 
                 goodsList.splice(i, 2, sum);
@@ -10978,22 +10979,20 @@ function ItemNameInput(props) {
               return _context3.abrupt("return");
 
             case 3:
-              _context3.next = 5;
+              setValue(record.itemName);
+              setSelectLine(record);
+              _context3.next = 7;
               return controller.setEditGood({
                 itemName: record.itemName
               });
 
-            case 5:
-              _context3.next = 7;
-              return controller.importGoodsDrawer(record);
-
             case 7:
-              setValue(record.itemName);
-              setSelectLine(record[0]);
-              controller.importGoodsDrawer(record);
-              setOptions([]);
+              _context3.next = 9;
+              return controller.importGoodsDrawer(_objectSpread2(_objectSpread2({}, record), {}, {
+                $index: undefined
+              }));
 
-            case 11:
+            case 9:
             case "end":
               return _context3.stop();
           }
@@ -11017,7 +11016,7 @@ function ItemNameInput(props) {
     }
   }, "*", props.shorthand, "*"), React__default['default'].createElement(ktsXui.AutoComplete, {
     onSearch: onSearch,
-    value: value,
+    value: props.value,
     options: options.map(function (e) {
       return {
         value: e.$index,
@@ -11030,6 +11029,7 @@ function ItemNameInput(props) {
       height: '100%',
       border: 'none'
     },
+    value: value,
     onChange: onChange,
     onBlur: onBlur
   })));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.99",
+  "version": "3.2.101",
   "scripts": {
     "dev": "dumi dev",
     "start": "dumi dev",

package/src/Invoice/InvoiceController/fns/importGoodsDrawer.ts

@@ -32,7 +32,7 @@ export default async (s: InvoiceControllerState, record: any, controller:any) =>
     between.lineAmountExcludeTax = record.lineAmountExcludeTax;
     between.taxRate = record.taxRate;
     between.taxAmount = record.taxAmount;
-
+    
     // 设置编辑货物
     const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
 

package/src/Invoice/InvoiceController/fns/mergeDiscount.ts

@@ -1,6 +1,7 @@
 
 
 import { IGood, InvoiceControllerState, LineAttributeType } from '..';
+import { format15 } from '../../tools/calculate';
 import { chain, bignumber } from 'mathjs';
 import idGenerator from '../../tools/idGenerator';
 
@@ -19,8 +20,9 @@ export default async function mergeDiscount(state: InvoiceControllerState) {
             sum.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber();
             sum.quantity = good.quantity;
             if (sum.quantity) {
-                sum.priceExcludeTax = chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
-                sum.priceIncludeTax = chain(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber();
+                const calculatingDigits = state.calculatingDigits;
+                sum.priceExcludeTax = format15(chain(bignumber(sum.lineAmountExcludeTax)).divide(bignumber(sum.quantity)).done().toNumber(), calculatingDigits) || 0;
+                sum.priceIncludeTax = format15(chain(bignumber(sum.lineAmountIncludeTax)).divide(bignumber(sum.quantity)).done().toNumber(), calculatingDigits) || 0;
             }
             goodsList.splice(i, 2, sum);
         }

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

@@ -24,24 +24,24 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
     }, [])
 
     const onBlur = React.useCallback(async (searchText: any) => {
-      try {
-        if (autoComplete.onItemNameBlur) {
-          if(!selectLine?.shorthand) {
-            const taxCategoryData: any = await autoComplete.onItemNameBlur(searchText);
-            if(taxCategoryData && taxCategoryData[0]) {
-              const params = {
-                ...props.editGood,
-                taxClassificationCode: taxCategoryData[0].taxCategoryCode,
-                shorthand: taxCategoryData[0].shorthand
-              }
-              controller.importGoodsDrawer(params);
+        try {
+            if (autoComplete.onItemNameBlur) {
+                if (!selectLine?.shorthand) {
+                    const taxCategoryData: any = await autoComplete.onItemNameBlur(searchText);
+                    if (taxCategoryData && taxCategoryData[0]) {
+                        const params = {
+                            ...props.editGood,
+                            taxClassificationCode: taxCategoryData[0].taxCategoryCode,
+                            shorthand: taxCategoryData[0].shorthand
+                        }
+                        controller.importGoodsDrawer(params);
+                    }
+                }
+                setSelectLine(null);
             }
-          }
-          setSelectLine(null);
+        } catch (error) {
+            throw error;
         }
-      } catch (error) {
-        throw error;
-      }
     }, [autoComplete.onItemNameBlur, selectLine, props.editGood])
 
     const onSearch = React.useCallback(async (searchText: string) => {
@@ -62,15 +62,13 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
         const record = options.filter(e => e.$index === i.value)[0] as any;
         if (!record) return;
 
-        await controller.setEditGood({ itemName: record.itemName });
+        setValue(record.itemName);
+        setSelectLine(record);
 
-        await controller.importGoodsDrawer(record);
+        await controller.setEditGood({ itemName: record.itemName });
 
-        setValue(record.itemName);
-        setSelectLine(record[0]);
-        controller.importGoodsDrawer(record);
+        await controller.importGoodsDrawer({ ...record, $index: undefined });
 
-        setOptions([]);
     }, [options, controller])
 
     React.useEffect(() => { setValue(props.value) }, [props.value])
@@ -80,11 +78,11 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
             {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
             <AutoComplete
                 onSearch={onSearch}
-                value={value}
+                value={props.value}
                 options={options.map(e => ({ value: e.$index, label: e.itemName }))}
                 onSelect={onChangeAutoComplete}
             >
-                <Input style={{ height: '100%', border: 'none' }} onChange={onChange} onBlur={onBlur} />
+                <Input style={{ height: '100%', border: 'none' }} value={value} onChange={onChange} onBlur={onBlur} />
             </AutoComplete>
         </div>
     )