kts-component-invoice-operate 2.0.4 → 2.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "2.0.4",
+  "version": "2.0.7",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -1,14 +1,21 @@
 
 import IGood from "../InvoiceControllerState/GoodsListState/IGood";
 
-export default function getGoodsSearch(goodsList: IGood[], search: string) {
+/**
+ * 计算搜索商品
+ * @param goodsList 被搜索列表
+ * @param search 搜索条件
+ * @param isTaxIncluded 是否含税
+ * @returns 
+ */
+export default function getGoodsSearch(goodsList: IGood[], search: string, isTaxIncluded: boolean) {
     if (!search) return goodsList;
     return goodsList.filter(e => {
         if ((e.itemName?.indexOf(search) ?? -1) >= 0) {
             return true;
         } else if ((e.itemModelName?.indexOf(search) ?? -1) >= 0) {
             return true
-        } else if (`${e.lineAmountIncludeTax}`.indexOf(search) >= 0) {
+        } else if (`${isTaxIncluded ? e.lineAmountIncludeTax?.toFixed(2) : e.lineAmountExcludeTax?.toFixed(2)}`.indexOf(search) >= 0) {
             return true
         } else {
             return false;

package/src/Invoice/_test/importGoods/index.tsx

@@ -37,14 +37,32 @@ class MyInvoiceController extends InvoiceController {
     // 设置比对方法
     this.state.goodsListState.productComparison = {
       onComply: async (e: IGood[]) => {
-        return e.map(e => {
-          return {
-            ...e,
-            itemName: e.itemNameSelf + '(他方)',
-            itemModelName: e.itemModelNameSelf + '(他方)',
-            itemCode: e.itemCodeSelf + '(他方)',
+        // return e.map(e => {
+        //   return {
+        //     ...e,
+        //     itemName: e.itemNameSelf + '(他方)',
+        //     itemModelName: e.itemModelNameSelf + '(他方)',
+        //     itemCode: e.itemCodeSelf + '(他方)',
+        //   }
+        // })
+        return [
+          {
+            "itemCodeSelf": null,
+            "itemNameSelf": "china",
+            "itemModelNameSelf": "xx",
+            "itemCode": null,
+            "itemName": "中国",
+            "itemModelName": "北京房山 "
+          },
+          {
+            "itemCodeSelf": null,
+            "itemNameSelf": "china",
+            "itemModelNameSelf": "xx",
+            "itemCode": null,
+            "itemName": "中国",
+            "itemModelName": "北京房山 "
           }
-        })
+        ] as any
       }
     }
 

package/src/Invoice/ui/AddComparisonDrawer/index.tsx

@@ -77,7 +77,7 @@ export default function AddComparisonDrawer() {
                 !!good &&
                 <Form layout="vertical" style={{ flex: 1 }} form={form} >
                     <Row gutter={[8, 8]} >
-                        <Col span={12}>
+                        {/* <Col span={12}>
                             <Form.Item
                                 name="itemCodeSelf"
                                 label="我方商品编码"
@@ -92,7 +92,7 @@ export default function AddComparisonDrawer() {
                             >
                                 <Input />
                             </Form.Item>
-                        </Col>
+                        </Col> */}
                         <Col span={12} >
                             <Form.Item
                                 name="itemNameSelf"

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

@@ -402,7 +402,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{parseFloat(value).toFixed(2)}</span>;
+            return <span style={{ padding: '0 10px' }}>{formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
           }
         },
       },

package/src/Invoice/ui/GoodsList/hook/useRowSelection/index.tsx

@@ -22,13 +22,13 @@ export default () => {
     // const isAll = controller.useMemo(s => s.goodsListState.goodsList.length > 0 && s.goodsListState.selectedGoodIndex.length === s.goodsListState.goodsList.length, [])
     const isAll = controller.useMemo(s => {
         if (s.goodsListState.selectedGoodIndex.length <= 0) return false;
-        const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue).map(e => e.$index);
+        const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index);
         const selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => seeGoodsIndex.some(t => e === t));
         return selectedGoodIndex.length === seeGoodsIndex.length
     }, [])
 
     const indeterminate = controller.useMemo(s => {
-        const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue).map(e => e.$index);
+        const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index);
         const selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => seeGoodsIndex.some(t => e === t));
         if (selectedGoodIndex.length === 0) return false;
         return selectedGoodIndex.length < seeGoodsIndex.length
@@ -38,17 +38,13 @@ export default () => {
     const onClickSelectAll = React.useCallback(async () => {
         if (isAll) {
             await controller.pipeline(async s => {
-                const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue).map(e => e.$index)
+                const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index)
 
                 s.goodsListState.selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e=>!seeGoodsIndex.some(t => e === t));
             })()
         } else {
-            // controller.pipeline(async s => {
-            //     s.goodsListState.selectedGoodIndex = s.goodsListState.goodsList.map(e => e.$index);
-            // })()
-
             await controller.pipeline(async s => {
-                const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue).map(e => e.$index)
+                const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index)
 
                 s.goodsListState.selectedGoodIndex = [...s.goodsListState.selectedGoodIndex, ...seeGoodsIndex];
                 s.goodsListState.selectedGoodIndex = Array.from(new Set(s.goodsListState.selectedGoodIndex));

package/src/Invoice/ui/GoodsList/index.tsx

@@ -60,7 +60,9 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
 
   const searchValue = controller.useMemo(s => s.goodsListState.searchValue, [])
 
-  const dataSourceSearch = React.useMemo(() => controller.getGoodsSearch(dataSource, searchValue), [dataSource, searchValue, controller])
+  const isTaxIncluded = controller.useMemo(s => s.goodsListState.isTaxIncluded, [])
+
+  const dataSourceSearch = React.useMemo(() => controller.getGoodsSearch(dataSource, searchValue, isTaxIncluded), [dataSource, searchValue, controller, isTaxIncluded])
 
   /** 表格行事件 */
   const onRow = useOnRow();

package/src/Invoice/ui/GoodsList/ui/Search/index.less

@@ -1,6 +1,6 @@
 .kts-invoice-operate-goods-list-able-list {
   .kts-invoice-operate-goods-list-search {
-    width: 330px;
+    width: 350px;
 
     input {
       border-radius: 999px;

package/src/Invoice/ui/GoodsList/ui/Search/index.tsx

@@ -13,6 +13,9 @@ export default function Search() {
 
     const readOnly = controller.useMemo(s => !!s.goodsListState.editGood, [])
 
+    /** 是否含税 */
+    const isTaxIncluded = controller.useMemo(s => s.goodsListState.isTaxIncluded, [])
+
     const onClick = React.useCallback(async () => {
         await controller.saveEditGood();
         await controller.wait();
@@ -27,7 +30,7 @@ export default function Search() {
 
     React.useEffect(() => {
         controller.run(async s => {
-            s.goodsListState.searchValue = value;
+            s.goodsListState.searchValue = value.replace(/^ */, '').replace(/ *$/, '');
         })
     }, [value, controller])
 
@@ -37,7 +40,7 @@ export default function Search() {
             readOnly={readOnly}
             value={value}
             className="kts-invoice-operate-goods-list-search"
-            placeholder="请您输入货物名称、规格型号、金额(含税)搜索"
+            placeholder={`请您输入货物名称、规格型号、金额(${isTaxIncluded ? '含税' : '不含税'})搜索`}
             prefix={<Icon component={MagnifierSvg} style={{ color: "#b8b8b8" }} />}
             onChange={e => { setValue(e.target.value); }}
             onClick={onClick}