feact: 金发二开销售订单自测完成

src/locales/en-US/order.ts

@@ -454,7 +454,9 @@ export default {
   'saleOrder.yizhifu': 'paid',
   'saleOrder.dingdanhao': 'Order number',
   'saleOrder.dingdanzhaiyao': 'Order summary',
+  'saleOrder.dingdanfenlei': 'Order classification',
   'saleOrder.caigouhuiyuan': 'purchasing member',
+  'saleOrder.yewuleixin': 'Business types',
   'saleOrder.zongjine/yi': 'Total amount/paid (yuan)',
   'saleOrder.zongjine：': 'Total amount:',
   'saleOrder.yizhifu：': 'paid:',
@@ -462,6 +464,7 @@ export default {
   'saleOrder.dingdanleixing': 'Order Type',
   'saleOrder.waibuzhuangtai': 'External state',
   'saleOrder.neibuzhuangtai': 'Internal State',
+  'saleOrder.yewuleixing': 'Business types',
   'saleOrder.queren': 'Confirm',
   'saleOrder.qingshurudingdanOrderNo': 'Please enter the order number',
   'saleOrder.qingshurudingdanDigest': 'Please enter the order summary',

src/locales/en-US/transaction_components.ts

@@ -159,6 +159,8 @@ export default {
   'transaction_components.fahuoriqi': 'Ship date',
   'transaction_components.qingxuanzefahuoriqi': 'Please select the delivery date',
   'transaction_components.shouhuoxinxi': 'Receipt Information',
+  'transaction_components.daohuoquyu': 'arrival area',
+  'transaction_components.daohuogangko': 'arrival port',
   'transaction_components.jiaofuriqi': 'Delivery Date',
   'transaction_components.jiaofudizhi': 'Delivery address',
   'transaction_components.xuyaofapiao': 'Invoice required',

src/locales/ko-KR/order.ts

@@ -452,7 +452,9 @@ export default {
   'saleOrder.yizhifu': '지불됨',
   'saleOrder.dingdanhao': '주문 번호',
   'saleOrder.dingdanzhaiyao': '주문 요약',
+  'saleOrder.dingdanfenlei': '주문 분류',
   'saleOrder.caigouhuiyuan': '구매 회원',
+  'saleOrder.yewuleixin': '비즈니스 종류',
   'saleOrder.zongjine/yi': '총 금액/지급(위안)',
   'saleOrder.zongjine：': '총 금액:',
   'saleOrder.yizhifu：': '지불됨:',
@@ -460,6 +462,7 @@ export default {
   'saleOrder.dingdanleixing': '주문 유형',
   'saleOrder.waibuzhuangtai': '외부 상태',
   'saleOrder.neibuzhuangtai': '내부 상태',
+  'saleOrder.yewuleixing': '비즈니스 종류',
   'saleOrder.queren': '확인',
   'saleOrder.qingshurudingdanOrderNo': '주문 번호를 입력하십시오.',
   'saleOrder.qingshurudingdanDigest': '주문 요약 정보를 입력하십시오.',

src/locales/ko-KR/transaction_components.ts

@@ -159,6 +159,8 @@ export default {
   'transaction_components.fahuoriqi': '출하 일자',
   'transaction_components.qingxuanzefahuoriqi': '배송일 선택',
   'transaction_components.shouhuoxinxi': '납품 정보',
+  'transaction_components.daohuoquyu': '입하 지역',
+  'transaction_components.daohuogangko': '입하 항구',
   'transaction_components.jiaofuriqi': '배송 일자',
   'transaction_components.jiaofudizhi': '배송 주소',
   'transaction_components.xuyaofapiao': '청구서 필요',

src/locales/zh-CN/order.ts

@@ -452,7 +452,9 @@ export default {
   'saleOrder.yizhifu': '已支付',
   'saleOrder.dingdanhao': '订单号',
   'saleOrder.dingdanzhaiyao': '订单摘要',
+  'saleOrder.dingdanfenlei': '订单分类',
   'saleOrder.caigouhuiyuan': '采购会员',
+  'saleOrder.yewuleixin': '业务类型',
   'saleOrder.zongjine/yi': '总金额/已支付(元)',
   'saleOrder.zongjine：': '总金额：',
   'saleOrder.yizhifu：': '已支付：',
@@ -460,6 +462,7 @@ export default {
   'saleOrder.dingdanleixing': '订单类型',
   'saleOrder.waibuzhuangtai': '外部状态',
   'saleOrder.neibuzhuangtai': '内部状态',
+  'saleOrder.yewuleixing': '业务类型',
   'saleOrder.queren': '确认',
   'saleOrder.qingshurudingdanOrderNo': '请输入订单编号',
   'saleOrder.qingshurudingdanDigest': '请输入订单摘要',

src/locales/zh-CN/transaction_components.ts

@@ -159,6 +159,8 @@ export default {
   'transaction_components.fahuoriqi': '发货日期',
   'transaction_components.qingxuanzefahuoriqi': '请选择发货日期',
   'transaction_components.shouhuoxinxi': '收货信息',
+  'transaction_components.daohuoquyu': '到货区域',
+  'transaction_components.daohuogangko': '到货港口',
   'transaction_components.jiaofuriqi': '送货日期',
   'transaction_components.jiaofudizhi': '送货地址',
   'transaction_components.xuyaofapiao': '需要发票',

src/pages/transaction/_public/order/effects/useOrderDetail.tsx

@@ -57,6 +57,16 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
       render: (text, record) => <StatusColors type={type === 'saleOrder' ? 'saleInside' : 'inside'} status={text} text={record.innerStatusName} />
     },
     {
+      label: intl.formatMessage({ id: 'saleOrder.dingdanfenlei' }, {default: '订单分类'}),
+      name: 'documentTypeName',
+      span: 8,
+    },
+    {
+      label: intl.formatMessage({ id: 'saleOrder.yewuleixing' }, {default: '业务类型'}),
+      name: 'businessTypeName',
+      span: 8,
+    },
+    {
       label: intl.formatMessage({ id: 'purchaseRequisition.laiyuanshangcheng' }),
       name: 'shopName',
       span: 8,

src/pages/transaction/components/orderMergeInfo/index.tsx

@@ -16,8 +16,8 @@ import themeConfig from '@/../config/lingxi.theme.config'
 const intl = getIntl();
 export interface OrderMergeInfoProps { }
 const payInfo = [
-  { title: '到货区域', name: 'arrivalArea' },
-  { title: '到货港口', name: 'arrivalPort' },
+  { title: intl.formatMessage({id: 'transaction_components.daohuoquyu'}, {default: '到货区域'}), name: 'arrivalArea' },
+  { title: intl.formatMessage({id: 'transaction_components.daohuogangko'}, {default: '到货港口'}), name: 'arrivalPort' },
   { title: intl.formatMessage({id: 'transaction_components.jiaofuriqi'}), name: 'deliverDate' },
   {
     title: intl.formatMessage({id: 'transaction_components.jiaofudizhi'}), name: 'areaName', render: (_, record) =>

src/pages/transaction/components/paymentInfoCard/index.tsx

@@ -17,7 +17,11 @@ interface PaymentInfoCardProps extends Omit<CustomizeColumnProps, 'data'> {
   /**
    * 付款条件
    */
+<<<<<<< HEAD
   paymentClauseTypeName: string,
+=======
+   paymentClauseTypeName: string
+>>>>>>> aea74cd94 (feact: 金发二开销售订单自测完成)
 }
 
 const PaymentInfoCard: React.FC<PaymentInfoCardProps> = (props) => {
@@ -37,8 +41,8 @@ const PaymentInfoCard: React.FC<PaymentInfoCardProps> = (props) => {
         },
         {
           title: '付款条件',
-          value: paymentClauseTypeName,
-        },
+          value: paymentClauseTypeName
+        }
       ]}
       style={{
         marginTop: themeConfig['@margin-md'],

src/pages/transaction/components/saleOrderProductTable/index.tsx

@@ -683,6 +683,12 @@ const SaleOrderProductTable: React.FC<OrderProductTableProps> = (props) => {
   // 订单物料
   const materialInfo: any[] = [
     {
+      title: intl.formatMessage({id: 'transaction_components.wuliaopaihao'},{default: '物料牌号'}),
+      dataIndex: 'productBrandNo',
+      key: 'productBrandNo',
+      width: 80,
+    },
+    {
       title: intl.formatMessage({ id: 'transaction_components.wuliaobianhao' }),
       dataIndex: 'productNo',
       key: 'productNo',

src/pages/transaction/saleOrder/constant/index.tsx

@@ -112,6 +112,12 @@ export const baseOrderListColumns: any = (authCode?: string) => {
         ),
       },
       {
+        title: intl.formatMessage({ id: 'saleOrder.dingdanfenlei', defaultMessage: '订单分类' }),
+        dataIndex: 'documentTypeName',
+        key: 'documentTypeName',
+        width: COLUMNS_NORMAL_WIDTH,
+      },
+      {
         title: intl.formatMessage({ id: 'saleOrder.caigouhuiyuan', defaultMessage: '采购会员' }),
         dataIndex: 'memberName',
         key: 'memberName',
@@ -119,6 +125,12 @@ export const baseOrderListColumns: any = (authCode?: string) => {
         width: COLUMNS_NORMAL_WIDTH,
       },
       {
+        title: intl.formatMessage({ id: 'saleOrder.yewuleixin', defaultMessage: '业务类型' }),
+        dataIndex: 'businessTypeName',
+        key: 'businessTypeName',
+        width: COLUMNS_NORMAL_WIDTH,
+      },
+      {
         title: intl.formatMessage({ id: 'saleOrder.xiadanshijian', defaultMessage: '下单时间' }),
         dataIndex: 'createTime',
         key: 'createTime',

src/pages/transaction/saleOrder/readyConfirmDelevedOrder/model/useSelfTable.tsx

@@ -41,12 +41,22 @@ export const useSelfTable = () => {
       width: 200
     },
     {
+      title: intl.formatMessage({ id: 'saleOrder.dingdanfenlei', defaultMessage: '订单分类' }),
+      dataIndex: 'documentTypeName',
+      key: 'documentTypeName',
+    },
+    {
       title: intl.formatMessage({ id: 'saleOrder.caigouhuiyuan', defaultMessage: '采购会员' }),
       align: 'left',
       dataIndex: 'memberName',
       key: 'memberName',
     },
     {
+      title: intl.formatMessage({ id: 'saleOrder.yewuleixin', defaultMessage: '业务类型' }),
+      dataIndex: 'businessTypeName',
+      key: 'businessTypeName',
+    },
+    {
       title: intl.formatMessage({ id: 'saleOrder.zongjine', defaultMessage: '总金额' }),
 
       dataIndex: 'amount',