kts-component-invoice-operate 2.0.22 → 3.0.1

package/src/Invoice/ui/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/index.tsx

@@ -194,23 +194,12 @@ const DrawerBody = decorator<{}, FormComponentProps>(Form.create())((props) => {
           {getFieldDecorator('discount', {
             rules: [
               { required: true, message: '请输入折扣金额' },
-              {
-                pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
-                message: '请输入数字',
-              },
+              { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '请输入数字' },
               {
                 validator: (_, value: string, callback) => {
-                  if (!value) {
-                    callback();
-                    return;
-                  }
-                  if (!value.match(/^[+-]?(0|([1-9]\d*))(\.\d+)?$/)?.length) {
-                    callback();
-                    return;
-                  }
-                  if (parseFloat(value) > 100 || parseFloat(value) < 0) {
-                    callback('请输入大于0小于100的数字');
-                  }
+                  if (!value) { callback(); return; }
+                  if (!value.match(/^[+-]?(0|([1-9]\d*))(\.\d+)?$/)?.length) { callback(); return; }
+                  if (parseFloat(value) > 100 || parseFloat(value) < 0) { callback('请输入大于0小于100的数字'); }
                   callback();
                 },
               },
@@ -227,26 +216,12 @@ const DrawerBody = decorator<{}, FormComponentProps>(Form.create())((props) => {
           {getFieldDecorator('discolineAmountunt', {
             rules: [
               { required: true, message: '请输入折扣金额' },
-              {
-                pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/,
-                message: '请输入数字',
-              },
+              { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '请输入数字' },
               {
                 validator: (_, value: string, callback) => {
-                  if (!value) {
-                    callback();
-                    return;
-                  }
-                  if (!value.match(/^[+-]?(0|([1-9]\d*))(\.\d+)?$/)?.length) {
-                    callback();
-                    return;
-                  }
-                  if (
-                    parseFloat(value) > lineAmountSum ||
-                    parseFloat(value) < 0
-                  ) {
-                    callback('请输入大于0小于金额合计的数字');
-                  }
+                  if (!value) { callback(); return; }
+                  if (!value.match(/^[+-]?(0|([1-9]\d*))(\.\d+)?$/)?.length) { callback(); return; }
+                  if (parseFloat(value) > lineAmountSum || parseFloat(value) < 0) { callback('请输入大于0小于金额合计的数字'); }
                   callback();
                 },
               },
@@ -261,12 +236,8 @@ const DrawerBody = decorator<{}, FormComponentProps>(Form.create())((props) => {
         </Form.Item>
       </div>
       <div className="add-discount-row-footer">
-        <Button block style={{ marginBottom: 12 }} onClick={onClose}>
-          取消
-        </Button>
-        <Button type="primary" block onClick={onClickSave}>
-          保存
-        </Button>
+        <Button block style={{ marginBottom: 12 }} onClick={onClose}>取消</Button>
+        <Button type="primary" block onClick={onClickSave}>保存</Button>
       </div>
     </>
   );

package/src/Invoice/ui/GoodsList/ui/BulkMenu/hooks/useDelRowButton/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import Invoice from '../../../../../../';
 import LineAttributeType from '../../../../../../InvoiceController/InvoiceControllerState/GoodsListState/LineAttributeType';
-import { Menu } from 'kts-components-antd-x3';
+import { Button, Menu } from 'kts-components-antd-x3';
 
 export default () => {
 
@@ -53,5 +53,14 @@ export default () => {
     )
   }, [model, onClick, disabled])
 
-  return { menuItem };
+  const button = React.useMemo(() => {
+
+    if (model === 'prefab') return <></>;
+
+    return (
+      <Button onClick={onClick} disabled={disabled} >批量删除</Button>
+    )
+  }, [model, onClick, disabled])
+
+  return { button, menuItem };
 };

package/src/Invoice/ui/GoodsList/ui/BulkMenu/hooks/useEndowCodeButton/index.tsx

@@ -42,7 +42,7 @@ export default () => {
     )
   }, [onClick, disabled])
 
-  const buuton = React.useMemo(() => {
+  const button = React.useMemo(() => {
     return (
       <Button onClick={onClick} disabled={disabled}>
         批量赋码
@@ -50,5 +50,5 @@ export default () => {
     )
   }, [onClick, disabled])
 
-  return { menuItem, buuton };
+  return { menuItem, button };
 };

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,21 @@ 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={`${isR ? 'kts-invoice-operate-goods-discount ' : ''}${props.className}`} />
+        <tr {...props} className={classnames(props.className, discount)} />
     )
 }

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

@@ -49,10 +49,7 @@ const DrawerBody = () => {
 
   // const [editGood] = React.useState(controller.state.goodsListState.editGood);
 
-  React.useEffect(() => {
-    controller.getGoodsList &&
-      controller.getGoodsList({ pagination: { current: 1 } });
-  }, [controller]);
+  React.useEffect(() => { controller.getGoodsList && controller.getGoodsList({ pagination: { current: 1 } }) }, [controller]);
 
   return (
     <Table
@@ -65,66 +62,64 @@ const DrawerBody = () => {
       onRow={record => {
         return {
           onClick: () => {
-            controller.run(
-              async s => {
-                Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
-
-                // 导入时校验函数
-                if (await s.goodsListState.importGoods.verifyFn(record) === false) return;
-
-                // 没用 被编辑的货物 和 form 就退出
-                if (!s.goodsListState.editGood || !s.goodsListState.form) return;
-
-                if (s.goodsListState.editGood.lineAmountExcludeTax || s.goodsListState.editGood.lineAmountIncludeTax) {
-                  record.priceExcludeTax = s.goodsListState.editGood.priceExcludeTax;
-                  record.priceIncludeTax = s.goodsListState.editGood.priceIncludeTax;
-                  record.lineAmountExcludeTax = s.goodsListState.editGood.lineAmountExcludeTax;
-                  record.lineAmountIncludeTax = s.goodsListState.editGood.lineAmountIncludeTax;
-                }
-
-                // 中间数据
-                const between = { ...record };
-                between.itemName = getItemName(record, s.goodsListState.editGood);
-                between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood);
-
-                // 设置编辑货物
-                const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
-
-                if (editGood.taxRate) {
-                  editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood)
-                }
-
-                if (`${editGood.priceIncludeTax}` === '0') {
-                  editGood.priceIncludeTax = undefined;
-                  editGood.priceExcludeTax = undefined;
-                } else {
-                  editGood.priceExcludeTax = getPriceExcludeTax(editGood, record) as number;
-                }
-
-                if (editGood.quantity && editGood.priceIncludeTax) {
-                  editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax);
-                }
-
-                // 导入FORM里
-                if (s.goodsListState.isMyShow) {
-                  s.goodsListState.form.setFieldsValue({
-                    ...editGood,
-                    itemName: editGood.itemNameSelf,
-                    itemModelName: editGood.itemModelNameSelf,
-                  });
-                } else {
-                  s.goodsListState.form.setFieldsValue({
-                    ...editGood,
-                  });
-                }
-
-                s.goodsListState.importGoods.isVisibleDrawer = false;
-
-                s.goodsListState.isTaxIncluded
-                  ? updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
-                  : updateUnitPriceTax(controller, s.goodsListState.form, record)
+            controller.run(async s => {
+              Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
+
+              // 导入时校验函数
+              if (await s.goodsListState.importGoods.verifyFn(record) === false) return;
+
+              // 没用 被编辑的货物 和 form 就退出
+              if (!s.goodsListState.editGood || !s.goodsListState.form) return;
+
+              if (s.goodsListState.editGood.lineAmountExcludeTax || s.goodsListState.editGood.lineAmountIncludeTax) {
+                record.priceExcludeTax = s.goodsListState.editGood.priceExcludeTax;
+                record.priceIncludeTax = s.goodsListState.editGood.priceIncludeTax;
+                record.lineAmountExcludeTax = s.goodsListState.editGood.lineAmountExcludeTax;
+                record.lineAmountIncludeTax = s.goodsListState.editGood.lineAmountIncludeTax;
+              }
+
+              // 中间数据
+              const between = { ...record };
+              between.itemName = getItemName(record, s.goodsListState.editGood);
+              between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood);
+
+              // 设置编辑货物
+              const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
+
+              if (editGood.taxRate) {
+                editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood)
               }
-            )
+
+              if (`${editGood.priceIncludeTax}` === '0') {
+                editGood.priceIncludeTax = undefined;
+                editGood.priceExcludeTax = undefined;
+              } else {
+                editGood.priceExcludeTax = getPriceExcludeTax(editGood, record) as number;
+              }
+
+              if (editGood.quantity && editGood.priceIncludeTax) {
+                editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax);
+              }
+
+              // 导入FORM里
+              if (s.goodsListState.isMyShow) {
+                s.goodsListState.form.setFieldsValue({
+                  ...editGood,
+                  itemName: editGood.itemNameSelf,
+                  itemModelName: editGood.itemModelNameSelf,
+                });
+              } else {
+                s.goodsListState.form.setFieldsValue({
+                  ...editGood,
+                });
+              }
+
+              s.goodsListState.importGoods.isVisibleDrawer = false;
+
+              s.goodsListState.isTaxIncluded
+                ? updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
+                : updateUnitPriceTax(controller, s.goodsListState.form, record)
+            })
           }
         };
       }}