kts-component-invoice-operate 3.2.154 → 3.2.155

package/package.json

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

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

@@ -55,6 +55,9 @@ export default interface IGood {
   /** 金额(不含税) */
   lineAmountExcludeTax?: number;
 
+  /** 税率列表 */
+  goodsTaxRateList?: number[] | null;
+
   /** 税率 */
   taxRate?: number;
 

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

@@ -21,6 +21,9 @@ export default class GoodsListState {
   /** 切换含税时是否重新计算 */
   isRecalculateWhenSwitchTax = false;
 
+  /** 是否根据税收分类编码改变商品的可选税率 */
+  isUpdateGoodsTaxRateList = false;
+  
   /** 是否能添加折扣行 */
   isAddDiscount?: boolean;
 

package/src/Invoice/InvoiceController/index.ts

@@ -78,4 +78,8 @@ export default class InvoiceController extends InvoiceControllerForm {
 
   /** 获取筛选后的列表 */
   getGoodsSearch = getGoodsSearch;
+
+  /** 获取货物的税率可选列表, 如果没传taxClassificationCode，返回undefined */
+  getGoodsTaxRateList?: (taxClassificationCode: string) => Promise<number[] | undefined | null>;
+
 }

package/src/Invoice/ui/default/EndowCodeDrawer/index.tsx

@@ -53,6 +53,13 @@ export default () => {
           setDefaultValue(await getDefaultValue({ ...good }, endowcodeGoodIndex.length));
         } else {
           if (endowcodeGoodIndex.length === 1) {
+            if (controller.state.goodsListState.isUpdateGoodsTaxRateList && controller.getGoodsTaxRateList && good.taxClassificationCode) {
+              const goodsTaxRateList = await controller.getGoodsTaxRateList(good.taxClassificationCode);
+              good.goodsTaxRateList = goodsTaxRateList;
+              // if (good.taxRate !== undefined && good.taxRate !== null && !goodsTaxRateList.includes(good.taxRate)) {
+              //   good.taxRate = undefined;
+              // }
+            }
             setDefaultValue(good);
           } else {
             setDefaultValue({ taxRate: good.taxRate } as any);
@@ -111,7 +118,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
   }, [])
 
   /** 税率列表 */
-  const taxRateList = controller.useMemo(s => s.goodsListState.taxRateList.map((e) => ({ label: `${e}%`, value: e })), []);
+  const taxRateList = controller.useMemo(s => s.goodsListState.taxRateList, []);
 
   /** 免税类型 列表 */
   const taxFreeTypeList = controller.useMemo(s => s.goodsListState.endowCode.taxFreeTypeList, []);
@@ -125,6 +132,13 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
   /** 税率 */
   const [taxRate, setTaxRate] = React.useState<number>(0);
 
+  /** 商品可用税率 */
+  const [goodsTaxRateList, setGoodsTaxRateList] = React.useState<number[] | null | undefined>(defaultValue.goodsTaxRateList);
+
+  const formattedTaxRateList = React.useMemo(() => {
+    return (goodsTaxRateList || taxRateList).map((e) => ({ label: `${e}%`, value: e }))
+  }, [goodsTaxRateList, taxRateList])
+
   /** 税收分类编码 选择组件 */
   const ShowSearch = React.useCallback(props => {
 
@@ -342,6 +356,25 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
     }, []);
 
     const onSelect = React.useCallback((key: any, info: any) => {
+
+      // 根据税编改变税率列表
+      // 如果只有一个，默认选中，有多个时，置空，用户手选
+      if (controller.state.goodsListState.isUpdateGoodsTaxRateList) {
+        if (info.node.taxRateList?.length) {
+          setGoodsTaxRateList(info.node.taxRateList);
+        }
+        if (!readOnlyTaxRate) {
+          actions.setFieldState('taxRate', async s => {
+            if (info.node.taxRateList && info.node.taxRateList?.length === 1) {
+              s.value = info.node.taxRateList[0]
+            } else {
+              s.value = undefined
+            }
+          });
+
+        }
+      }
+
       // !readOnlyTaxRate && actions.setFieldState('taxRate', async s => {
       //   if (info.node.taxRate || info.taxRate === 0) {
       //     s.value = info.node.taxRate
@@ -437,12 +470,15 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
           good.priceExcludeTax = countPrice(good.lineAmountExcludeTax, good.quantity, controller.state.calculatingDigits) as any;
         }
 
+        //赋值商品的可用税率
+        good.goodsTaxRateList = goodsTaxRateList;
+
       });
 
       s.goodsListState.goodsList = s.goodsListState.goodsList.slice();
       s.goodsListState.endowCode.endowcodeGoodIndex = [];
     })();
