kts-component-invoice-operate 2.0.13 → 2.0.16

package/package.json

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

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

@@ -2,8 +2,9 @@
 import React from "react";
 import { Row, Col, Input, Button, message } from "kts-components-antd-x3";
 import { Form, Drawer } from "kts-xui";
-import { Invoice } from "../../../";
+import { Invoice, IGood } from "../../../";
 import { getSN } from "../../tools/itemName";
+import { LineAttributeType } from "../../InvoiceController";
 
 export default function AddComparisonDrawer() {
 
@@ -32,13 +33,22 @@ export default function AddComparisonDrawer() {
             try {
                 const values = await form.validateFields()
                 const shorthand = s.goodsListState.isMyShow ? getSN(good.itemNameSelf)?.shorthand : getSN(good.itemName)?.shorthand;
-
-                good.itemCode = values.itemCode;
-                good.itemCodeSelf = values.itemCodeSelf;
-                good.itemName = shorthand ? `*${shorthand}*${values.itemName}` : values.itemName;
-                good.itemNameSelf = shorthand ? `*${shorthand}*${values.itemNameSelf}` : values.itemNameSelf;
-                good.itemModelName = values.itemModelName;
-                good.itemModelNameSelf = values.itemModelNameSelf;
+                const setGood = (good: IGood) => {
+                    good.itemCode = values.itemCode;
+                    good.itemCodeSelf = values.itemCodeSelf;
+                    good.itemName = shorthand ? `*${shorthand}*${values.itemName}` : values.itemName;
+                    good.itemNameSelf = shorthand ? `*${shorthand}*${values.itemNameSelf}` : values.itemNameSelf;
+                    good.itemModelName = values.itemModelName;
+                    good.itemModelNameSelf = values.itemModelNameSelf;
+                }
+
+                setGood(good);
+
+                if (good.lineAttribute !== LineAttributeType.正常) {
+                    const c = good.lineAttribute === LineAttributeType.折扣行 ? -1 : good.lineAttribute === LineAttributeType.被折扣行 ? 1 : 0
+                    const g = s.goodsListState.goodsList[s.goodsListState.goodsList.indexOf(good) + c]
+                    setGood(g);
+                }
 
                 s.goodsListState.addComparisonIndex = undefined;
                 s.goodsListState.goodsList = [...s.goodsListState.goodsList];

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

@@ -329,26 +329,26 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
       });
 
       //截取名称
-      if (endowCodeGood.some(e => bytesLnegth(e?.itemName || '') > 92)) {
-        await (() => new Promise<void>(resolve => {
-          confirm({
-            title: '温馨提示',
-            content: '商品名称长度过长,是否截取名称',
-            okText: '确定',
-            cancelText: '取消',
-            onOk() {
-              endowCodeGood.forEach(e => {
-                if (e && e.itemName) { e.itemName = cutStr(e.itemName, 91) }
-              })
-              message.success('商品名称截取成功！')
-              resolve()
-            },
-            onCancel() {
-              resolve()
-            },
-          });
-        }))()
-      }
+      // if (endowCodeGood.some(e => bytesLnegth(e?.itemName || '') > 92)) {
+      //   await (() => new Promise<void>(resolve => {
+      //     confirm({
+      //       title: '温馨提示',
+      //       content: '商品名称长度过长,是否截取名称',
+      //       okText: '确定',
+      //       cancelText: '取消',
+      //       onOk() {
+      //         endowCodeGood.forEach(e => {
+      //           if (e && e.itemName) { e.itemName = cutStr(e.itemName, 91) }
+      //         })
+      //         message.success('商品名称截取成功！')
+      //         resolve()
+      //       },
+      //       onCancel() {
+      //         resolve()
+      //       },
+      //     });
+      //   }))()
+      // }
 
       s.goodsListState.goodsList = s.goodsListState.goodsList.slice();
       s.goodsListState.endowCode.endowcodeGoodIndex = [];

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Form, AutoComplete, Select, Typography, Button, Input, Spin } from 'kts-components-antd-x3';
+import { Form, AutoComplete, Select, Typography, Button, Input, Spin, Tooltip } from 'kts-components-antd-x3';
 import { InputProps } from 'kts-components-antd-x3/lib/input';
 import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
 import { IGood } from '../../../../InvoiceController';
@@ -174,7 +174,7 @@ export default (form: WrappedFormUtils) => {
                       // const key = isMyShow ? 'unit' : 'unitOther';
                       // const value = {} as any;
                       // value[key] = form.getFieldsValue().unit;
-                      controller.setEditGood({unit: form.getFieldsValue().unit});
+                      controller.setEditGood({ unit: form.getFieldsValue().unit });
                     }}
                   />,
                 )}
@@ -549,21 +549,29 @@ class MyItemNameDiv extends React.Component<{ valueT?: React.ReactNode, valueF?:
     if (isMyShow) {
       if (valueT) {
         return (
-          <span style={{ padding: '0 10px', color: '#0074ff' }}>{valueT}</span>
+          <Tooltip title={valueT}>
+            <span style={{ padding: '0 10px', color: '#0074ff' }}>{valueT}</span>
+          </Tooltip>
         )
       } else {
         return (
-          <span style={{ padding: '0 10px' }}>{valueF}</span>
+          <Tooltip title={valueF}>
+            <span style={{ padding: '0 10px' }}>{valueF}</span>
+          </Tooltip>
         )
       }
     } else {
       if (valueF) {
         return (
-          <span style={{ padding: '0 10px' }}>{valueF}</span>
+          <Tooltip title={valueF}>
+            <span style={{ padding: '0 10px' }}>{valueF}</span>
+          </Tooltip>
         )
       } else {
         return (
-          <span style={{ padding: '0 10px', color: '#0074ff' }}>{valueT}</span>
+          <Tooltip title={valueT}>
+            <span style={{ padding: '0 10px', color: '#0074ff' }}>{valueT}</span>
+          </Tooltip>
         )
       }
     }