kts-component-invoice-operate 3.2.221 → 3.2.223

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

@@ -84,4 +84,6 @@ export default interface IGood {
 
   /** 孩子 */
   children?: IGood[];
+
+  cd?:number
 }

package/src/Invoice/InvoiceController/fns/saveEditGood.ts

@@ -4,10 +4,10 @@ import { InvoiceControllerState } from '../';
  * 保存正在编辑的货物
  */
 export default async (state: InvoiceControllerState) => {
-  
+
   const editGood = state.goodsListState.editGood;
   const form = state.goodsListState.form;
-  
+  // const isValidateGood = state.goodsListState.isValidateGood
   if (!editGood || !form || state.goodsListState.importGoods.isVisibleDrawer || state.calculatingField) return;
   if ((await validateFields(form)).err) return;
 

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

@@ -257,11 +257,16 @@ export default (form: WrappedFormUtils) => {
                     { pattern: /^[+-]?(0|([1-9]\d*))(\.\d+)?$/, message: '数量必须为数字' },
                     {
                       validator: async (_, value, callback) => {
-                        await controller.wait();
-                        const isvalue = !!value || value === 0;
-                        const isPrice = !!getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') || getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') === 0;
-                        if (isvalue || isPrice === isvalue) return;
-                        callback('请输入数量');
+
+                        if (isValidateGood) {
+                          await controller.wait();
+                          const isvalue = !!value || value === 0;
+                          const isPrice = !!getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') || getFieldValue(isTaxIncluded ? 'priceIncludeTax' : 'priceExcludeTax') === 0;
+                          if (isvalue || isPrice === isvalue) return;
+                          callback('请输入数量');
+                        } else {
+                          callback();
+                        }
                       }
                     }
                   ],
@@ -416,7 +421,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
+            return <span style={{ padding: '0 10px' }}>{value && formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
           }
         },
       },
@@ -458,7 +463,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            return <span style={{ padding: '0 10px' }}>{formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
+            return <span style={{ padding: '0 10px' }}>{value && formatSearch(parseFloat(value).toFixed(2), searchValue)}</span>;
           }
         },
       },