-  }, [controller]);
+  }, [controller, goodsTaxRateList]);
 
   const effects = React.useCallback(() => {
     // 税率变化
@@ -493,7 +529,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
           title="税率"
           x-component-props={{ disabled: readOnlyTaxRate }}
           default={defaultValue?.taxRate ?? 0}
-          enum={taxRateList}
+          enum={formattedTaxRateList}
           x-rules={[{ message: '请选择税率', required: true }]}
         />
         {taxRate === 0 && isTaxFreeTypeNeeded &&

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

@@ -517,7 +517,7 @@ export default (form: WrappedFormUtils) => {
                       onChangeTaxRate(controller, form, record);
                     }}
                   >
-                    {taxRateList.map((e, i) => {
+                    {(record.goodsTaxRateList || taxRateList).map((e, i) => {
                       return (
                         <Select.Option key={i} value={e}>
                           {e}%

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

@@ -26,8 +26,20 @@ export default () => {
         if (editGood.$index === record.$index) return;
         await controller.saveEditGood();
         await controller.wait();
+        if (controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList ) {
+          record.goodsTaxRateList = await controller.getGoodsTaxRateList(record.taxClassificationCode);
+          // if (record.taxRate !== undefined && record.taxRate !== null && !record.goodsTaxRateList.includes(record.taxRate)) {
+          //   record.taxRate = undefined;
+          // }
+        }
         await controller.pipeline(async s => { s.goodsListState.editGood || (await controller.setEditGood(record)) })();
       } else {
+        if (controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList ) {
+          record.goodsTaxRateList = await controller.getGoodsTaxRateList(record.taxClassificationCode);
+          // if (record.taxRate !== undefined && record.taxRate !== null && !record.goodsTaxRateList.includes(record.taxRate)) {
+          //   record.taxRate = undefined;
+          // }
+        }
         await controller.setEditGood(record);
       }
     },

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

@@ -111,7 +111,7 @@ export default () => {
         onSelect,
         selectedRowKeys,
         getCheckboxProps: (record: any) => {
-            console.log('===> getCheckboxProps', record, record.level)
+            // console.log('===> getCheckboxProps', record, record.level)
             return {
                 disabled: record.level > 0,
                 style: record.level > 0 ? { display: 'none' } : undefined

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

@@ -117,7 +117,7 @@ export default function <T extends object = any>(props: TableProps<T>) {
         cont.scrollTop = 0;
     }, [props.dataSource?.length])
 
-    console.log('===> pointer', pointer, dataSource);
+    // console.log('===> pointer', pointer, dataSource);
 
     return (
         <span className="kts-invoice-operate-goods-table-virtual" ref={(e) => { setSelf(e) }} >

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

@@ -35,6 +35,9 @@ export default (form: WrappedFormUtils) => {
   /** 组件模式 */
   const model = controller.useMemo(e => e.model, []);
 
+  /** 计算类型 */
+  const calculateType = controller.useMemo(e => e.goodsListState.calculateType, []);
+
   /** 是否显示我方 */
   const isMyShow = controller.useMemo(e => e.goodsListState.isMyShow, []);
 
@@ -104,7 +107,7 @@ export default (form: WrappedFormUtils) => {
         title: <TitleText required >项目名称</TitleText>,
         key: 'itemName',
         render: (_: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('itemName')) {
+          if (editGood?.$index === record.$index && !disableds.includes('itemName') && model !== 'prefab') {
             return (
               <Form.Item>
                 <div style={{ display: 'flex' }} >
@@ -165,7 +168,7 @@ export default (form: WrappedFormUtils) => {
         key: 'itemModelName',
         width: 119,
         render: (_: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('itemModelName')) {
+          if (editGood?.$index === record.$index && !disableds.includes('itemModelName') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('itemModelName', {
@@ -200,7 +203,7 @@ export default (form: WrappedFormUtils) => {
         key: 'unit',
         width: 70,
         render: (_: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('unit')) {
+          if (editGood?.$index === record.$index && !disableds.includes('unit') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('unit', {
@@ -231,7 +234,7 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 149,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('quantity')) {
+          if (editGood?.$index === record.$index && !disableds.includes('quantity') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('quantity', {
@@ -275,7 +278,7 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 149,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('priceIncludeTax')) {
+          if (editGood?.$index === record.$index && !disableds.includes('priceIncludeTax') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('priceIncludeTax', {
@@ -319,7 +322,7 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 149,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('priceExcludeTax')) {
+          if (editGood?.$index === record.$index && !disableds.includes('priceExcludeTax') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('priceExcludeTax', {
@@ -363,7 +366,7 @@ export default (form: WrappedFormUtils) => {
         width: 119,
         align: 'right',
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('lineAmountIncludeTax')) {
+          if (editGood?.$index === record.$index && !disableds.includes('lineAmountIncludeTax') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('lineAmountIncludeTax', {
@@ -412,7 +415,7 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 119,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('lineAmountExcludeTax')) {
+          if (editGood?.$index === record.$index && !disableds.includes('lineAmountExcludeTax') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('lineAmountExcludeTax', {
@@ -454,7 +457,7 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 70,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('taxRate')) {
+          if (editGood?.$index === record.$index && !disableds.includes('taxRate') && !(model === 'prefab' && calculateType === '3')) {
             return (
               <Form.Item>
                 {getFieldDecorator('taxRate', {
@@ -476,7 +479,7 @@ export default (form: WrappedFormUtils) => {
                       onChangeTaxRate(controller, form, record);
                     }}
                   >
-                    {taxRateList.map((e, i) => {
+                    {(record.goodsTaxRateList || taxRateList).map((e, i) => {
                       return (
                         <Select.Option key={i} value={e}>
                           {e}%
@@ -542,7 +545,7 @@ export default (form: WrappedFormUtils) => {
           ellipsis: true,
         };
       }) as any[];
-  }, [isTaxIncluded, editGood, controller, taxRateList, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, isStart]);
+  }, [isTaxIncluded, editGood, controller, taxRateList, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, isStart, calculateType]);
 
   // React.useEffect(() => {
   //   clearTimeout(t)

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

@@ -15,7 +15,7 @@ export default () => {
 
   const onClick = React.useCallback(
     async (record: IGood) => {
-      if (model === 'prefab') return;
+      // if (model === 'prefab') return;
       if (model === 'readOnly') return;
 
       const editGood = controller.state.goodsListState.editGood;
@@ -25,8 +25,20 @@ export default () => {
         if (editGood.$index === record.$index) return;
         await controller.saveEditGood();
         await controller.wait();
+        if (controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList ) {
+          record.goodsTaxRateList = await controller.getGoodsTaxRateList(record.taxClassificationCode);
+          // if (record.taxRate !== undefined && record.taxRate !== null && !record.goodsTaxRateList.includes(record.taxRate)) {
+          //   record.taxRate = undefined;
+          // }
+        }
         await controller.pipeline(async s => { s.goodsListState.editGood || (await controller.setEditGood(record)) })();
       } else {
+        if (controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList ) {
+          record.goodsTaxRateList = await controller.getGoodsTaxRateList(record.taxClassificationCode);
+          // if (record.taxRate !== undefined && record.taxRate !== null && !record.goodsTaxRateList.includes(record.taxRate)) {
+          //   record.taxRate = undefined;
+          // }
+        }
         await controller.setEditGood(record);
       }
     },