修复：租赁地址回显

src/api/interface/systemManageType.ts

@@ -340,3 +340,16 @@ export type editAddressType = InterFunction<
 >;
 //地址管理-删除地址
 export type deleteAddressType = InterFunction<{ id: number }, any>;
+// 地址管理-根据id查找
+export type getUserAddressInfoType = InterFunction<
+  { userAddressId: number },
+  {
+    takeAddress: string;
+    takeName: string;
+    takePhone: string;
+    takeRegion: string;
+    type: number;
+    districtCode: string;
+    id: number;
+  }
+>;

src/api/modules/systemManage.ts

@@ -7,6 +7,7 @@ import {
   editAddressType,
   getCompanyInfoByIdType,
   getSecondDistrictInfo,
+  getUserAddressInfoType,
   insertBAccountType,
   insertRoleInfoType,
   listBAccountPageType,
@@ -119,4 +120,7 @@ export class SystemManageAPI {
   //  地址管理-删除
   static deleteAddress: deleteAddressType = (params) =>
     axios.get('/oms/user-address/deleteById', { params });
+  //   地址管理-根据地址id查找
+  static getUserAddressInfo: getUserAddressInfoType = (params) =>
+    axios.get('/oms/user-address/getUserAddressInfo', { params });
 }

src/pages/rentManage/rentGoods/rentAddOrEdit/components/addressInfo/index.tsx

@@ -104,6 +104,17 @@ const AddressInfo = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
   const addOrEditAddressModalCancel = () => {
     setAddOrEditAddressModalShow(false);
   };
+  // 获取地址
+  const getUserAddressInfo = (userAddressId: number, key: string) => {
+    SystemManageAPI.getUserAddressInfo({ userAddressId }).then(({ result }) => {
+      addressInfoForm.setFieldValue(
+        key,
+        result.takeName +
+          result.takePhone +
+          `(${result.takeRegion.split('/').join('') + result.takeAddress})`,
+      );
+    });
+  };
 
   useEffect(() => {
     getAddressList();
@@ -113,9 +124,9 @@ const AddressInfo = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
 
   useEffect(() => {
     if (rentGoodsDetails) {
+      getUserAddressInfo(rentGoodsDetails.shipAddress, 'shipAddress');
+      getUserAddressInfo(rentGoodsDetails.returnAddress, 'returnAddress');
       addressInfoForm.setFieldsValue({
-        shipAddress: rentGoodsDetails.shipAddress,
-        returnAddress: rentGoodsDetails.returnAddress,
         logisticsCompany: rentGoodsDetails.logisticsCompany,
         modeOfDelivery: rentGoodsDetails.modeOfDelivery,
       });

src/pages/rentManage/rentGoods/rentAddOrEdit/components/goodsInfo/index.tsx

@@ -68,7 +68,7 @@ const GoodsInfo = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
           <Input placeholder='请输入商品标题' maxLength={30} />
         </Form.Item>
         <Form.Item
-          label='商品卖点'
+          label='营销短语'
           name='sellingPoint'
           rules={[{ required: true, message: '请输入商品卖点' }]}
         >

src/pages/rentManage/rentGoods/rentDetail/index.tsx

@@ -59,17 +59,21 @@ const RentDetail = () => {
       key: string;
     }[]
   >([]);
-  const [addressOptionList, setAddressOptionList] = useState<
-    { label: string; value: number; districtCode: string }[]
-  >([]);
   const [expressOptionList, setExpressOptionList] = useState<{ label: string; value: string }[]>(
     [],
   );
+  // 寄出地址跟归还地址str
+  const [addressStr, setAddressStr] = useState<any>({
+    shipAddress: '',
+    returnAddress: '',
+  });
 
   //获取租赁商品详情
   const getRentGoodsDetail = (id: number) => {
     RentManageAPI.getLeaseGoodsDetails({ id }).then(({ result }) => {
       if (result) {
+        getAddressStr(result.shipAddress, 'shipAddress');
+        getAddressStr(result.returnAddress, 'returnAddress');
         setRentGoodsDetails({ ...result });
         //转化数据
         const covertSpecAttrList = result.specAttrList.map((v, index) => ({
@@ -174,19 +178,6 @@ const RentDetail = () => {
       }
     });
   };
-  //地址列表
-  const getAddressList = () => {
-    SystemManageAPI.getAddressList({}).then(({ result }) => {
-      if (result) {
-        const optionList = result.map((v) => ({
-          label: v.takeName + v.takePhone + `(${v.takeRegion.split('/').join('') + v.takeAddress})`,
-          value: v.id,
-          districtCode: v.districtCode,
-        }));
-        setAddressOptionList(optionList);
-      }
-    });
-  };
   //物流公司列表
   const getListExpressInfo = () => {
     OrderManageAPI.listExpressInfo().then(({ result }) => {
@@ -199,6 +190,16 @@ const RentDetail = () => {
       }
     });
   };
+  // 地址名称
+  const getAddressStr = (userAddressId: number, key: string) => {
+    SystemManageAPI.getUserAddressInfo({ userAddressId }).then(({ result }) => {
+      addressStr[key] =
+        result.takeName +
+        result.takePhone +
+        `(${result.takeRegion.split('/').join('') + result.takeAddress})`;
+      setAddressStr({ ...addressStr });
+    });
+  };
 
   //返回
   const backRoute = () => {
@@ -207,7 +208,6 @@ const RentDetail = () => {
 
   useEffect(() => {
     getLeaseTermInfo();
-    getAddressList();
     getListExpressInfo();
   }, []);
 
@@ -327,12 +327,8 @@ const RentDetail = () => {
         </Descriptions.Item>
       </Descriptions>
       <Descriptions title='物流信息' bordered column={2} style={{ marginTop: '10px' }}>
-        <Descriptions.Item label='发货地址'>
-          {addressOptionList.find((v) => v.value === rentGoodsDetails?.shipAddress)?.label}
-        </Descriptions.Item>
-        <Descriptions.Item label='归还地址'>
-          {addressOptionList.find((v) => v.value === rentGoodsDetails?.returnAddress)?.label}
-        </Descriptions.Item>
+        <Descriptions.Item label='发货地址'>{addressStr.shipAddress}</Descriptions.Item>
+        <Descriptions.Item label='归还地址'>{addressStr.returnAddress}</Descriptions.Item>
         <Descriptions.Item label='寄出物流'>
           {expressOptionList.find((v) => v.value === rentGoodsDetails?.logisticsCompany)?.label}
         </Descriptions.Item>