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

src/components/RoleSelect/RoleSelect.tsx

-import { Button, Col, Drawer, Form, Input, message, Pagination, Radio, Row, Table } from "antd"
+import { Button, Col, Drawer, Form, Input, message, Pagination, Radio, Row, Space, Table } from "antd"
 import { useCallback, useEffect, useState } from "react"
 import { TableMemberColumn } from "./columns"
 import { LinkOutlined } from "@ant-design/icons"
@@ -101,7 +101,7 @@ function RoleSelect(props: RoleSelectProps) {
       <RowStyleLayout>
         <Input.Group compact>
           <Input value={value?.name} disabled />
-          { !localDisabled && <Button type='primary' icon={<LinkOutlined />} disabled={localDisabled} onClick={showDrawer}></Button> }
+          {!localDisabled && <Button type='primary' icon={<LinkOutlined />} disabled={localDisabled} onClick={showDrawer}></Button>}
         </Input.Group>
       </RowStyleLayout>
 
@@ -111,14 +111,14 @@ function RoleSelect(props: RoleSelectProps) {
         onClose={closeDrawer}
         width="50vw"
         footer={
-          <Button.Group>
+          <Space style={{ width: '100%', justifyContent: 'flex-end' }}>
             <Button type="primary" onClick={handleSubmit}>
               确定
             </Button>
             <Button onClick={closeDrawer}>
               取消
             </Button>
-          </Button.Group>
+          </Space>
         }
       >
         <Form form={form}>
@@ -149,7 +149,7 @@ function RoleSelect(props: RoleSelectProps) {
             columns={TableMemberColumn}
             dataSource={dataSource}
             pagination={{
-              position: ['bottomCenter'],
+              position: ['bottomRight'],
               total,
               pageSize,
               current,
@@ -164,7 +164,7 @@ function RoleSelect(props: RoleSelectProps) {
             }}
           />
         </Radio.Group>
-
+        
       </Drawer>
     </>
   );

src/pages/order/deliveryPlanCollaboration/deliveryPlanAwait/details.tsx

@@ -157,7 +157,7 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
       <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>
         <BaseInfo.BaseInfoItem label={PlanNumber}> {details?.planNo} </BaseInfo.BaseInfoItem>
 
-        <BaseInfo.BaseInfoItem label={BuyerLabel}> {details?.vendorMemberName} </BaseInfo.BaseInfoItem>
+        <BaseInfo.BaseInfoItem label={BuyerLabel}> {details?.buyerMemberName} </BaseInfo.BaseInfoItem>
 
         <BaseInfo.BaseInfoItem label={PlanSummary}> {details?.digest} </BaseInfo.BaseInfoItem>
 

src/pages/order/deliveryPlanCollaboration/deliveryPlanQuery/details.tsx

@@ -245,7 +245,7 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
         <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>
           <BaseInfo.BaseInfoItem label={PlanNumber}> {details?.planNo} </BaseInfo.BaseInfoItem>
 
-          <BaseInfo.BaseInfoItem label={BuyerLabel}> {details?.vendorMemberName} </BaseInfo.BaseInfoItem>
+          <BaseInfo.BaseInfoItem label={BuyerLabel}> {details?.buyerMemberName} </BaseInfo.BaseInfoItem>
 
           <BaseInfo.BaseInfoItem label={PlanSummary}> {details?.digest} </BaseInfo.BaseInfoItem>
 

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/create.tsx

@@ -6,7 +6,7 @@
 import React, { useEffect, useRef, useState } from 'react'
 import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
 import { history } from 'umi'
-import { Circulation, ConfirmDeliveryPlan, Purchaser, SubmitDeliveryPlan, BaseInfo as base_Info, Supplier, PlanningCycle, SupplyMembersLabel, PlanSummary, Remarks, PlannedDelivery, DeliveryPlanText, DeliveryPlanRemark, CreateDeliveryPlanTitleB2B } from '../../constants'
+import { BaseInfo as base_Info, PlanningCycle, SupplyMembersLabel, PlanSummary, Remarks, PlannedDelivery, DeliveryPlanText, DeliveryPlanRemark, CreateDeliveryPlanTitleB2B } from '../../constants'
 import { Button, DatePicker, Form, Input, InputNumber, message, Space, Spin, Steps, Table } from 'antd'
 import { CaretDownOutlined, CaretRightOutlined, SaveOutlined } from '@ant-design/icons'
 import BaseInfo from '@/components/BaseInfo/BaseInfo'
@@ -51,7 +51,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
 
   const expandedRowRender = (record, index) => {
     return <div>
-      <Table rowKey={'orderProductId'} columns={expandIconColumn} dataSource={record.orders} pagination={false} tableLayout="fixed" />
+      <Table rowKey={'orderProductId'} columns={expandIconColumn} dataSource={record.orders} pagination={false} tableLayout="fixed" scroll={{ x: '100%' }}/>
     </div>
   }
 
@@ -124,7 +124,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
       const dates = getDayAll(startDate, endDate)
       datesRef.current = dates
       setSelectedDate([startDate, endDate])
-      const datesColumn = dates.map((item, i) => ({ title: item.substr(1), dataIndex: item, key: item, width: 120, align: 'center', }))
+      const datesColumn = dates.map((item, i) => ({ title: item.substr(1), dataIndex: item, key: item, width: 90, align: 'center', }))
       const datesExpandIconColumn = dates.map((item, i) => ({
         title: item.substr(1),
         dataIndex: item,
@@ -215,12 +215,6 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
           labelAlign='left'
           form={form}
         >
-          {/* <BaseInfo className='mt-0' title={Circulation.name} id={Circulation.key} cols={1}>
-            <Steps progressDot current={0}>
-              <Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
-              <Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
-            </Steps>
-          </BaseInfo> */}
           <BaseInfo className='mt-0' title={base_Info.name} id={base_Info.key}>
             <Form.Item
               {...formItemLayout}

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/details.tsx

@@ -128,8 +128,8 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
         }
       >
         <Steps progressDot current={details?.outerStatus - 1}>
-          <Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
-          <Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
+          <Steps.Step title={SubmitDeliveryPlan} description={Purchaser} />
+          <Steps.Step title={ConfirmDeliveryPlan} description={Supplier} />
         </Steps>
       </BaseInfo>
       <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/update.tsx

@@ -199,8 +199,8 @@ const DeliveryPlanAwaitB2BUpdate: React.FC = () => {
             }
           >
             <Steps progressDot current={0}>
-              <Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
-              <Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
+              <Steps.Step title={SubmitDeliveryPlan} description={Purchaser} />
+              <Steps.Step title={ConfirmDeliveryPlan} description={Supplier} />
             </Steps>
           </BaseInfo>
           <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/details.tsx

@@ -123,8 +123,8 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
         }
       >
         <Steps progressDot current={details?.outerStatus - 1}>
-          <Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
-          <Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
+          <Steps.Step title={SubmitDeliveryPlan} description={Purchaser} />
+          <Steps.Step title={ConfirmDeliveryPlan} description={Supplier} />
         </Steps>
       </BaseInfo>
       <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/update.tsx

@@ -200,8 +200,8 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
             }
           >
             <Steps progressDot current={0}>
-              <Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
-              <Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
+              <Steps.Step title={SubmitDeliveryPlan} description={Purchaser} />
+              <Steps.Step title={ConfirmDeliveryPlan} description={Supplier} />
             </Steps>
           </BaseInfo>
           <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>

src/pages/order/deliveryPlanManagement/deliveryPlanQuery/update.tsx

@@ -202,8 +202,8 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
             }
           >
             <Steps progressDot current={details?.status === 4 ? 1 : 0}>
-              <Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
-              <Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
+              <Steps.Step title={SubmitDeliveryPlan} description={Purchaser} />
+              <Steps.Step title={ConfirmDeliveryPlan} description={Supplier} />
             </Steps>
           </BaseInfo>
           <BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>