kts-component-invoice-operate 3.2.181-1 → 3.2.181-3

package/dist/Invoice/InvoiceController/InvoiceControllerState/BuyerState/index.d.ts

@@ -21,6 +21,7 @@ export interface IBuyerInfo {
     buyerAddress?: string;
     /** 购买方开户行及账号 */
     buyerBank?: string;
+    customerCode?: string;
 }
 /** 自动填充 */
 export interface IAutoContainer {

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import GreyReactBox, { decorator } from 'grey-react-box';
 import { chain as chain$1, bignumber, format as format$1, create, all, equal } from 'mathjs';
 import { message, Form, Input, Icon as Icon$1, Tag as Tag$1, Select, Button, Tooltip, Switch as Switch$1, Typography, Menu, Dropdown, AutoComplete as AutoComplete$2, Spin, Checkbox, Drawer, Descriptions, Empty, Divider, Popover as Popover$1, Table as Table$1, Tree, Modal as Modal$1, Row as Row$2, Col as Col$2 } from 'kts-components-antd-x3';
 import { v4 } from 'uuid';
-import { message as message$1, TableManual, Switch, AutoComplete as AutoComplete$1, Popover, Button as Button$1, Dropdown as Dropdown$1, Row, Col, Checkbox as Checkbox$1, Tooltip as Tooltip$1, Input as Input$1, Select as Select$1, Spin as Spin$1, Menu as Menu$1, Form as Form$1, Drawer as Drawer$1, Space, Radio, InputNumber, Popconfirm, Modal, Cascader as Cascader$1, Tree as Tree$1, Card, FormReadOnly } from 'kts-xui';
+import { message as message$1, TableManual, Switch, AutoComplete as AutoComplete$1, Popover, Button as Button$1, Dropdown as Dropdown$1, Row, Col, Input as Input$1, Checkbox as Checkbox$1, Tooltip as Tooltip$1, Select as Select$1, Spin as Spin$1, Menu as Menu$1, Form as Form$1, Drawer as Drawer$1, Space, Radio, InputNumber, Popconfirm, Modal, Cascader as Cascader$1, Tree as Tree$1, Card, FormReadOnly } from 'kts-xui';
 import classnames from 'classnames';
 import { Table } from 'kts-components-antd-x4-v4';
 import { render } from 'react-dom';
@@ -1180,6 +1180,10 @@ var BuyerState = /*#__PURE__*/_createClass(function BuyerState() {
     title: '公司名称',
     dataIndex: 'buyerName',
     key: 'buyerName'
+  }, {
+    title: '客户代码',
+    dataIndex: 'customerCode',
+    key: 'customerCode'
   }, {
     title: '纳税人识别号',
     dataIndex: 'buyerNo',
@@ -16939,6 +16943,7 @@ var BuyerNameInput = (function (props) {
     onBuyNameChange(e.target.value);
   }, [dataSource]);
   React.useEffect(function () {
+    console.log('aaaaaaaaa1');
     visible && onBuyNameChange(props.value);
   }, [visible, props.value]);
 
@@ -17549,18 +17554,41 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
     className: "digtal-stakeholder-expand-button",
     component: isExpand ? SvgArrowUp : SvgArrowDown,
     onClick: onExpand
-  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Form, {
+    className: "digtal-stakeholder-form"
+  }, /*#__PURE__*/React.createElement(Row, {
+    gutter: [16, 0],
+    className: 'natural-person-flag',
     style: {
-      marginTop: 20
-    },
-    className: 'natural-person-flag'
+      paddingRight: 0
+    }
+  }, /*#__PURE__*/React.createElement(Col, {
+    span: 24,
+    style: {
+      display: 'flex',
+      marginBottom: '15px'
+    }
   }, props.isNaturalPerson === true && /*#__PURE__*/React.createElement(Form.Item, {
     colon: false
   }, getFieldDecorator('naturalPersonFlag', {})( /*#__PURE__*/React.createElement(NaturalPersonFlag, {
     readOnly: isReadOnly('naturalPersonFlag')
-  })))), /*#__PURE__*/React.createElement(Form, {
-    className: "digtal-stakeholder-form"
-  }, /*#__PURE__*/React.createElement(Row, {
+  }))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u5BA2\u6237\u4EE3\u7801",
+    colon: false
+  }, getFieldDecorator('buyerCode', {
+    rules: [{
+      required: true,
+      message: '客户代码必填'
+    }]
+  })( /*#__PURE__*/React.createElement(Input$1, {
+    style: {
+      width: '100%'
+    }
+  })))))), /*#__PURE__*/React.createElement(Row, {
     gutter: [16, 0]
   }, /*#__PURE__*/React.createElement(Col, {
     span: 24
@@ -27423,8 +27451,7 @@ var DrawerBody$3 = function DrawerBody(props) {
                 }); // 赋码
 
                 endowCodeGood.forEach(function (good) {
-                  if (!good) return;
-                  console.log('aassssssss', defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.taxClassificationCode, good.itemName, values); // values:
+                  if (!good) return; // values:
                   // favouredPolicyMark: 0
                   // shorthand: "卷烟"
                   // taxClassificationCode: "1030402040101010131"
@@ -28123,10 +28150,7 @@ function TaxClassificationModal(props) {
       // if(!values.taxCategoryCode){
       //   message.warn('请选择税收分类编码');
       //   return; 
-      // } 
-      values.taxCategoryCode = '1030402040101010131';
-      values.productName = '恒大（记忆1949中支）';
-      values.shorthand = '卷烟';
+      // }  
       onChildrenDrawerClose();
       props.onSubmit && props.onSubmit((_props$info = props.info) === null || _props$info === void 0 ? void 0 : _props$info.key, _objectSpread2(_objectSpread2({}, props.info), values));
     }).catch(function (errorInfo) {

package/dist/index.js

@@ -1190,6 +1190,10 @@ var BuyerState = /*#__PURE__*/_createClass(function BuyerState() {
     title: '公司名称',
     dataIndex: 'buyerName',
     key: 'buyerName'
+  }, {
+    title: '客户代码',
+    dataIndex: 'customerCode',
+    key: 'customerCode'
   }, {
     title: '纳税人识别号',
     dataIndex: 'buyerNo',
@@ -16949,6 +16953,7 @@ var BuyerNameInput = (function (props) {
     onBuyNameChange(e.target.value);
   }, [dataSource]);
   React__default['default'].useEffect(function () {
+    console.log('aaaaaaaaa1');
     visible && onBuyNameChange(props.value);
   }, [visible, props.value]);
 
@@ -17559,18 +17564,41 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     className: "digtal-stakeholder-expand-button",
     component: isExpand ? SvgArrowUp : SvgArrowDown,
     onClick: onExpand
-  })), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", {
+  })), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form, {
+    className: "digtal-stakeholder-form"
+  }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Row, {
+    gutter: [16, 0],
+    className: 'natural-person-flag',
     style: {
-      marginTop: 20
-    },
-    className: 'natural-person-flag'
+      paddingRight: 0
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
+    span: 24,
+    style: {
+      display: 'flex',
+      marginBottom: '15px'
+    }
   }, props.isNaturalPerson === true && /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
     colon: false
   }, getFieldDecorator('naturalPersonFlag', {})( /*#__PURE__*/React__default['default'].createElement(NaturalPersonFlag, {
     readOnly: isReadOnly('naturalPersonFlag')
-  })))), /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form, {
-    className: "digtal-stakeholder-form"
-  }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Row, {
+  }))), /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
+    label: "\u5BA2\u6237\u4EE3\u7801",
+    colon: false
+  }, getFieldDecorator('buyerCode', {
+    rules: [{
+      required: true,
+      message: '客户代码必填'
+    }]
+  })( /*#__PURE__*/React__default['default'].createElement(ktsXui.Input, {
+    style: {
+      width: '100%'
+    }
+  })))))), /*#__PURE__*/React__default['default'].createElement(ktsXui.Row, {
     gutter: [16, 0]
   }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Col, {
     span: 24
@@ -27433,8 +27461,7 @@ var DrawerBody$3 = function DrawerBody(props) {
                 }); // 赋码
 
                 endowCodeGood.forEach(function (good) {
-                  if (!good) return;
-                  console.log('aassssssss', defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.taxClassificationCode, good.itemName, values); // values:
+                  if (!good) return; // values:
                   // favouredPolicyMark: 0
                   // shorthand: "卷烟"
                   // taxClassificationCode: "1030402040101010131"
@@ -28133,10 +28160,7 @@ function TaxClassificationModal(props) {
       // if(!values.taxCategoryCode){
       //   message.warn('请选择税收分类编码');
       //   return; 
-      // } 
-      values.taxCategoryCode = '1030402040101010131';
-      values.productName = '恒大（记忆1949中支）';
-      values.shorthand = '卷烟';
+      // }  
       onChildrenDrawerClose();
       props.onSubmit && props.onSubmit((_props$info = props.info) === null || _props$info === void 0 ? void 0 : _props$info.key, _objectSpread2(_objectSpread2({}, props.info), values));
     }).catch(function (errorInfo) {

package/package.json

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

package/src/Invoice/InvoiceController/InvoiceControllerState/BuyerState/index.tsx

@@ -28,6 +28,8 @@ export interface IBuyerInfo {
 
   /** 购买方开户行及账号 */
   buyerBank?: string;
+
+  customerCode?: string;
 }
 
 /** 自动填充 */
@@ -46,6 +48,11 @@ export default class BuyerState {
       dataIndex: 'buyerName',
       key: 'buyerName',
     },
+    {
+      title: '客户代码',
+      dataIndex: 'customerCode',
+      key: 'customerCode',
+    },
     {
       title: '纳税人识别号',
       dataIndex: 'buyerNo',

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

@@ -14,7 +14,7 @@ export default class InvoiceControllerState {
    * readOnly 只读
    * */
   model: 'default' | 'prefab' | 'readOnly' = 'default';
-
+  
   /**
    * 企业类型
    * 01 一般纳税人

package/src/Invoice/ui/default/Buyer/ui/BuyerNameInput/index.tsx

@@ -87,6 +87,7 @@ export default (props: IBuyerNameInputProps) => {
   }, [dataSource])
 
   React.useEffect(() => {
+    console.log('aaaaaaaaa1');
     visible && onBuyNameChange(props.value)
   }, [visible, props.value])
 
@@ -134,7 +135,7 @@ function useDataSource() {
   const autoContainer = controller.useMemo(s => s.buyerState.autoContainer, []);
 
   const onBuyNameChange = React.useCallback(async (e?: string | undefined) => {
-    if (!autoContainer) return;
+    if (!autoContainer) return; 
     setLoading(true);
     setDataSource(await autoContainer.onBuyNameChange(e));
     setLoading(false);

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

@@ -476,8 +476,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
   const addProductionByTax = async (params: any) => { 
     if (controller.addProductionByTax) {
       controller.addProductionByTax(params)
-    };
-    // const goodsTaxRateList = await controller.getGoodsTaxRateList(good.taxClassificationCode);
+    }; 
   }
   // 确定
   const onSubmit = React.useCallback(values => {
@@ -487,8 +486,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
 
       // 赋码
       endowCodeGood.forEach(good => {
-        if (!good) return;
-        console.log('aassssssss', defaultValue?.taxClassificationCode,good.itemName, values);
+        if (!good) return; 
         // values:
         // favouredPolicyMark: 0
         // shorthand: "卷烟"

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

@@ -60,7 +60,7 @@ const DrawerBody = () => {
       onRow={(record) => {
         return {
           onClick: async () => {
-            const re = await controller.state.buyerState.onRowClick(record);
+            const re = await controller.state.buyerState.onRowClick(record); 
             if (re) {
               controller.formList.get('buyer')?.setFieldsValue(re);
               controller.pipeline(async (s) => {

package/src/Invoice/ui/digtal/Sign/index.tsx

@@ -13,7 +13,8 @@ export interface IBuyerProps {
     defaultRemark?: string;
 
     /** 默认开票人 */
-    defaultIssuer?: string;
+    defaultIssuer?: string; 
+    
 }
 
 export default decorator<IBuyerProps, IBuyerProps & FormComponentProps>(Form.create())((props) => {
@@ -79,7 +80,6 @@ export default decorator<IBuyerProps, IBuyerProps & FormComponentProps>(Form.cre
                             initialValue: props.defaultRemark
                         })(<Input.TextArea readOnly={isReadOnly('remarks')} autoSize placeholder='请输入' />)}
                     </Form.Item>
-
                     <Form.Item label="开票人" >
                         {getFieldDecorator('drawer', {
                             initialValue: props.defaultIssuer

package/src/Invoice/ui/digtal/Stakeholder/index.tsx

@@ -146,7 +146,10 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                 }
             </div>
             <div>
-                <div style={{ marginTop: 20 }} className='natural-person-flag' >
+
+            <Form className="digtal-stakeholder-form" >
+            <Row gutter={[16, 0]} className='natural-person-flag' style={{paddingRight: 0}} >
+                <Col span={24}  style={{ display: 'flex', marginBottom: '15px' }} >
                     {
                         props.isNaturalPerson === true &&
                         <Form.Item colon={false}>
@@ -156,8 +159,17 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                             )}
                         </Form.Item>
                     }
-                </div>
-                <Form className="digtal-stakeholder-form" >
+                    <div style={{flex: 1}}>
+                    <Form.Item label='客户代码' colon={false}>
+                        {getFieldDecorator('buyerCode', {
+                            rules: [{ required: true, message: '客户代码必填' }],
+                        })(
+                            <Input style={{width: '100%'}} />
+                        )}
+                    </Form.Item>
+                    </div>
+                    </Col>
+                </Row>
                     <Row gutter={[16, 0]}>
                         <Col span={24} >
                             <Form.Item label='名称' colon={false}>
@@ -200,7 +212,7 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                             </Form.Item>
                         </Col>
 
-                        <Col span={10+riskspanW} style={{ display: isExpand ? undefined : 'none' }} >
+                        <Col span={10 + riskspanW} style={{ display: isExpand ? undefined : 'none' }} >
                             <Form.Item label='购买方地址' colon={false}>
                                 {getFieldDecorator('buyerAddress', {
                                     rules: getRules('buyerAddress', [{ max: 100, message: '购买方地址内容超长' }])
@@ -208,7 +220,7 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                             </Form.Item>
                         </Col>
 
-                        <Col span={10+riskspanW} style={{ display: isExpand ? undefined : 'none' }} >
+                        <Col span={10 + riskspanW} style={{ display: isExpand ? undefined : 'none' }} >
                             <Form.Item label='电话' colon={false} className='telephone'>
                                 {getFieldDecorator('buyerPhone', {
                                     rules: getRules('buyerPhone', RULES.buyerTelPhone('购买方电话'))
@@ -232,10 +244,10 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                         </Col>
                         {(props.leqi) &&
                             <Col span={4} style={{ display: isExpand ? undefined : 'none' }}>
-                                <Form.Item  colon={false}>
+                                <Form.Item colon={false}>
                                     {getFieldDecorator('buyerBankAccountFlag', {
                                         valuePropName: 'checked',
-                                    })(<Checkbox onChange={props?.invoiceMarkCallback} disabled={isReadOnly('buyerBankAccountFlag')}  style={{whiteSpace:'nowrap'}}>是否展示</Checkbox>)}
+                                    })(<Checkbox onChange={props?.invoiceMarkCallback} disabled={isReadOnly('buyerBankAccountFlag')} style={{ whiteSpace: 'nowrap' }}>是否展示</Checkbox>)}
                                 </Form.Item>
                             </Col>
                         }
@@ -281,7 +293,7 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                             </Form.Item>
                         </Col>
 
-                        <Col span={10+riskspanW} style={{ display: isExpand ? undefined : 'none' }} >
+                        <Col span={10 + riskspanW} style={{ display: isExpand ? undefined : 'none' }} >
                             <Form.Item label='销售方地址' colon={false}>
                                 {getFieldDecorator('sellerAddress', {
                                     rules: getRules('sellerAddress', [{ max: 300, message: '销售方地址内容超长' }])
@@ -289,7 +301,7 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                             </Form.Item>
                         </Col>
 
-                        <Col span={10+riskspanW} style={{ display: isExpand ? undefined : 'none' }} >
+                        <Col span={10 + riskspanW} style={{ display: isExpand ? undefined : 'none' }} >
                             <Form.Item label='电话' colon={false} className='telephone' >
                                 {getFieldDecorator('sellerPhone', {
                                     rules: getRules('sellerPhone', RULES.sellerTelPhone('销售方电话'))
@@ -311,12 +323,12 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                                 })(<MyInput readOnly={isReadOnly('sellerAccount')} placeholder="请输入银行账号" autoComplete="off" />)}
                             </Form.Item>
                         </Col>
-                        {(props.leqi ) &&
+                        {(props.leqi) &&
                             <Col span={4} style={{ display: isExpand ? undefined : 'none' }}>
                                 <Form.Item colon={false}>
                                     {getFieldDecorator('sellerBankAccountFlag', {
-                                         valuePropName: 'checked',
-                                    })(<Checkbox onChange={props?.invoiceMarkCallback} disabled={isReadOnly('sellerBankAccountFlag')} style={{whiteSpace:'nowrap'}}>是否展示</Checkbox>)}
+                                        valuePropName: 'checked',
+                                    })(<Checkbox onChange={props?.invoiceMarkCallback} disabled={isReadOnly('sellerBankAccountFlag')} style={{ whiteSpace: 'nowrap' }}>是否展示</Checkbox>)}
                                 </Form.Item>
                             </Col>
                         }
@@ -353,7 +365,7 @@ function NaturalPersonFlag(props: {
             onChange={onChange}
         >
             是否开票给自然人
-        </Checkbox>
+        </Checkbox> 
     )
 }
 
@@ -371,14 +383,13 @@ function BuyerNameInput(props: InputProps & { fieldName: string; myform: Wrapped
 
     const onChangeAutoComplete = React.useCallback(value => {
         const record = options.filter(e => e[fieldName] === value)[0] as any;
-        if (!record || !form) return;
-
+        if (!record || !form) return; 
         form.setFieldsValue(record);
         setOptions([])
     }, [options, fieldName, form])
 
     const onSearch = React.useCallback(async (searchText: string) => {
-        await Discontinue.start();
+        await Discontinue.start(); 
         try {
             if (fieldName === 'buyerName') {
                 if (autoComplete.onBuyerNameSearch) {
@@ -389,7 +400,7 @@ function BuyerNameInput(props: InputProps & { fieldName: string; myform: Wrapped
                     setOptions(await autoComplete.onBuyerTaxIdSearch(searchText));
                 }
             }
-
+             
         } catch (error) {
             setOptions([]);
             throw error;

package/src/TaxClassificationCodeModal/index.tsx

@@ -72,10 +72,7 @@ export default function TaxClassificationModal(props: TaxClassificationProps) {
         // if(!values.taxCategoryCode){
         //   message.warn('请选择税收分类编码');
         //   return; 
-        // } 
-        values.taxCategoryCode = '1030402040101010131';
-        values.productName = '恒大（记忆1949中支）';
-        values.shorthand = '卷烟';
+        // }  
         onChildrenDrawerClose();
         props.onSubmit && props.onSubmit(props.info?.key, {...props.info,...values});
       }).catch(errorInfo => {