Merge branch 'dev' into test

src/pages/logistics/addLogistics/index.tsx

@@ -186,8 +186,11 @@ const AddLogistics: React.FC<{}> = () => {
               relevanceOrderCode: res.data.orderNo,
               voucherTime: res.data.transactionTime,
               externalState: res.data.state,
-              shipmentOrderId: res.data.id,
-              relevanceOrderId: res.data.relevanceInvoicesId,
+              shipmentOrderId: res.data.relevanceInvoicesId,
+              relevanceOrderId: res.data.id,
+              receiverMemberId: res.data.supplyMembersId,
+              receiverRoleId: res.data.supplyMembersRoleId,
+              receiverMemberName: res.data.supplyMembersName,
             }
             form.setFieldsValue(obj);
             setQuery({ ...obj })
@@ -205,10 +208,13 @@ const AddLogistics: React.FC<{}> = () => {
               shipperFullAddress: res.data.deliveryAddress,
               shipmentOrderCode: res.data.deliveryNo,
               relevanceOrderCode: res.data.noticeNo,
-              shipmentOrderId: res.data.deliveryId,
-              relevanceOrderId: res.data.id,
+              shipmentOrderId: res.data.id,
+              relevanceOrderId: res.data.deliveryId,
               voucherTime: res.data.createTime,
               externalState: res.data.outerStatus,
+              receiverMemberId: res.data.supplierMemberId,
+              receiverRoleId: res.data.supplierRoleId,
+              receiverMemberName: res.data.supplierName,
             }
             form.setFieldsValue(obj);
             setQuery({ ...obj })
@@ -227,6 +233,9 @@ const AddLogistics: React.FC<{}> = () => {
               relevanceOrderId: res.data.applyId,
               externalState: res.data.state,
               digest: res.data.applyAbstract,
+              receiverMemberId: res.data.receiveMemberId,
+              receiverRoleId: res.data.receiveRoleId,
+              receiverMemberName: res.data.receiveUserName,
             }
             form.setFieldsValue(obj);
             setQuery({ ...obj })
@@ -244,7 +253,10 @@ const AddLogistics: React.FC<{}> = () => {
               voucherTime: res.data.applyTime,
               relevanceOrderId: res.data.applyId,
               externalState: res.data.state,
-              digest: res.data.applyAbstract
+              digest: res.data.applyAbstract,
+              receiverMemberId: res.data.receiveMemberId,
+              receiverRoleId: res.data.receiveRoleId,
+              receiverMemberName: res.data.receiveUserName,
             }
             form.setFieldsValue(obj);
             setQuery({ ...obj })
@@ -262,7 +274,10 @@ const AddLogistics: React.FC<{}> = () => {
               relevanceOrderId: res.data.applyId,
               voucherTime: res.data.applyTime,
               externalState: res.data.state,
-              digest: res.data.applyAbstract
+              digest: res.data.applyAbstract,
+              receiverMemberId: res.data.receiveMemberId,
+              receiverRoleId: res.data.receiveRoleId,
+              receiverMemberName: res.data.receiveUserName,
             }
             form.setFieldsValue(obj);
             setQuery({ ...obj })
@@ -503,8 +518,8 @@ const AddLogistics: React.FC<{}> = () => {
           data.receiverAddressId = selectRow.receiverAddressId;
           data.receiverFullAddress = selectRow.fullAddress;
           data.receiverMemberName = selectRow.memberName;
+          data.relevanceOrderId = selectRow.id
         }
-        data.relevanceOrderId = selectRow.id
         data.relevanceOrderCode = selectRow.orderNo
         form.setFieldsValue({
           relevanceOrderCode: selectRow.orderNo