kts-component-invoice-operate 3.0.0 → 3.0.2

package/package.json

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

package/src/Invoice/InvoiceController/InvoiceControllerForm/index.ts

@@ -77,6 +77,9 @@ export default class InvoiceControllerForm extends GreyReactBox<InvoiceControlle
       return sum.done().toNumber();
     })());
 
+    // 含税标记
+    _values.set('isSwitchTax', this.state.goodsListState.isSwitchTax)
+
     return { errors: _errors, values: _values };
   }
 }

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/EndowCode/index.tsx

@@ -5,7 +5,7 @@ import LineAttributeType from '../LineAttributeType';
 export default class EndowCode {
 
   /** 准备赋码的货物索引列表 */
-  endowcodeGoodIndex: number[] = [];
+  endowcodeGoodIndex: string[] = [];
 
   /** 
    * 获取 税收分类编码列表 (弃用)

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

@@ -2,7 +2,7 @@ import LineAttributeType from '../LineAttributeType';
 
 export default interface IGood {
   /** 数据索引 */
-  $index: number;
+  $index: string;
 
   /** 序号 */
   serialNo?: number;

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

@@ -47,16 +47,16 @@ export default class GoodsListState {
   goodsList: IGood[] = [];
 
   /** 货物字典 */
-  goodsMap = new Map<number, IGood>();
+  goodsMap = new Map<string, IGood>();
 
   /** 货物菜单扩展 */
-  goodsMenuExpand: ((index: number, controller: InvoiceController) => React.ReactNode)[] = [];
+  goodsMenuExpand: ((index: string, controller: InvoiceController) => React.ReactNode)[] = [];
 
   /** 列表选中的货物索引列表 */
-  selectedGoodIndex: number[] = [];
+  selectedGoodIndex: string[] = [];
 
   /** 准备添加折扣的货物索引列表 */
-  discountGoodIndex: number[] = [];
+  discountGoodIndex: string[] = [];
 
   /** 货物赋码的相关数据 */
   endowCode = new EndowCode();
@@ -71,5 +71,5 @@ export default class GoodsListState {
   isVisibleDrawer = false;
 
   /** 正在 添加商品对照 的货物 */
-  addComparisonIndex?: number;
+  addComparisonIndex?: string;
 }

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

@@ -16,7 +16,7 @@ import { format2 } from '../../../Invoice/tools/calculate';
 
 export interface IOptions {
   /** 需要添加的 索引列表 */
-  indexList: number[];
+  indexList: string[];
 
   /** 折扣 */
   discount: number;

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

@@ -4,12 +4,10 @@ import LineAttributeType from '../../InvoiceController/InvoiceControllerState/Go
 /**
  * 设置当前的编辑货物
  */
-export default async (state: InvoiceControllerState, $index?: number) => {
+export default async (state: InvoiceControllerState, $index?: string) => {
   if (!$index) return;
 
-  const goods = state.goodsListState.goodsList.filter(
-    (e) => e.$index === $index,
-  )[0];
+  const goods = state.goodsListState.goodsList.filter( (e) => e.$index === $index)[0];
   if (!goods) return;
   if (
     state.goodsListState.editGood &&

package/src/Invoice/index.tsx

@@ -81,8 +81,6 @@ const Main = (props: IInvoiceProps) => {
 
   React.useEffect(() => { setKey(key + 1) }, [controller]);
 
-  React.useEffect(() => { }, [])
-
   return (
     <InvoiceContext.Provider key={key} value={controller}>
 
@@ -95,10 +93,10 @@ const Main = (props: IInvoiceProps) => {
         {props.footExpand}
       </div>
 
-      <ImportBuyerDrawer />{/*        导入购买方的抽屉 */}
-      <ImportGoodsDrawer />{/*        导入货品的抽屉 */}
-      <EndowCodeDrawer />{/*          给货品赋码的抽屉 */}
-      <AddComparisonDrawer />{/*      添加商品对照的抽屉 */}
+      <ImportBuyerDrawer />{/*         导入购买方的抽屉 */}
+      <ImportGoodsDrawer />{/*         导入货品的抽屉 */}
+      <EndowCodeDrawer />{/*           给货品赋码的抽屉 */}
+      <AddComparisonDrawer />{/*       添加商品对照的抽屉 */}
     </InvoiceContext.Provider>
   );
 };

package/src/Invoice/tools/idGenerator/index.ts

@@ -1,2 +1,3 @@
-let id = new Date().getTime();
-export default () => ++id;
+
+import { v4 as uuidv4 } from 'uuid';
+export default () => uuidv4();

package/src/Invoice/ui/GoodsList/hook/useColumns/autoFillFn/index.ts

@@ -415,8 +415,8 @@ export const onSaveEditGood = lazyFn(
 
 /** 单调赋码 */
 export const endowCode = async (controller: InvoiceController, goods: IGood) => {
-  await controller.saveEditGood();
   await controller.wait();
+  await controller.saveEditGood();
   await controller.pipeline(async (s) => {
     if (s.goodsListState.form) {
       const err: any = s.goodsListState.form.getFieldsError();

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

@@ -17,8 +17,8 @@ export default (goods: IGood) => {
 
     /** 点击了 添加折扣行 按钮 */
     const onClick = React.useCallback(async () => {
-        await controller.saveEditGood();
         await controller.wait();
+        await controller.saveEditGood();
         await controller.run(async s => {
             if (s.goodsListState.form) {
                 const err: any = s.goodsListState.form.getFieldsError();

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

@@ -23,7 +23,6 @@ export default () => {
       if (editGood) {
         if (editGood.$index === record.$index) return;
         await controller.saveEditGood();
-        await controller.wait();
         await controller.pipeline(async s => { s.goodsListState.editGood || (await controller.setEditGood(record)) })();
       } else {
         await controller.setEditGood(record);

package/src/Invoice/ui/GoodsList/hook/useToGenerateId/index.ts

@@ -4,10 +4,6 @@ import InvoiceController from '../../../../InvoiceController'
 
 /** 更新 商品序号 */
 export default function useToGenerateId(controller: InvoiceController) {
-
     const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
-
-    React.useEffect(() => {
-        goodsList.forEach((e, i) => { e.serialNo = i + 1 });
-    }, [goodsList])
+    React.useEffect(() => {  goodsList.forEach((e, i) => { e.serialNo = i + 1 }) }, [goodsList])
 }

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

@@ -53,11 +53,15 @@
 .kts-invoice-operate-goods-list-table {
   border-bottom: 1px solid #dcdcdc;
 
+  .kts-invoice-operate-goods-be-discount,
   .kts-invoice-operate-goods-discount {
-    color     : rgba(0, 0, 0, 0.25);
     background: #f5f5f5;
   }
 
+  .kts-invoice-operate-goods-be-discount{
+    color: #D9001B;
+  }
+
   .kts-invoice-operate-goods-list-able-list-itemName-import {
     display: flex;
 

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

@@ -1,6 +1,7 @@
 import React from "react";
 import Invoice from '../../../../';
 import { LineAttributeType } from '../../../../InvoiceController'
+import classnames from 'classnames'
 
 export default function TableRow(props: any) {
 
@@ -8,13 +9,20 @@ export default function TableRow(props: any) {
 
     const goodsMap = controller.useMemo(s => s.goodsListState.goodsMap, [])
 
-    const isR = React.useMemo(() => {
+    const discount = React.useMemo(() => {
         const i = goodsMap.get(props['data-row-key']);
-        if (!i) return false;
-        return i.lineAttribute !== LineAttributeType.正常
+        if (!i) return undefined;
+
+        if (i.lineAttribute === LineAttributeType.折扣行) {
+            return 'kts-invoice-operate-goods-be-discount'
+        } else if (i.lineAttribute === LineAttributeType.被折扣行) {
+            return 'kts-invoice-operate-goods-discount'
+        } else {
+            return undefined;
+        }
     }, [props['data-row-key'], goodsMap])
 
     return (
-        <tr {...props} className={`${isR ? 'kts-invoice-operate-goods-discount ' : ''}${props.className}`} />
+        <tr {...props} className={classnames(props.className, discount)} />
     )
 }

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

@@ -89,10 +89,7 @@ export default function <T = any>(props: TableProps<T>) {
   }, [pointer, self, rowHeight]);
 
   return (
-    <span
-      className="kts-invoice-operate-goods-table-virtual"
-      ref={(e) => { setSelf(e) }}
-    >
+    <span className="kts-invoice-operate-goods-table-virtual" ref={(e) => { setSelf(e) }} >
       <Table {...props} dataSource={dataSource} />
     </span>
   );

package/d.dio

@@ -1,10 +0,0 @@
-<mxfile host="65bd71144e">
-    <diagram id="fPgEJXQJnfzUtXCRGjsd" name="第 1 页">
-        <mxGraphModel dx="1721" dy="1025" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-            <root>
-                <mxCell id="0"/>
-                <mxCell id="1" parent="0"/>
-            </root>
-        </mxGraphModel>
-    </diagram>
-</mxfile>