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

src/pages/order/assets/handles/ReceiveNotePage.tsx

@@ -35,7 +35,7 @@ class ReceiveNoteManage extends ReceiveNoteBase {
   }
 
   getQuery(payload?: any) {
-    return getOrderReceiveOrderPage().then(res => {
+    return getOrderReceiveOrderPage(payload).then(res => {
       return res.data;
     })
   }
@@ -55,7 +55,7 @@ class ReceiveNoteQuery extends ReceiveNoteBase {
   }
 
   getQuery(payload?: any) {
-    return getOrderReceiveOrderDeliveryPage().then(res => {
+    return getOrderReceiveOrderDeliveryPage(payload).then(res => {
       return res.data;
     })
   }

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

@@ -74,7 +74,6 @@ function DeliveryNoteAddForm() {
   function RenaderDeliveryType({ value }: { value?: any }) {
     return (
       <>
-        <Input />
         {value === 0 ? '自提' : '物流'}
       </>
     )

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

@@ -75,7 +75,6 @@ function DeliveryNoteAddForm() {
   function RenaderDeliveryType({ value }: { value?: any }) {
     return (
       <>
-        <Input />
         {value === 0 ? '自提' : '物流'}
       </>
     )
@@ -193,8 +192,8 @@ function DeliveryNoteAddForm() {
 
         <ContentBox title={LogisticsInfo.name} id={LogisticsInfo.key}>
 
-          <FormItem hidden name="deliveryType">
-            <Input />
+          <FormItem hidden={true} name="deliveryType">
+            <Input hidden={true}/>
           </FormItem>
 
           <FormItem

src/pages/order/receivingNote/deliveryNoteQuery/index.tsx

@@ -96,8 +96,8 @@ const DeliveryNoteQuery: React.FC = () => {
     { title: '单据时间', dataIndex: 'createTime', key: 'createTime' },
     {
       title: '外部状态',
-      dataIndex: 'id6',
-      key: 'id6',
+      dataIndex: 'orderStatusName',
+      key: 'orderStatusName',
       render: (text: string, record: any) => {
         const styles = tagStatus.getTagStyle(record.outerStatus)
         return (