Merge branch '20418order' into 'v2-220418'

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

@@ -55,19 +55,20 @@ function DeliveryNoticeFromCreate() {
       }
 
       const type = res.orderType;
+
       service.setFormService(type);
       setType(type);
 
       form.setFieldsValue(res)
 
-      handleAnchor(res.products.length)
+      handleAnchor(type, res.products.length)
 
       setTableDataSource(res.products)
     })
 
   }, [])
 
-  const handleAnchor = (len) => {
+  const handleAnchor = (type, len) => {
     update([
       type === RoleTypeEnum.B2B ? {
         ...DeliveryGood,
@@ -159,7 +160,7 @@ function DeliveryNoticeFromCreate() {
             ]}
             label={BuyerLabel} name="member">
             <RoleSelect
-             formProp={form}
+              formProp={form}
               disabled={true}
               formatFeils={(e) => {
                 return {
@@ -218,7 +219,7 @@ function DeliveryNoticeFromCreate() {
 
             <ReceiverAddress
               hiddenBtn={true}
-              disabled={false}
+              disabled={true}
             />
 
           </FormItem>

src/pages/order/receivingNote/deliveryNoteManage/add.tsx

@@ -57,6 +57,14 @@ function DeliveryNoteAddForm() {
     service.getDetailById(id).then(info => {
       const target = noteService.formatField(info);
 
+      target.member = {
+        buyerMemberId: info?.buyerMemberId,
+        buyerMemberName: info?.buyerMemberName,
+        buyerRoleId: info?.buyerRoleId,
+        roleType: 2,
+        name: info?.vendorMemberName
+      },
+
       form.setFieldsValue({
         deliveryOrderId: id,
         ...target