kts-component-invoice-operate 3.2.181-2 → 3.2.181-21

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

@@ -49,8 +49,8 @@ const DrawerBody = () => {
 
   // const [editGood] = React.useState(controller.state.goodsListState.editGood);
 
-  React.useEffect(() => { controller.getGoodsList && controller.getGoodsList({ pagination: { current: 1 } }) }, [controller]);
-
+  React.useEffect(() => { controller.getGoodsList && controller.getGoodsList({ pagination: { current: 1 } }) }, [controller]); 
+  const roundTo8Decimals = (num:number) => Math.round(num * 1e8) / 1e8;
   return (
     <Table
       bordered
@@ -76,29 +76,43 @@ const DrawerBody = () => {
               record.lineAmountExcludeTax = undefined;
               record.lineAmountIncludeTax = undefined;
 
+              // console.log('s.goodsListState.editGood1:', s.goodsListState.editGood);
+              //  光电定制化功能：无论是否有值都替换 itemCode, itemName, shorthand, taxCategoryCode, taxClassificationCode； 
+              // 如果其他输入框有值就不替换，没值就替换：itemModelName, lineAmountExcludeTax, lineAmountIncludeTax,lineAttribute,priceExcludeTax, 
+              // priceIncludeTax,quantity, serialNo, taxAmount, taxRate, unit 
               // 中间数据
               const between = { ...record };
+              // console.log(':between:', between);
               between.itemName = getItemName(record, s.goodsListState.editGood);
               between.itemCode = getItemCode(record, s.goodsListState.editGood);
               between.itemNameOther = getItemNameOther(record, s.goodsListState.editGood);
-
               // 设置编辑货物
               const editGood: IGood = s.goodsListState.editGood = {
                 ...s.goodsListState.editGood,
-                itemModelName: undefined,
-                itemModelNameSelf: undefined,
-                ...between
-              };
-
+                // itemModelName: undefined,
+                // itemModelNameSelf: undefined,
+                ...between,
+                itemModelName:s.goodsListState.editGood?.itemModelName ?? between.itemModelName, 
+                itemModelNameSelf:s.goodsListState.editGood?.itemModelNameSelf ?? between.itemModelNameSelf, 
+                lineAmountExcludeTax:s.goodsListState.editGood?.lineAmountExcludeTax ?? between.lineAmountExcludeTax, 
+                lineAmountIncludeTax:s.goodsListState.editGood?.lineAmountIncludeTax ?? between.lineAmountIncludeTax, 
+                priceExcludeTax:roundTo8Decimals(s.goodsListState.editGood?.priceExcludeTax ?? between.priceExcludeTax), 
+                priceIncludeTax:roundTo8Decimals(s.goodsListState.editGood?.priceIncludeTax ?? between.priceIncludeTax), 
+                quantity:s.goodsListState.editGood?.quantity ?? between.quantity, 
+                unit:s.goodsListState.editGood?.unit ?? between.unit,  
+                // serialNo:s.goodsListState.editGood?.itemModelName ?? between.itemModelName, 
+                // taxAmount:s.goodsListState.editGood?.itemModelName ?? between.itemModelName, 
+                // taxRate:s.goodsListState.editGood?.itemModelName ?? between.itemModelName, 
+                // lineAttribute:s.goodsListState.editGood?.lineAttribute, 
+              };  
               if (editGood.taxRate) {
                 editGood.taxRate = dutyFree(controller, editGood.taxRate, s.goodsListState.form, editGood)
-              }
-
+              } 
               if (`${editGood.priceIncludeTax}` === '0') {
                 editGood.priceIncludeTax = undefined;
                 editGood.priceExcludeTax = undefined;
-              } else {
-                editGood.priceExcludeTax = getPriceExcludeTax(editGood, record, s.calculatingDigits) as number;
+              } else { 
+                editGood.priceExcludeTax = editGood.priceExcludeTax || getPriceExcludeTax(editGood, record, 8) as number;
               }
 
               if (editGood.quantity && editGood.priceIncludeTax) {
@@ -119,8 +133,7 @@ const DrawerBody = () => {
               //   s.goodsListState.form.setFieldsValue({
               //     ...editGood,
               //   });
-              // }
-
+              // } 
               s.goodsListState.importGoods.isVisibleDrawer = false;
               s.goodsListState.isTaxIncluded
                 ? await updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)

package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/index.tsx

@@ -167,7 +167,10 @@ function AddDiscountRowDrawer(props: {
 
   /** 表单变化 */
   const onChangeForm = React.useCallback(async () => {
-    setFormValues(form.getFieldsValue())
+    // setFormValues(form.getFieldsValue())
+    // 仅在输入框值变化时更新 formValues
+    const values = await form.getFieldsValue();
+    setFormValues(values);
   }, [form])
 
   /** 点击了确认 */
@@ -230,7 +233,8 @@ function AddDiscountRowDrawer(props: {
   React.useEffect(() => {
     if (open) {
       form.resetFields();
-      setFormValues(form.getFieldsValue())
+      form.setFieldsValue({ discolineType: '1', discolineValue: undefined }); // 强制设置初始值
+      setFormValues({ discolineType: '1' }); // 强制设置formValues的初始状态
     }
   }, [open])
 
@@ -257,6 +261,9 @@ function AddDiscountRowDrawer(props: {
         form={form}
         layout='vertical'
         onChange={onChangeForm}
+        initialValues={{
+          discolineType: '1',
+        }}
       >
         <Form.Item label='商品金额（含税）' >
           {totalAmount.toFixed(2)}（共 {discountGood.length} 行）

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;