@@ -503,7 +508,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             );
           } else {
-            if (value || value === '0') {
+            if (value || value === '0' || value === 0) {
               return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '免税' : `${value}%`}</span>;
             } else {
               return ''
@@ -518,7 +523,7 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 119,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('taxAmount')&& model !== 'prefab') {
+          if (editGood?.$index === record.$index && !disableds.includes('taxAmount') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('taxAmount', {
@@ -532,13 +537,13 @@ export default (form: WrappedFormUtils) => {
                         const lineAmountIncludeTax = editGood?.lineAmountIncludeTax || 0;
                         //不含税金额
                         // const lineAmountExcludeTax = lineAmountIncludeTax-value;
-                        const lineAmountExcludeTax = chain(bignumber(lineAmountIncludeTax||0)).subtract(bignumber(value||0));
+                        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));
+                          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) {
+                          if (Math.abs(total.subtract(bignumber(value || 0)).done().toNumber()) <= 0.01) {
                             callback();
                           } else {
                             callback('税额填写错误，请重新输入')
@@ -568,7 +573,7 @@ export default (form: WrappedFormUtils) => {
               </Form.Item>
             )
           } else {
-            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : parseFloat(value).toFixed(2)}</span>;
+            return <span style={{ padding: '0 10px' }}>{isDutyFree(record) ? '***' : value && parseFloat(value).toFixed(2)}</span>;
           }
         },
       },

package/src/Invoice/ui/digtal/GoodsList/ui/TableVirtual/index.tsx

@@ -40,8 +40,9 @@ export default function <T extends object = any>(props: TableProps<T>) {
 
     // 设置占位dom的搞
     const placeholderHeight = React.useMemo(() => {
-        if (!self || !rowHeight || !props.dataSource || !placeholder) return;
-        const placeholderHeight = rowHeight * props.dataSource.length;
+        const { dataSource = [] } = props
+        if (!self || !rowHeight || !dataSource || !placeholder) return;
+        const placeholderHeight = rowHeight * dataSource.length;
         placeholder.style.height = `${placeholderHeight}px`;
         return placeholderHeight;
     }, [self, rowHeight, props.dataSource, placeholder]);
@@ -80,19 +81,23 @@ export default function <T extends object = any>(props: TableProps<T>) {
 
     // 移动列表
     React.useEffect(() => {
-        if (!self) return;
+        if (!self) return
 
         const table = self.querySelector('.ktsAntX-table .ktsAntX-table-body>table') as HTMLDivElement;
+
         if (!table) return;
+        if ((props.dataSource?.length || 0) < 10) {
+            table.style.top = '0px';
+        } else {
+            table.style.top = `${pointer * rowHeight}px`;
+        }
 
-        table.style.top = `${pointer * rowHeight}px`;
-    }, [pointer, self, rowHeight]);
+    }, [pointer, self, rowHeight, props.dataSource?.length]);
 
     React.useEffect(() => {
         if (!self) return;
         const cont = self.querySelector('.kts-invoice-operate-goods-table-virtual .ktsAntX-table-body');
         if (!cont) return;
-
         cont.scrollTop = 0;
     }, [props.dataSource?.length])
 

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

@@ -5,7 +5,7 @@ import { Form } from 'kts-components-antd-x3';
 import { FormComponentProps } from 'kts-components-antd-x3/lib/form';
 import Invoice from '../../..';
 import './index.less';
-import { Cascader, Col, DatePicker, Input, Row, Select } from "kts-components-antd-x4";
+import { Button, Cascader, Col, DatePicker, Input, Row, Select } from "kts-components-antd-x4";
 import moment from "moment";
 
 const { RangePicker } = DatePicker;
@@ -37,10 +37,24 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
     const readOnly = React.useMemo(() => model === 'readOnly', [model]);
 
     const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
+    //outcome-104 任务 https://wiki.dev.kingxunlian.com/pages/viewpage.action?pageId=180355189
+    //商品和服务税收分类合并编码为“3040502020200000000”时，视为停车费业务，针对停车费业务，蓝字发票增加以下判断：
+    // 单位必须为“平方米”；
+    // 项目名称必须为“车辆停放服务”；
+    // 车牌号必填，最多支持填写3个车牌号；除该场景车牌号必须为空；
+    // 租赁期起止格式必须为“yyyy-MM-dd HH:mm（租赁期起）”+“空格”+“yyyy-MM-dd HH:mm（租赁期止）。
+    const isParkFee = React.useCallback((taxClassificationCode?: string) => {
+        if (taxClassificationCode === '3040502020200000000') {
+            return false
+        } else {
+            return true;
+        }
+    }, [])
+
     const indexRef = React.useRef<any>([]);
     useEffect(() => {
         const dd = goodsList?.reduce((acc: any, cur: any) => {
-            if (cur.lineAttribute !==1) {
+            if (cur.lineAttribute !== 1) {
                 acc.push(cur.$index)
             }
             return acc
@@ -48,7 +62,7 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
         indexRef.current = dd;
     }, [goodsList, indexRef])
     // 注册 form
-   
+
     controller.useForm('realEstateInfo', form);
     const getList = () => {
         const decrease = indexRef.current.length > goodsList.length
@@ -70,9 +84,9 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
                 });
             }
         }
-        console.log('goodsList',goodsList)
-        return goodsList.filter(item=>item.lineAttribute !== 1).map((item, index) => {
+        return goodsList.filter(item => item.lineAttribute !== 1).map((item, index) => {
             if (item.lineAttribute !== 1) {
+                const isParkFeeItem = isParkFee(item.taxClassificationCode)
                 return <Row gutter={[17, 0]} >
                     <Col span={6} >
                         <Form.Item style={{ display: 'none' }}>
@@ -121,17 +135,31 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
                             )}
                         </Form.Item>
                     </Col>
-                    <Col span={6} >
-                        <Form.Item label='租赁期起止' >
-                            {getFieldDecorator(`realEstateDataDto[${index}].leaseTerm`, {
-                                rules: readOnly ? [] : [{ required: true, message: '请输入租赁期' }]
-                            })(
-                                readOnly
-                                    ? <MyArrMoment />
-                                    : <RangePicker style={{ width: '100%' }} />
-                            )}
-                        </Form.Item>
-                    </Col>
+                    {!isParkFeeItem &&
+                        <Col span={6} >
+                            <Form.Item label='租赁期起止' >
+                                {getFieldDecorator(`realEstateDataDto[${index}].leaseTerm`, {
+                                    rules: readOnly ? [] : [{ required: true, message: '请输入租赁期' }]
+                                })(
+                                    readOnly
+                                        ? <MyArrMoment />
+                                        : <RangePicker style={{ width: '100%' }} />
+                                )}
+                            </Form.Item>
+                        </Col>}
+                    {isParkFeeItem &&
+                        <Col span={6} >
+                            <Form.Item label='租赁期起止' >
+                                {getFieldDecorator(`realEstateDataDto[${index}].leaseTerm`, {
+                                    rules: readOnly ? [] : [{ required: true, message: '请输入租赁期' }]
+                                })(
+                                    readOnly
+                                        ? <MyArrMomentTime />
+                                        : <RangePicker style={{ width: '100%' }} showTime={{ format: 'HH:mm' }} format="YYYY-MM-DD HH:mm" />
+                                )}
+                            </Form.Item>
+                        </Col>
+                    }
                     <Col span={6} >
                         <Form.Item label='跨地（市）标志' >
                             {getFieldDecorator(`realEstateDataDto[${index}].crossCitiesSign`, {
@@ -162,25 +190,56 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
                             )}
                         </Form.Item>
                     </Col>
-                    <Col span={6} >
-                        <Form.Item label='面积单位' >
-                            {getFieldDecorator(`realEstateDataDto[${index}].realEstateUnit`, {
-                                rules: readOnly ? [] : [{ required: true, message: '请选择面积单位' }]
-                            })(
-                                readOnly
-                                    ? <MyDiv />
-                                    : <Select placeholder='请选择' style={{ width: '100%' }} >
-                                        <Select.Option value="平方千米">平方千米</Select.Option>
-                                        <Select.Option value="平方米">平方米</Select.Option>
-                                        <Select.Option value="公顷">公顷</Select.Option>
-                                        <Select.Option value="亩">亩</Select.Option>
-                                        <Select.Option value="h㎡">h㎡</Select.Option>
-                                        <Select.Option value="k㎡">k㎡</Select.Option>
-                                        <Select.Option value="㎡">㎡</Select.Option>
-                                    </Select>
-                            )}
-                        </Form.Item>
-                    </Col>
+                    {!isParkFeeItem &&
+                        <Col span={6} >
+                            <Form.Item label='面积单位' >
+                                {getFieldDecorator(`realEstateDataDto[${index}].realEstateUnit`, {
+                                    rules: readOnly ? [] : [{ required: true, message: '请选择面积单位' }]
+                                })(
+                                    readOnly
+                                        ? <MyDiv />
+                                        : <Select placeholder='请选择' style={{ width: '100%' }} >
+                                            <Select.Option value="平方千米">平方千米</Select.Option>
+                                            <Select.Option value="平方米">平方米</Select.Option>
+                                            <Select.Option value="公顷">公顷</Select.Option>
+                                            <Select.Option value="亩">亩</Select.Option>
+                                            <Select.Option value="h㎡">h㎡</Select.Option>
+                                            <Select.Option value="k㎡">k㎡</Select.Option>
+                                            <Select.Option value="㎡">㎡</Select.Option>
+                                        </Select>
+                                )}
+                            </Form.Item>
+                        </Col>
+                    }
+                    {isParkFeeItem &&
+                        <Col span={6} >
+                            <Form.Item label='面积单位' >
+                                {getFieldDecorator(`realEstateDataDto[${index}].realEstateUnit`, {
+                                    rules: readOnly ? [] : [{ required: true, message: '请选择面积单位' }]
+                                })(
+                                    readOnly
+                                        ? <MyDiv />
+                                        : <Select placeholder='请选择' style={{ width: '100%' }} >
+                                            <Select.Option value="平方米">平方米</Select.Option>
+                                        </Select>
+                                )}
+                            </Form.Item>
+                        </Col>
+                    }
+                    {isParkFeeItem &&
+                        <LicensePlateNumber form={form} index={index} cd={item.cd} />
+                        // <Col span={6} >
+                        //     <Form.Item label='车牌号' >
+                        //         {getFieldDecorator(`realEstateDataDto[${index}].licensePlateNumber`, {
+                        //             rules: readOnly ? [] : [{ required: true, message: '请选择面积单位' }]
+                        //         })(
+                        //             readOnly
+                        //                 ? <MyDiv />
+                        //                 : <LicensePlateNumber form={form}/>
+                        //         )}
+                        //     </Form.Item>
+                        // </Col>
+                    }
                 </Row>
             }
         })
@@ -227,7 +286,18 @@ class MyArrMoment extends React.Component<{ value?: moment.Moment[], style?: Rea
         )
     }
 }
