kts-component-invoice-operate 1.2.25 → 2.0.2

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

@@ -0,0 +1,37 @@
+
+import React from 'react';
+import { Switch, Icon, Tooltip } from 'kts-components-antd-x3';
+import Invoice from '../../../../';
+
+export default () => {
+
+    const controller = Invoice.useInvoiceController();
+
+    const productComparison = controller.useMemo(s => s.goodsListState.productComparison, [])
+
+    const isMyShow = controller.useMemo(s => s.goodsListState.isMyShow, []);
+
+    const onChange = React.useCallback(e => {
+        controller.run(async s => s.goodsListState.isMyShow = !s.goodsListState.isMyShow)
+    }, [])
+
+    if (!productComparison.onComply) return <></>;
+
+    return (
+        <span>
+            <label style={{ marginRight: 2 }} >
+                <Tooltip title="蓝色代表我方商品描述，黑色代表对方的商品描述。">
+                    <Icon style={{ marginRight: 3 }} type="info-circle" />
+                </Tooltip>
+                使用哪方商品描述:
+            </label>
+            <Switch
+                checked={isMyShow}
+                checkedChildren="我方"
+                unCheckedChildren="对方"
+                defaultChecked
+                onChange={onChange}
+            />
+        </span>
+    )
+}

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

@@ -14,12 +14,12 @@ export default () => {
     const isSwitchTax = controller.useMemo(e => e.goodsListState.isSwitchTax, []);
 
     const onChange = React.useCallback(e => {
-        controller.pipeline(async s => { s.goodsListState = { ...s.goodsListState, isTaxIncluded: e } })()
+        controller.pipeline(async s => { s.goodsListState = { ...s.goodsListState, isTaxIncluded: e } })();
     }, [])
 
     return (
         <span>
-            <label>含税:</label>
+            <label style={{ marginRight: 2 }}>含税:</label>
             <Switch
                 disabled={isSwitchTax === false}
                 checked={isTaxIncluded}

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

@@ -1,8 +1,9 @@
 import React from 'react';
-import { Drawer, message, Table } from 'kts-components-antd-x3';
+import { Drawer, Table } from 'kts-components-antd-x3';
 import Invoice from '../../';
 import { updateUnitPriceExcludingTax, updateUnitPriceTax, dutyFree, format15 } from '../GoodsList/hook/useColumns/autoFillFn';
 import { countAmountIncludeTax } from '../../tools/calculate'
+import { getSN } from '../../tools/itemName'
 import { IGood } from '../../InvoiceController';
 import evaluate from '../../tools/evaluate';
 
@@ -68,8 +69,10 @@ const DrawerBody = () => {
               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) {
@@ -79,25 +82,42 @@ const DrawerBody = () => {
                   record.lineAmountIncludeTax = s.goodsListState.editGood.lineAmountIncludeTax;
                 }
 
-                s.goodsListState.editGood = { ...s.goodsListState.editGood, ...record };
-                if (!s.goodsListState.editGood) return;
+                // 中间数据
+                const between = { ...record };
+                between.itemName = getItemName(record, s.goodsListState.editGood);
+                between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood);
 
-                if(s.goodsListState.editGood.taxRate)
-                  s.goodsListState.editGood.taxRate = dutyFree(controller, s.goodsListState.editGood.taxRate, s.goodsListState.form, s.goodsListState.editGood)
+                // 设置编辑货物
+                const editGood: IGood = s.goodsListState.editGood = { ...s.goodsListState.editGood, ...between };
 
-                if (`${s.goodsListState.editGood.priceIncludeTax}` === '0') {
-                  s.goodsListState.editGood.priceIncludeTax = undefined;
-                  s.goodsListState.editGood.priceExcludeTax = undefined;
+                if (editGood.taxRate) {
+                  editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood)
+                }
+
+                if (`${editGood.priceIncludeTax}` === '0') {
+                  editGood.priceIncludeTax = undefined;
+                  editGood.priceExcludeTax = undefined;
                 } else {
-                  s.goodsListState.editGood.priceExcludeTax = getPriceExcludeTax(s.goodsListState.editGood, record) as number;
+                  editGood.priceExcludeTax = getPriceExcludeTax(editGood, record) as number;
                 }
 
-                if (s.goodsListState.editGood.quantity && s.goodsListState.editGood.priceIncludeTax)
-                  s.goodsListState.editGood.lineAmountIncludeTax = countAmountIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
+                if (editGood.quantity && editGood.priceIncludeTax) {
+                  editGood.lineAmountIncludeTax = countAmountIncludeTax(editGood.quantity, editGood.priceIncludeTax);
+                }
 
-                s.goodsListState.editGood.itemName = getItemName(record);
+                // 导入FORM里
+                if (s.goodsListState.isMyShow) {
+                  s.goodsListState.form.setFieldsValue({
+                    ...editGood,
+                    itemName: editGood.itemNameSelf,
+                    itemModelName: editGood.itemModelNameSelf,
+                  });
+                } else {
+                  s.goodsListState.form.setFieldsValue({
+                    ...editGood,
+                  });
+                }
 
-                s.goodsListState.form.setFieldsValue(s.goodsListState.editGood as any);
                 s.goodsListState.importGoods.isVisibleDrawer = false;
 
                 s.goodsListState.isTaxIncluded
@@ -113,11 +133,11 @@ const DrawerBody = () => {
 };
 
 /** 货物名称 */
-const getItemName = (record: any) => {
-  return record.shorthand
-    ? `*${record.shorthand}*${record.itemName}`
-    : record.itemName;
-};
+// const getItemName = (record: any) => {
+//   return record.shorthand
+//     ? `*${record.shorthand}*${record.itemName}`
+//     : record.itemName;
+// };
 
 /** 货物单价，不含税 */
 const getPriceExcludeTax = (s: IGood, record: any) => {
@@ -126,3 +146,35 @@ const getPriceExcludeTax = (s: IGood, record: any) => {
   // 单价(含税)/(1+税率) = 单价(不含税)
   return format15(evaluate(`${record.priceIncludeTax} / (1+${s.taxRate}/100)`));
 };
+
+// 获取我方名称
+const getItemName = (record: any, editGood: IGood) => {
+
+  let shorthand;
+
+  shorthand = record.shorthand;
+  if (shorthand) {
+    return `*${shorthand}*${record.itemName}`;
+  }
+
+  shorthand = getSN(editGood.itemName)?.shorthand;
+  if (shorthand) {
+    return `*${shorthand}*${record.itemNameSelf}`;
+  }
+
+  return record.itemName;
+}
+
+// 获取他方名称
+const getItemNameOther = (record: any, editGood: IGood) => {
+  if (!editGood.itemName) return editGood.itemName;
+
+  let shorthand;
+
+  shorthand = record.shorthand;
+  if (shorthand) {
+    return `*${shorthand}*${record.itemNameSelf}`;
+  }
+
+  return record.itemName;
+}

package/src/index.ts

@@ -3,3 +3,4 @@ import 'kts-components-antd-x3/dist/kts-components-antd-x3.css';
 
 export { default as Invoice } from './Invoice';
 export { default as InvoiceController } from './Invoice/InvoiceController';
+export type { default as IGood } from './Invoice/InvoiceController/InvoiceControllerState/GoodsListState/IGood';