Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/locales/en-US/order.ts

@@ -305,6 +305,8 @@ export default {
   'purchaseOrder.tijiaoshenhe': 'Submit for review',
   'purchaseOrder.tijiaodingdan': 'Submit order',
   'purchaseOrder.piliangtijiao': 'Batch submission',
+  'purchaseOrder.pilianglingqu': 'Batch to receive',
+  'purchaseOrder.lingqu': 'receive',
   'purchaseOrder.shougongshouhuo': 'Manual receipt',
   'purchaseOrder.ququerenshouhuo': 'Go to confirm receipt',
   'purchaseOrder.di': '第',

src/locales/ko-KR/order.ts

@@ -305,6 +305,8 @@ export default {
   'purchaseOrder.tijiaoshenhe': '제출 심사',
   'purchaseOrder.tijiaodingdan': '주문 전송',
   'purchaseOrder.piliangtijiao': '대량 제출',
+  'purchaseOrder.pilianglingqu': '대량으로 수령하다',
+  'purchaseOrder.lingqu': '받다',
   'purchaseOrder.shougongshouhuo': '수공 수령',
   'purchaseOrder.ququerenshouhuo': '수령을 확인하러 가다',
   'purchaseOrder.di': '다음을 수행합니다.',

src/locales/zh-CN/order.ts

@@ -305,6 +305,8 @@ export default {
   'purchaseOrder.tijiaoshenhe': '提交审核',
   'purchaseOrder.tijiaodingdan': '提交订单',
   'purchaseOrder.piliangtijiao': '批量提交',
+  'purchaseOrder.pilianglingqu': '批量领取',
+  'purchaseOrder.lingqu': '领取',
   'purchaseOrder.shougongshouhuo': '手工收货',
   'purchaseOrder.ququerenshouhuo': '去确认收货',
   'purchaseOrder.di': '第',

src/pages/classAndProperty/class/index.tsx

@@ -130,9 +130,10 @@ const ClassProperty: React.FC<{}> = () => {
   }
 
   const handlePlateformSelect = (key, node) => {
-    if (node.children && node.children.length > 0) {
-      return;
-    }
+    // @ 取消关联平台品类仅选择最后一级
+    // if (node.children && node.children.length > 0) {
+    //   return;
+    // }
     setPlateformSelectNode({ id: key * 1, name: node._title })
   }
 

src/pages/transaction/purchaseOrder/readyDistributionOrder/index.tsx

@@ -79,7 +79,7 @@ const ReadyDistributionOrder:React.FC<ReadyDistributionOrderProps> = (props) =>
         }}
         formilyChilds={{
           children: <Space>
-            <Button onClick={handleBitchPush} loading={loading}>{intl.formatMessage({ id: 'purchaseOrder.piliangtijiao', defaultMessage: '批量提交' })}</Button>
+            <Button onClick={handleBitchPush} loading={loading}>{intl.formatMessage({ id: 'purchaseOrder.pilianglingqu', defaultMessage: '批量领取' })}</Button>
           </Space>,
           layouts: {
             span: 8

src/pages/transaction/purchaseOrder/readyDistributionOrder/model/useSelfTable.tsx

@@ -19,7 +19,7 @@ export const useSelfTable = () => {
       align: 'center',
       dataIndex: 'ctl',
       key: 'ctl',
-      render: (text, record) => <Button type='link' onClick={() => handleSubmit(record.orderId)}>{intl.formatMessage({ id: 'purchaseOrder.tijiaodingdan', defaultMessage: '提交订单' })}</Button>
+      render: (text, record) => <Button type='link' onClick={() => handleSubmit(record.orderId)}>{intl.formatMessage({ id: 'purchaseOrder.lingqu', defaultMessage: '领取' })}</Button>
     }
   ])
 

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

@@ -79,7 +79,7 @@ const ReadyDistributionOrder:React.FC<ReadyDistributionOrderProps> = (props) =>
         }}
         formilyChilds={{
           children: <Space>
-            <Button onClick={handleBitchPush} loading={loading}>{intl.formatMessage({ id: 'purchaseOrder.piliangtijiao', defaultMessage: '批量提交' })}</Button>
+            <Button onClick={handleBitchPush} loading={loading}>{intl.formatMessage({ id: 'purchaseOrder.pilianglingqu', defaultMessage: '批量领取' })}</Button>
           </Space>,
           layouts: {
             span: 8

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

@@ -19,7 +19,7 @@ export const useSelfTable = () => {
       align: 'center',
       dataIndex: 'ctl',
       key: 'ctl',
-      render: (text, record) => <Button type='link' onClick={() => handleSubmit(record.orderId)}>{intl.formatMessage({ id: 'purchaseOrder.tijiaodingdan', defaultMessage: '提交订单' })}</Button>
+      render: (text, record) => <Button type='link' onClick={() => handleSubmit(record.orderId)}>{intl.formatMessage({ id: 'purchaseOrder.lingqu', defaultMessage: '领取' })}</Button>
     }
   ])