kts-component-invoice-operate 3.2.246 → 3.2.248

package/src/Invoice/Invoice-digtal/index.md

@@ -26,20 +26,19 @@
 <code src="./_test/disabled/index.tsx"></code>
 
 ## 导入关系人
-<code src="./_test/importStakeholder/index.tsx"></code>
+<code src="./_test/importStakeholder/index.tsx"></code>-->
+
+
 
 ## 导入项目
 <code src="./_test/importGoods/index.tsx"></code>
 
-## 预制模式
+<!-- ## 预制模式
 <code src="./_test/prefab/index.tsx"></code>
 
 ## 查看当前可用授信额度
-<code src="./_test/lineCredit/index.tsx"></code>
-
+<code src="./_test/lineCredit/index.tsx"></code> -->
 
 
--->
-<!-- 
 ## 货物运输服务
-<code src="./_test/freight/index.tsx"></code>  -->
+<code src="./_test/freight/index.tsx"></code>  

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

@@ -88,4 +88,6 @@ export default interface IGood {
   cd?:number
 
   remarks?:string;
+  /** 煤炭种类 */
+  mtzlDm?:string; 
 }

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

@@ -23,7 +23,7 @@ export default class GoodsListState {
 
   /** 是否根据税收分类编码改变商品的可选税率 */
   isUpdateGoodsTaxRateList = false;
-  
+
   /** 是否能添加折扣行 */
   isAddDiscount?: boolean;
 
@@ -131,4 +131,20 @@ export default class GoodsListState {
   /** 商品校验是否关闭，默认开启 */
   isValidateGood = true;
 
+  /** 煤炭类校验是否关闭，默认开启 */
+  isValidateMeiTan = true;
+
+  /** 煤炭种类赋值商品索引 */
+  meiTanGoodIndex?: string[] = [];
+
+  /** 煤炭时校验函数 */
+  verifyMeiTanFn: (record: any) => Promise<boolean> = async record => {
+    const { taxClassificationCode } = record;
+    if (taxClassificationCode === '1020101000000000000' || taxClassificationCode === '1020102000000000000' || taxClassificationCode === '1020199000000000000') {
+      return true;
+    }
+
+    return false;
+  };
+
 }

package/src/Invoice/_test/importGoods/index.tsx

@@ -147,6 +147,40 @@ class MyInvoiceController extends InvoiceController {
     this.state.goodsListState.endowCode.onSearchTaxClassificationCode = async (value: any) => {
       console.log(value, 'value-onSearchTaxClassificationCode');
 
+      if(value === '1020199000000000000') {
+        return [
+          {
+            "taxCategoryCode": "1020199000000000000",
+            "productName": "其他煤炭",
+            "shorthand": "其他煤炭",
+            "id": null,
+            "specification": null,
+            "createTime": "Tue Jun 20 14:55:37 CST 2023",
+            "status": 1,
+            "versionCode": "48.0",
+            "version": "32.0",
+            "startTime": "20190401",
+            "endTime": null,
+            "cargo": null,
+            "desc": null,
+            "taxRate": "",
+            "keyword": "金融服务",
+            "summarizedItem": "Y",
+            "countCode": null,
+            "customsItem": null,
+            "updateTime": "Tue Jun 20 14:55:37 CST 2023",
+            "hzx": "Y",
+            "children": null,
+            "vatspecialManagement": "",
+            "pid": "3000000000000000000",
+            "vatpolicyBasis": null,
+            "vatspecialManagementCode": "",
+            "gstpolicyBasisCode": null,
+            "gstspecialManagement": null,
+            "gstpolicyBasis": null
+          },
+        ]
+      }
       return [
         {
           "taxCategoryCode": "1030206030000000000",
@@ -183,6 +217,40 @@ class MyInvoiceController extends InvoiceController {
 
     this.state.goodsListState.endowCode.onLoadTaxClassificationCode = async (value: any) => {
       console.log(value, 'value-onSearchTaxClassificationCode');
+      if(value === '1020199000000000000') {
+        return [
+          {
+            "taxCategoryCode": "1020199000000000000",
+            "productName": "其他煤炭",
+            "shorthand": "其他煤炭",
+            "id": null,
+            "specification": null,
+            "createTime": "Tue Jun 20 14:55:37 CST 2023",
+            "status": 1,
+            "versionCode": "48.0",
+            "version": "32.0",
+            "startTime": "20190401",
+            "endTime": null,
+            "cargo": null,
+            "desc": null,
+            "taxRate": "",
+            "keyword": "金融服务",
+            "summarizedItem": "Y",
+            "countCode": null,
+            "customsItem": null,
+            "updateTime": "Tue Jun 20 14:55:37 CST 2023",
+            "hzx": "Y",
+            "children": null,
+            "vatspecialManagement": "",
+            "pid": "3000000000000000000",
+            "vatpolicyBasis": null,
+            "vatspecialManagementCode": "",
+            "gstpolicyBasisCode": null,
+            "gstspecialManagement": null,
+            "gstpolicyBasis": null
+          },
+        ]
+      }
       if(value === '3000000000000000000') {
         return [
           {
@@ -809,7 +877,7 @@ const getMok = async (current: number = 1) => {
       "id": 146200,
       "internalNumber": "发动机盖",
       "isUalityInspection": null,
-      "name": "发动机ABC",
+      "name": "原煤",
       "preferentialPoliciesType": null,
       "priceAmount": 50,
       "procurementCycle": 0,
@@ -817,7 +885,7 @@ const getMok = async (current: number = 1) => {
       "specification": "abc",
       "spuCode": "6000001738252675",
       "status": 1,
-      "taxCategoryCode": "1090102040000000000",
+      "taxCategoryCode": "1020101000000000000",
       "taxExemptionType": "",
       "taxId": 11,
       "taxRate": null,
@@ -825,13 +893,13 @@ const getMok = async (current: number = 1) => {
       "unitName": "件",
       "itemType": "通用",
       "itemNo": "6000001738252675",
-      "itemName": "发动机ABC---",
+      "itemName": "原煤",
       "itemCode": "123123",
       "itemModelName": "abc",
       "unit": "件",
       "priceIncludeTax": 50,
       "priceExcludeTax": 50,
-      "taxClassificationCode": "1090102040000000000"
+      "taxClassificationCode": "1020101000000000000"
     },
     {
       "attributeVOList": null,

package/src/Invoice/index.md

@@ -1,13 +1,13 @@
 # 默认
 
-<!-- ## 简单用法
+## 简单用法
 <code src="./_test/easiest/index.tsx"></code>
 
 ## 设置为草稿，设置默认参数 扩展按钮
 <code src="./_test/draft/index.tsx" title="类似的操作,请查看API" ></code>
 
 ## 设置购买方名称搜索 
-<code src="./_test/buyerNameSearch/index.tsx"></code> -->
+<code src="./_test/buyerNameSearch/index.tsx"></code>
 
 ## 设置扣除额（差额征税）
 <code src="./_test/deduction/index.tsx"></code>
@@ -37,7 +37,7 @@
 <code src="./_test/goodsMenuExpand/index.tsx" title="查看 Console" ></code>
 
 ## 设置数据源 获取发票单据编号
-<code src="./_test/setDataSource/index.tsx" ></code>
+<code src="./_test/setDataSource/index.tsx" ></code>-->
 
 ## 设置数据源 导入购买方
 <code src="./_test/importBuyer/index.tsx"></code>
@@ -48,9 +48,9 @@
 ## 设置数据源 赋码 税收分类编码列表
 <code src="./_test/endowCode/index.tsx"></code>
 
-<API name="Invoice 发票组件 API" exports='["default"]' src="./index.tsx" ></API>
+<!-- <API name="Invoice 发票组件 API" exports='["default"]' src="./index.tsx" ></API>
 <API name="InvoiceHeader 发票头 API" exports='["default"]' src="./ui/default/InvoiceHeader/index.tsx"></API>
 <API name="GoodsList 商品列表 API" exports='["default"]' src="./ui/default/GoodsList/index.tsx"></API>
 <API name="Buyer 购买方 API" exports='["default"]' src="./ui/default/Buyer/index.tsx"></API>
 <API name="Seller 销售方 API" exports='["default"]' src="./ui/default/Seller/index.tsx"></API>
-<API name="Sign 落款 API" exports='["default"]' src="./ui/default/Sign/index.tsx"></API> -->
+<API name="Sign 落款 API" exports='["default"]' src="./ui/default/Sign/index.tsx"></API>  --> 

package/src/Invoice/index.tsx

@@ -27,6 +27,7 @@ import ImportBuyerDrawer from './ui/default/ImportBuyerDrawer';
 import ImportGoodsDrawer from './ui/default/ImportGoodsDrawer';
 import EndowCodeDrawer from './ui/default/EndowCodeDrawer';
 import AddComparisonDrawer from './ui/default/AddComparisonDrawer';
+import MeiTanModal from './ui/default/MeiTanModal';
 // import { create, all } from 'mathjs';
 // const config = {
 //   number: 'BigNumber',
@@ -164,6 +165,7 @@ const Main = (props: IInvoiceProps) => {
       <ImportGoodsDrawer />{/*         导入货品的抽屉 */}
       <EndowCodeDrawer />{/*           给货品赋码的抽屉 */}
       <AddComparisonDrawer />{/*       添加商品对照的抽屉 */}
+      <MeiTanModal /> {/*       煤炭类弹框 */}
     </InvoiceContext.Provider>
   );
 };
@@ -193,6 +195,7 @@ const Digtal = (props: IInvoiceProps) => {
 
       <ImportGoodsDrawer />{                                  /** 导入货品的抽屉   */}
       <EndowCodeDrawer />{                                    /** 给货品赋码的抽屉 */}
+      <MeiTanModal /> {/*       煤炭类弹框 */}
     </InvoiceContext.Provider>
   )
 }

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

@@ -317,9 +317,9 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
     const [list, setList] = React.useState<any>([]);
 
     const onSearch = React.useCallback(async (value: any = null) => {
-      if(value?.target?.value){
+      if (value?.target?.value) {
         const arr = await controller.state.goodsListState.endowCode.onSearchTaxClassificationCode(value?.target?.value);
-        const list: any[] = arr.map((item: any)=> {
+        const list: any[] = arr.map((item: any) => {
           return {
             ...item,
             title: `${item.productName} ${item.taxCategoryCode}`,
@@ -335,7 +335,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
 
     const onLoad = React.useCallback(async (value?: any) => {
       const arr = await controller.state.goodsListState.endowCode.onLoadTaxClassificationCode(value?.taxCategoryCode);
-      const data: any[] = arr.map((item: any)=> {
+      const data: any[] = arr.map((item: any) => {
         return {
           ...item,
           title: `${item.productName} ${item.taxCategoryCode}`,
@@ -345,8 +345,8 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
 
       const treeData = optimizeTreeData(data);
 
-      if(value?.key) {
-        setList((origin: any)=> {
+      if (value?.key) {
+        setList((origin: any) => {
           updateTreeData(origin, value.key, treeData)
         });
       } else {
@@ -386,20 +386,20 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
       // });
       let node = info.node || info;
       actions.setFieldState('taxClassificationCode', async s => {
-        if(node.taxCategoryCode) {
+        if (node.taxCategoryCode) {
           s.value = node.taxCategoryCode
         }
       });
 
       actions.setFieldState('shorthand', async (s) => {
-        if (node.shorthand){
+        if (node.shorthand) {
           s.value = node.shorthand
         }
-      }); 
+      });
       setOpen(false);
     }, [controller, actions]);
 
-    const onSelect = React.useCallback((key: any, info: any) => { 
+    const onSelect = React.useCallback((key: any, info: any) => {
       let node = info.node || info;
       if (controller.state.goodsListState.isUpdateGoodsTaxRateList) {
         if (node.taxRateList?.length) {
@@ -421,7 +421,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
     }, [controller, actions]);
 
     const optimizeTreeData = (data: any): any => {
-      return data.map((item: any)=> {
+      return data.map((item: any) => {
         return {
           ...item,
           selectable: item?.hzx === 'N',
@@ -459,7 +459,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
           info={info}
           onSelect={onSelect}
           onSubmit={onSubmit1}
-          onCancel={()=> {setOpen(false); setInfo({})}}
+          onCancel={() => { setOpen(false); setInfo({}) }}
           onSearch={onSearch}
           onLoad={onLoad}
         />
@@ -486,11 +486,12 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
         good.taxFreeType = values.taxFreeType;
         good.favouredPolicyMark = values.favouredPolicyMark;
         good.favouredPolicyName = values.favouredPolicyName;
+        good.mtzlDm = undefined; //设置成空
 
         // 无论是否含税，都保持价税合计不变
         good.taxAmount = countTaxAmount(good.lineAmountIncludeTax || 0, s.goodsListState.deduction, values.taxRate);
-        if (good.taxAmount || good.taxAmount === 0 ) {
-          good.lineAmountExcludeTax = countAmountExcludeTax(good.lineAmountIncludeTax || 0, good.taxAmount); 
+        if (good.taxAmount || good.taxAmount === 0) {
+          good.lineAmountExcludeTax = countAmountExcludeTax(good.lineAmountIncludeTax || 0, good.taxAmount);
         }
         if (good.lineAmountExcludeTax && good.quantity) {
           good.priceExcludeTax = countPrice(good.lineAmountExcludeTax, good.quantity, controller.state.calculatingDigits) as any;
@@ -500,8 +501,15 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
         good.goodsTaxRateList = goodsTaxRateList;
 
       });
-
       s.goodsListState.goodsList = s.goodsListState.goodsList.slice();
+
+      // 煤炭类判断
+      if (s.goodsListState.isValidateMeiTan) {
+        if (await s.goodsListState.verifyMeiTanFn(values) === true) {
+          s.goodsListState.meiTanGoodIndex = s.goodsListState.endowCode.endowcodeGoodIndex.slice();
+        }
+      }
+
       s.goodsListState.endowCode.endowcodeGoodIndex = [];
     })();
   }, [controller, goodsTaxRateList]);
@@ -532,7 +540,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
   }, [controller]);
 
   return (
-    <SchemaForm actions={actions} previewPlaceholder=" "  components={{ ...components, showSearch: !!controller.state.goodsListState.endowCode.onLoadTaxClassificationCode ? ShowSearch3 : ShowSearch }} effects={effects}>
+    <SchemaForm actions={actions} previewPlaceholder=" " components={{ ...components, showSearch: !!controller.state.goodsListState.endowCode.onLoadTaxClassificationCode ? ShowSearch3 : ShowSearch }} effects={effects}>
       <FormButtonGroup>
         <Field
           name="taxClassificationCode"

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

@@ -24,6 +24,7 @@ import { getItemNameWithShorthand } from '../../../../../tools/itemName';
 import Drag from './ui/Drag';
 import { nonScientificNotation } from '../../../../../tools/calculate';
 import Expand from './ui/Expand';
+import { render } from 'react-dom';
 
 export default (form: WrappedFormUtils) => {
   const { getFieldDecorator, getFieldValue } = form;
@@ -552,50 +553,53 @@ export default (form: WrappedFormUtils) => {
         key: 'taxAmount',
         align: 'right',
         width: 119,
-        rules: [
-          ...getReplenishRules('taxAmount'),
-          { required: isEnables('taxAmount'), message: '税额不能为空' },
-          { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '税额必须为数字' },
-          {
-            validator: (rule: any, value: any, callback: any) => {
-              //含税金额  
-              const lineAmountIncludeTax = editGood?.lineAmountIncludeTax || 0;
-              //不含税金额
-              // const lineAmountExcludeTax = lineAmountIncludeTax-value;
-              const lineAmountExcludeTax = chain(bignumber(lineAmountIncludeTax || 0)).subtract(bignumber(value || 0));
-              const taxRate = editGood?.taxRate;
-              if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
-                // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
-                const total = lineAmountExcludeTax.multiply(bignumber(taxRate || 0)).divide(bignumber(100));
-                // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
-                if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.01) {
-                  callback();
-                } else {
-                  callback('税额填写错误，请重新输入')
-                }
-              } else {
-                callback();
-              }
-            }
-          },
-        ],
+
         render: (value: string, record: IGood) => {
           if (editGood?.$index === record.$index) {
-            return getFieldDecorator('taxAmount', {
-              initialValue: editGood.taxAmount,
-              rules: getReplenishRules('taxAmount'),
-            })(
-              isEnables('taxAmount')
-                ? <MyInput
-                  style={{ textAlign: 'right' }}
-                  loading={isCipher(changeField, 'taxAmount')}
-                  onChange={() => {
-                    setChangeField('taxAmount');
-                    onChangeTaxAmount(controller, form, record);
-                  }}
-                />
-                : <MyDiv loading={isCipher(changeField, 'taxAmount')} />
-            );
+            return <Form.Item>
+              {getFieldDecorator('taxAmount', {
+                initialValue: editGood.taxAmount,
+                // rules: getReplenishRules('taxAmount'),
+                rules: [
+                  ...getReplenishRules('taxAmount'),
+                  { required: isEnables('taxAmount'), message: '税额不能为空' },
+                  { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '税额必须为数字' },
+                  {
+                    validator: (rule: any, value: any, callback: any) => {
+                      //含税金额  
+                      const lineAmountIncludeTax = editGood?.lineAmountIncludeTax || 0;
+                      //不含税金额
+                      // const lineAmountExcludeTax = lineAmountIncludeTax-value;
+                      const lineAmountExcludeTax = chain(bignumber(lineAmountIncludeTax || 0)).subtract(bignumber(value || 0));
+                      const taxRate = editGood?.taxRate;
+                      if (lineAmountExcludeTax && taxRate && lineAmountIncludeTax) {
+                        // const total = bignumber(lineAmountExcludeTax * taxRate / 100);
+                        const total = lineAmountExcludeTax.multiply(bignumber(taxRate || 0)).divide(bignumber(100));
+                        // if (Number(Math.abs(Number(total) - Number(value)).toFixed(4)) <= 0.01) {
+                        if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.01) {
+                          callback();
+                        } else {
+                          callback('税额填写错误，请重新输入')
+                        }
+                      } else {
+                        callback();
+                      }
+                    }
+                  },
+                ],
+              })(
+                isEnables('taxAmount')
+                  ? <MyInput
+                    style={{ textAlign: 'right' }}
+                    loading={isCipher(changeField, 'taxAmount')}
+                    onChange={() => {
+                      setChangeField('taxAmount');
+                      onChangeTaxAmount(controller, form, record);
+                    }}
+                  />
+                  : <MyDiv loading={isCipher(changeField, 'taxAmount')} />
+              )}
+            </Form.Item>
           } else {
             return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : value === '' ? '' : parseFloat(value).toFixed(2)}</span>;
           }
@@ -628,7 +632,6 @@ export default (form: WrappedFormUtils) => {
         dataIndex: 'remarks',
         key: 'remarks',
         width: 150,
-
       },
       {
         title: '操作',

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

@@ -14,7 +14,7 @@ export default () => {
   const topExpand = controller.useMemo(s => s.goodsListState.importGoods.topExpand, []);
 
   const onClose = React.useCallback(() => {
-    controller.pipeline(async s => { 
+    controller.pipeline(async s => {
       s.goodsListState.importGoods.filter = {};
       s.goodsListState.importGoods.isVisibleDrawer = false;
     })();
@@ -90,6 +90,7 @@ const DrawerBody = () => {
                 ...s.goodsListState.editGood,
                 itemModelName: undefined,
                 itemModelNameSelf: undefined,
+                mtzlDm: undefined,
                 ...between
               };
 
@@ -128,6 +129,11 @@ const DrawerBody = () => {
               s.goodsListState.isTaxIncluded
                 ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
                 : await updateUnitPriceTax(controller, s.goodsListState.form, record)
+              if (s.goodsListState.isValidateMeiTan) {
+                if (await s.goodsListState.verifyMeiTanFn(record) === true) {
+                  s.goodsListState.meiTanGoodIndex = [editGood.$index];
+                }
+              }
             })
           }
         };

package/src/Invoice/ui/default/MeiTanModal/index.less

@@ -0,0 +1,40 @@
+.kts-invoice-operate-meitan-modal {
+  display: flex;
+  flex-direction: column;
+
+  .kts-invoice-operate-meitan-title {
+
+    line-height: 30px;
+
+    .kts-invoice-operate-meitan-title2 {
+      margin-left: 24px;
+    }
+
+  }
+
+  .kts-invoice-operate-meitan-content {
+    margin-top: 20px;
+    padding: 20px;
+    background-color: #f9fafd;
+
+    .content-item {
+      background-color: #fff;
+      margin: 20px 24px;
+      padding: 20px;
+    }
+  }
+
+  .ktsAntX-space-item {
+    margin: 5px 0;
+  }
+
+  .ktsAntX-form-item-explain {
+    margin-top: 20px;
+  }
+}
+.kts-invoice-operate-meitan-button {
+  display: flex!important;
+  justify-content: center;
+  align-items: center;
+  padding: 2px 20px!important;
+}