自定义选择地址默认值修复 与 通知单还有协同过来的

src/components/AddressDrawer/AddressDrawer.tsx

@@ -44,19 +44,23 @@ interface AddressDrawerProps {
   className?: string
   renderText?: React.ReactNode
   hiddenBtn?: boolean
+  formProps?: FormInstance,
+  id?: string
 }
 
 function AddressDrawer(props: AddressDrawerProps) {
 
   const { onChange, formInstance, renderForm, sumbitRequest,
-    addressListRequest, value: addr, disabled = false, rows = 1, hiddenBtn=false,
+    addressListRequest, value: addr, disabled = false, rows = 1, hiddenBtn = false,
     showDefault = false,
     formatValue = (addr) => {
       return FormatValue(addr)
     },
     title,
     className,
-    renderText
+    renderText,
+    formProps,
+    id
   } = props;
 
   const [visible, setVisible] = useState<boolean>(false);
@@ -104,8 +108,10 @@ function AddressDrawer(props: AddressDrawerProps) {
       } else if (showDefault) {
         // 如果没有默认值，且设置了 showDefault
         const target = data.find(v => v.isDefault === 1)
-        if (target != undefined) {
-          onChange(target)
+        if (target != undefined && formProps !== undefined) {
+          formProps.setFieldsValue({
+            [id]: target
+          })
         }
 
       }
@@ -180,7 +186,7 @@ function AddressDrawer(props: AddressDrawerProps) {
           :
           (
             <Row className={className} gutter={10}>
-              <Col span={hiddenBtn?24:20}>
+              <Col span={hiddenBtn ? 24 : 20}>
                 <Input.TextArea rows={rows} disabled={disabled}
                   value={value}
                   onChange={handleInputChange}
@@ -193,7 +199,7 @@ function AddressDrawer(props: AddressDrawerProps) {
                   </Col>
                 )
               }
-              
+
             </Row>
           )
       }

src/pages/order/deliveryNotice/create/add.tsx

@@ -170,6 +170,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             ]}
             label={BuyerLabel} name="member">
             <RoleSelect
+              formProp={form}
               disabled={true}
               formatFeils={(e) => {
                 return {
@@ -189,7 +190,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
               required(`${DeliveryDate}不能为空`)
             ]}
             label={DeliveryDate} name="deliveryTime">
-            <DatePickerSelect disabled={true} defualtToday={true} className='w-full' />
+            <DatePickerSelect formProp={form} disabled={true} defualtToday={true} className='w-full' />
           </FormItem>
 
           <FormItem
@@ -245,6 +246,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             ]}
             label={DeliverySlefAddrLabel} name="deliveryVO">
             <ShipperAddress
+              formProp={form}
               showDefault={true}
               onChange={(val) => {
                 form.setFieldsValue({
@@ -284,7 +286,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
           </FormItem>
 
           <FormItem hidden={isLogistics} label={LogisticsCompanyLabel} name="logisticsCompanyInt">
-            <LogisticsCompanyMerchantsSelect />
+            <LogisticsCompanyMerchantsSelect formProp={form} />
           </FormItem>
 
           <FormItem

src/pages/order/deliveryNotice/manageB2B/add.tsx

@@ -215,6 +215,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             label={DeliverySlefAddrLabel} name="deliveryVO">
 
             <ShipperAddress
+              formProp={form}
               showDefault={true}
             />
 

src/pages/order/deliveryNotice/manageSRM/add.tsx

@@ -199,6 +199,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             label={DeliverySlefAddrLabel} name="deliveryVO">
 
             <ShipperAddress
+              formProp={form}
               showDefault={true}
             />
 

src/pages/order/deliveryNoticeManagement/deliveryNoticeFromCreate/index.tsx

@@ -159,6 +159,7 @@ function DeliveryNoticeFromCreate() {
             ]}
             label={BuyerLabel} name="member">
             <RoleSelect
+             formProp={form}
               disabled={true}
               formatFeils={(e) => {
                 return {
@@ -260,7 +261,7 @@ function DeliveryNoticeFromCreate() {
             <Input />
           </FormItem>
           <FormItem hidden={isLogistics} label={LogisticsCompanyLabel} name="logisticsCompanyInt">
-            <LogisticsCompanyMerchantsSelect />
+            <LogisticsCompanyMerchantsSelect formProp={form} />
           </FormItem>
           <FormItem hidden={isLogistics} label={LogisticsNoLabel} name="logisticsNo">
             <Input />