feat: 添加跳转新增售后退货单

src/pages/afterService/returnApplication/returnPrSubmit/addReturn.tsx

@@ -3,10 +3,10 @@ import { usePageStatus } from '@/hooks/usePageStatus';
 import ReturnForm from './components/ReturnForm';
 
 const AddReturn: React.FC = () => {
-  const { orderId } = usePageStatus();
+  const { orderId, orderType } = usePageStatus();
 
   return (
-    <ReturnForm orderId={orderId} isEdit />
+    <ReturnForm orderId={orderId} orderType={+orderType} isEdit />
   );
 };
 

src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx

@@ -47,6 +47,10 @@ interface BillsFormProps {
    * 订单id，从订单列表跳转过来的
    */
   orderId?: number,
+  /**
+   * 订单类型
+   */
+  orderType?: number,
 };
 
 interface DetailInfo {
@@ -65,6 +69,10 @@ interface DetailInfo {
    * 订单编号
    */
   orderNo?: string,
+  /**
+   * 订单类型
+   */
+  orderType?: number,
 }
 
 interface OrderNoProps {
@@ -92,6 +100,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
   id, 
   isEdit = false, 
   orderId,
+  orderType: outerOrderType,
 }) => {
   const [detailInfo, setDetailInfo] = useState<DetailInfo>({
     applyTime: moment().format('YYYY-MM-DD HH:mm:ss'), 
@@ -250,6 +259,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
         vendorRoleId: supplierMemberValue[0].roleId,
         orderType: orderTypeValue,
         afterSalesType: 3,  // 退货
+        orderNo: detailInfo.orderNo ? detailInfo.orderNo : params.orderNo || undefined,
       }).then(res => {
         if (res.code === 1000) {
           resolve(res.data);
@@ -363,16 +373,14 @@ const ReturnForm: React.FC<BillsFormProps> = ({
       return;
     }
     setInfoLoading(true);
-    PublicApi.getOrderProcurementOrderDetails({
-      id: `${orderId}`,
-      orderNo: '',
-    } as any)
-    .then(res => {
+    PublicApi.getOrderBuyerDetail({
+      orderId: `${orderId}`,
+    }).then(res => {
       if (res.code === 1000) {
         const {
-          supplyMembersName, 
-          supplyMembersId, 
-          supplyMembersRoleId, 
+          vendorMemberName, 
+          vendorMemberId, 
+          vendorRoleId, 
           orderNo, 
         } = res.data;
 
@@ -386,18 +394,20 @@ const ReturnForm: React.FC<BillsFormProps> = ({
         setDetailInfo({
           applyTime: moment().format('YYYY-MM-DD HH:mm:ss'), 
           supplierMember: 
-            supplyMembersName ? 
+          vendorMemberName ? 
               [
                 {
-                  name: supplyMembersName, 
-                  memberId: supplyMembersId, 
-                  roleId: supplyMembersRoleId, 
+                  name: vendorMemberName, 
+                  memberId: vendorMemberId, 
+                  roleId: vendorRoleId, 
                 }, 
               ] : 
               []
           , 
-          orderNo, 
+          orderNo,
+          orderType: +outerOrderType,
         });
+        setOrderTypeValue(+outerOrderType);
       }
     })
     .catch((err) => {
@@ -597,7 +607,6 @@ const ReturnForm: React.FC<BillsFormProps> = ({
   };
 
   const handleGoodsConfirm = values => {
-    console.log('values', values)
     const preValues = addSchemaAction.getFieldValue('returnGoodsList');
     const value = [];
 
@@ -764,6 +773,13 @@ const ReturnForm: React.FC<BillsFormProps> = ({
                     field.visible = false;
                   });
                 }
+
+                if (outerOrderType) {
+                  setFieldState('orderType', field => {
+                    field.editable = false;
+                    // field.value = +outerOrderType;
+                  });
+                }
               });
 
               onFieldInputChange$('orderType').subscribe(fieldState => {

src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/schema/index.ts

@@ -463,22 +463,6 @@ export const addSchema = (orderType: number): ISchema => {
                       }, 
                     ],
                   }, 
-                  // // 退货发货地址
-                  // shippingAddress: {
-                  //   title: '退货发货地址', 
-                  //   type: 'string', 
-                  //   visible: false, 
-                  //   'x-component': 'AddressFormItem', 
-                  //   'x-component-props': {
-                  //     dataSource: [],
-                  //   }, 
-                  //   'x-rules': [
-                  //     {
-                  //       required: true, 
-                  //       message: '请选择退货发货地址', 
-                  //     },
-                  //   ],
-                  // }, 
                   // 退货发货地址
                   shippingAddress: {
                     title: '退货发货地址',