-
+class MyArrMomentTime extends React.Component<{ value?: moment.Moment[], style?: React.CSSProperties }> {
+    render(): React.ReactNode {
+        const { value = [] } = this.props
+        return (
+            <div style={this.props.style}>
+                <span>{moment.isMoment(value[0]) && value[0].format('YYYY-MM-DD HH:mm')}</span>
+                <span style={{ color: '#9F603D', fontWeight: 600 }} > - </span>
+                <span>{moment.isMoment(value[1]) && value[1].format('YYYY-MM-DD HH:mm')}</span>
+            </div>
+        )
+    }
+}
 class MyNY extends React.Component<{ value?: 'Y' | 'N', style?: React.CSSProperties }> {
     render(): React.ReactNode {
         return (
@@ -239,4 +309,137 @@ class MyNY extends React.Component<{ value?: 'Y' | 'N', style?: React.CSSPropert
         )
     }
 }
+interface PriceInputProps {
+    // value?: string[];
+    // style?: React.CSSProperties
+    // onChange?: (value: string[]) => void;
+    form: any,
+    index: number
+    cd?: number
+}
+const LicensePlateNumber: React.FC<PriceInputProps> = (props) => {
+
+    const { form } = props;
+
+    const { getFieldDecorator } = form;
+    const licenceLimit = 3; // 最多支持填写3个车牌号
+    const formData: any[] = form.getFieldValue('realEstateDataDto');
+    const [value, setVal] = React.useState(new Array(props.cd || 1).fill(''));
+    const cd = React.useMemo(() => formData[props.index]?.cd, [formData[props.index]?.cd])
+    // useEffect(() => {
+    //     if (cd) {
+    //         const dd = value.concat(new Array(cd.length-1).fill(''))
+    //         setVal(dd);
+    //     }
+    // }, [cd])
+    const onAdd = () => {
+        if (value.length < licenceLimit) {
+            setVal([...value, '']);
+        }
+    }
+    // 删除车牌号
+    const onDelete = () => {
+        if (value.length > 0) {
+            const dd = value.slice(0, -1)
+            setVal(dd);
+        }
+    }
+
+    console.log(value.length)
+    return <>
+        {
+            value.length > 0 && value.map((item: string[], key: number) => {
+
+                return <Col span={6} ><Form.Item label='车牌号' key={key}>
+                    {getFieldDecorator(`realEstateDataDto[${props.index}].cphList[${key}]`, {
+                        rules: [{ required: true, message: '请输入车牌号' }]
+                    })(
+                        <Input style={{ width: '100%' }} autoComplete='off' placeholder="请输入车牌号" />
+                    )}
+                </Form.Item>
+                </Col>
+            })
+
+
+        }
+        {/* <Col span={6} style={{ display: 'none' }}><Form.Item label='长度' >
+            {getFieldDecorator(`realEstateDataDto[${props.index}].cd`, {
+
+            })(
+                <Select />
+            )}
+        </Form.Item>
+        </Col> */}
+        <Col span={6} >
+            <Form.Item >
+                <div style={{ color: 'white' }}>1</div>
+                <a style={{ marginRight: 10 }} onClick={onAdd}>添加车牌号</a>
+                {value.length > 1 && <a onClick={onDelete}>删除</a>}
+            </Form.Item>
+        </Col>
+    </>
+}
+
+
+// const LicensePlateNumber: React.FC<PriceInputProps> = (props) => {
+
+//     const { form } = props;
+
+//     const { getFieldDecorator } = form;
+//     const licenceLimit = 3; // 最多支持填写3个车牌号
+//     // const { value = [] } = this.props;
+//     const [value, setVal] = React.useState(props.value || ['']);
+//     // const newArr = value.filter(e => !!e);
+//     const newArrLength = value.length;
+//     console.log(value, newArrLength)
+//     // 新增车牌号
+//     const onAdd = () => {
+//         if (newArrLength < licenceLimit) {
+//             setVal([...value, '']);
+//             props.onChange?.([...value, ''])
+//         }
+//     }
+//     // 删除车牌号
+//     const onDelete = () => {
+//         if (newArrLength > 0) {
+//             const dd = value.slice(0, -1)
+//             setVal(dd);
+//             props.onChange?.(dd)
+//         }
+//     }
+//     const onInputChange = (e: React.ChangeEvent<HTMLInputElement>, index: number) => {
+//         console.log(e.target.value);
+//         const dd = value.map((item, i) => {
+//             if (i === index) {
+//                 return e.target.value
+//             }
+//             return item
+//         })
+//         setVal(dd);
+//         props.onChange?.(dd)
+
+
+//     }
+//     return (
+
+//         <>
+//             {newArrLength > 0 && value.map((item, index) => {
+//                 return
+//                 <Form.Item label='车牌号' >
+//                     {getFieldDecorator(`realEstateDataDto[${index}].licensePlateNumber`, {
+//                         rules: [{ required: true, }]
+//                     })(
+//                         <Input onChange={(e) => { onInputChange(e, index) }} key={index} style={{ width: '100%' }} autoComplete='off' placeholder="请输入车牌号" />
+//                     )}
+//                 </Form.Item>
+//                 // <Col span={6} >
+//                 //     <Input onChange={(e) => { onInputChange(e, index) }} key={index} style={{ width: '100%' }} autoComplete='off' placeholder="请输入车牌号" />
+//                 // </Col>
+//             })}
+
+//             <Button type="link" onClick={onAdd}>添加车牌号</Button>
+//             {newArrLength > 1 && <Button type="link" onClick={onDelete}>删除</Button>}
+//         </>
 
+//     )
+// }

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

@@ -30,7 +30,7 @@ const RULES = {
         { pattern: /^[0-9\s\-\+]+$/g, message: `${label}仅能数字、空格、-、+` }
     ],
     sellerTelPhone: (label: string) => [
-       
+
         { max: 100, message: `${label}内容超长` },
         { pattern: /^[0-9\s\-\+]+$/g, message: `${label}仅能数字、空格、-、+` }
     ],
@@ -206,7 +206,7 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                             </Form.Item>
                         </Col>
 
-                        <Col span={10+riskspanW} style={{ display: isExpand ? undefined : 'none' }} >
+                        <Col span={10 + leqispanW} style={{ display: isExpand ? undefined : 'none' }} >
                             <Form.Item label='销售方地址' colon={false}>
                                 {getFieldDecorator('sellerAddress', {
                                     rules: getRules('sellerAddress', [{ max: 300, message: '销售方地址内容超长' }])
@@ -214,7 +214,7 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                             </Form.Item>
                         </Col>
 
-                        <Col span={10+riskspanW} style={{ display: isExpand ? undefined : 'none' }} >
+                        <Col span={10 + leqispanW} style={{ display: isExpand ? undefined : 'none' }} >
                             <Form.Item label='电话' colon={false} className='telephone' >
                                 {getFieldDecorator('sellerPhone', {
                                     rules: getRules('sellerPhone', RULES.sellerTelPhone('销售方电话'))
@@ -229,7 +229,15 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                                 })(<MyInput readOnly={isReadOnly('sellerBank')} placeholder="请输入销售方开户银行" autoComplete="off" />)}
                             </Form.Item>
                         </Col>
-
+                        {(props.leqi) &&
+                            <Col span={4} style={{ display: isExpand ? undefined : 'none' }}>
+                                <Form.Item colon={false}>
+                                    {getFieldDecorator('sellerAddressPhoneFlag', {
+                                        valuePropName: 'checked',
+                                    })(<Checkbox onChange={props?.invoiceMarkCallback} disabled={isReadOnly('sellerAddressPhoneFlag')} style={{ whiteSpace: 'nowrap' }}>是否展示</Checkbox>)}
+                                </Form.Item>
+                            </Col>
+                        }
                         <Col span={10 + leqispanW} style={{ display: isExpand ? undefined : 'none' }} >
                             <Form.Item label='银行账号' colon={false}>
                                 {getFieldDecorator('sellerAccount', {
@@ -241,8 +249,8 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                             <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>
                         }
@@ -313,7 +321,7 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                             </Form.Item>
                         </Col>
 
-                        <Col span={10+riskspanW} style={{ display: isExpand ? undefined : 'none' }} >
+                        <Col span={10 + leqispanW} style={{ display: isExpand ? undefined : 'none' }} >
                             <Form.Item label='购买方地址' colon={false}>
                                 {getFieldDecorator('buyerAddress', {
                                     rules: getRules('buyerAddress', [{ max: 100, message: '购买方地址内容超长' }])
@@ -321,14 +329,20 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                             </Form.Item>
                         </Col>
 
-                        <Col span={10+riskspanW} style={{ display: isExpand ? undefined : 'none' }} >
+                        <Col span={10 + leqispanW} style={{ display: isExpand ? undefined : 'none' }} >
                             <Form.Item label='电话' colon={false} className='telephone'>
                                 {getFieldDecorator('buyerPhone', {
                                     rules: getRules('buyerPhone', RULES.buyerTelPhone('购买方电话'))
                                 })(<MyInput readOnly={isReadOnly('buyerPhone')} placeholder="请输入电话" autoComplete="off" />)}
                             </Form.Item>
                         </Col>
-
+                        <Col span={10 + leqispanW} style={{ display: isExpand ? undefined : 'none' }} >
+                            <Form.Item label='购买方开户银行' colon={false}>
+                                {getFieldDecorator('buyerBank', {
+                                    rules: getRules('buyerBank', RULES.bankName('购买方开户银行'))
+                                })(<MyInput readOnly={isReadOnly('buyerBank')} placeholder="请输入购买方开户银行" autoComplete="off" />)}
+                            </Form.Item>
+                        </Col>
                         <Col span={10 + leqispanW} style={{ display: isExpand ? undefined : 'none' }} >
                             <Form.Item label='购买方开户银行' colon={false}>
                                 {getFieldDecorator('buyerBank', {
@@ -346,10 +360,10 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
                         </Col>
                         {(props.leqi || props.riskData?.code === 'success') &&
                             <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>
                         }
@@ -414,19 +428,19 @@ function BuyerNameInput(props: InputProps & { fieldName: string; myform: Wrapped
     const onSearch = React.useCallback(async (searchText: string) => {
         await Discontinue.start();
         try {
-            if (fieldName === 'buyerName' ) {
+            if (fieldName === 'buyerName') {
                 if (autoComplete.onBuyerNameSearch) {
                     setOptions(await autoComplete.onBuyerNameSearch(searchText));
                 }
-            } else if (fieldName === 'buyerTaxId'  ) {
+            } else if (fieldName === 'buyerTaxId') {
                 if (autoComplete.onBuyerTaxIdSearch) {
                     setOptions(await autoComplete.onBuyerTaxIdSearch(searchText));
                 }
-            }else if(fieldName === 'supplierName'){
+            } else if (fieldName === 'supplierName') {
                 if (autoComplete.onSupplierNameSearch) {
                     setOptions(await autoComplete.onSupplierNameSearch(searchText));
                 }
-            }else if(fieldName === 'supplierTaxId'){
+            } else if (fieldName === 'supplierTaxId') {
                 if (autoComplete.onSupplierTaxIdSearch) {
                     setOptions(await autoComplete.onSupplierTaxIdSearch(searchText));
                 }