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

config/routes/tranactionRoute/index.ts

@@ -80,19 +80,19 @@ const TranactionRoute = {
 
     // 进销存
     {
-      path: '/memberCenter/tranactionAbility/stockSellStorage',
+      path: '/memberCenter/commodityAbility/stockSellStorage',
       name: 'stockSellStorage',
       routes: [
         // 仓库
         {
-          path: '/memberCenter/tranactionAbility/stockSellStorage/warehouse',
+          path: '/memberCenter/commodityAbility/stockSellStorage/warehouse',
           name: 'warehouse',
           component: '@/pages/transaction/stockSellStorage/warehouse/index',
         },
         // 仓库-新增
         {
           path:
-            '/memberCenter/tranactionAbility/stockSellStorage/warehouse/add',
+            '/memberCenter/commodityAbility/stockSellStorage/warehouse/add',
           name: 'addWarehouse',
           hideInMenu: true,
           noMargin: true,
@@ -102,7 +102,7 @@ const TranactionRoute = {
         // 仓库-编辑
         {
           path:
-            '/memberCenter/tranactionAbility/stockSellStorage/warehouse/edit',
+            '/memberCenter/commodityAbility/stockSellStorage/warehouse/edit',
           name: 'editWarehouse',
           hideInMenu: true,
           noMargin: true,
@@ -112,7 +112,7 @@ const TranactionRoute = {
         // 仓库-详情
         {
           path:
-            '/memberCenter/tranactionAbility/stockSellStorage/warehouse/detail',
+            '/memberCenter/commodityAbility/stockSellStorage/warehouse/detail',
           name: 'warehouseDetail',
           hideInMenu: true,
           noMargin: true,
@@ -121,14 +121,14 @@ const TranactionRoute = {
         },
         // 单据类型
         {
-          path: '/memberCenter/tranactionAbility/stockSellStorage/billsType',
+          path: '/memberCenter/commodityAbility/stockSellStorage/billsType',
           name: 'billsType',
           component: '@/pages/transaction/stockSellStorage/billsType/index',
         },
         // 单据类型-新增
         {
           path:
-            '/memberCenter/tranactionAbility/stockSellStorage/billsType/add',
+            '/memberCenter/commodityAbility/stockSellStorage/billsType/add',
           name: 'addBillsType',
           hideInMenu: true,
           noMargin: true,
@@ -138,7 +138,7 @@ const TranactionRoute = {
         // 单据类型-编辑
         {
           path:
-            '/memberCenter/tranactionAbility/stockSellStorage/billsType/edit',
+            '/memberCenter/commodityAbility/stockSellStorage/billsType/edit',
           name: 'editBillsType',
           hideInMenu: true,
           noMargin: true,
@@ -148,7 +148,7 @@ const TranactionRoute = {
         // 单据类型-详情
         {
           path:
-            '/memberCenter/tranactionAbility/stockSellStorage/billsType/detail',
+            '/memberCenter/commodityAbility/stockSellStorage/billsType/detail',
           name: 'billsTypeDetail',
           hideInMenu: true,
           noMargin: true,
@@ -157,13 +157,13 @@ const TranactionRoute = {
         },
         // 单据
         {
-          path: '/memberCenter/tranactionAbility/stockSellStorage/bills',
+          path: '/memberCenter/commodityAbility/stockSellStorage/bills',
           name: 'bills',
           component: '@/pages/transaction/stockSellStorage/bills/index',
         },
         // 单据-新增
         {
-          path: '/memberCenter/tranactionAbility/stockSellStorage/bills/add',
+          path: '/memberCenter/commodityAbility/stockSellStorage/bills/add',
           name: 'addBills',
           hideInMenu: true,
           noMargin: true,
@@ -171,7 +171,7 @@ const TranactionRoute = {
         },
         // 单据-编辑
         {
-          path: '/memberCenter/tranactionAbility/stockSellStorage/bills/edit',
+          path: '/memberCenter/commodityAbility/stockSellStorage/bills/edit',
           name: 'editBills',
           hideInMenu: true,
           noMargin: true,
@@ -179,7 +179,7 @@ const TranactionRoute = {
         },
         // 单据-详情
         {
-          path: '/memberCenter/tranactionAbility/stockSellStorage/bills/detail',
+          path: '/memberCenter/commodityAbility/stockSellStorage/bills/detail',
           name: 'billsDetail',
           hideInMenu: true,
           noMargin: true,
@@ -187,7 +187,7 @@ const TranactionRoute = {
         },
         // 库存
         {
-          path: '/memberCenter/tranactionAbility/stockSellStorage/inventory',
+          path: '/memberCenter/commodityAbility/stockSellStorage/inventory',
           name: 'inventory',
           component: '@/pages/transaction/stockSellStorage/inventory/index',
         },

src/pages/handling/assign/processStock/index.tsx

@@ -25,8 +25,8 @@ import {
 import { getEnhanceProcessToBeAddDeliveryList, getEnhanceProcessToBeAddLogisticsList, getEnhanceProcessToBeConfirmReceiptList, getEnhanceProcessToBeDeliveryList, getEnhanceSupplierToBeAddStorageList, getEnhanceSupplierToBeReceiveList, postEnhanceProcessToBeAddDeliveryExam, postEnhanceSupplierToBeAddStorageExam } from '@/services/EnhanceV2Api';
 
 const formActions = createFormActions();
-const ADD_PROCESS_PATH = '/memberCenter/tranactionAbility/stockSellStorage/bills/add';
-const ADD_DELIVERY_PATH = '/memberCenter/tranactionAbility/stockSellStorage/bills/add';
+const ADD_PROCESS_PATH = '/memberCenter/commodityAbility/stockSellStorage/bills/add';
+const ADD_DELIVERY_PATH = '/memberCenter/commodityAbility/stockSellStorage/bills/add';
 const ADD_LOGISTICS_PATH = '/memberCenter/logisticsAbility/logisticsBillSubmit/waitSbumitLogisticsBill/add';
 const DETAIL_LOGISTICS_PATH = '/memberCenter/logisticsAbility/logisticsBillSubmit/logisticsBillQuery/preview'
 
@@ -146,7 +146,7 @@ const processStock: React.FC<{}> = () => {
         if(!text) {
           return null
         }
-        const url = '/memberCenter/tranactionAbility/stockSellStorage/bills/detail';
+        const url = '/memberCenter/commodityAbility/stockSellStorage/bills/detail';
         const type = [PENDING_ADD_PROCESS_PATH,ASSIGN_PENDING_RECEIVE].includes(pathname) ? 'storage' : 'delivery'
         const id = type === 'storage' ?  record.storageId : record.deliveryId;
         if(!id) {

src/pages/handling/assign/tobeAddStock/index.tsx

@@ -22,7 +22,7 @@ import AuthButton from '@/components/AuthButton';
 const formActions = createFormActions();
 const queryColumns = setColumnsByLinks({
   detail: '/memberCenter/handling/assign/pendingAddProcessing/detail',
-  storage: '/memberCenter/tranactionAbility/stockSellStorage/bills/detail',
+  storage: '/memberCenter/commodityAbility/stockSellStorage/bills/detail',
 })
 const ADD_PROCESS_PATH = "/memberCenter/tranactionAbility/stockSellStorage/bills/add"
 const AllQuery = () => {

src/pages/handling/assign/tobeReceive/index.tsx

@@ -22,7 +22,7 @@ import AuthButton from '@/components/AuthButton';
 const formActions = createFormActions();
 const queryColumns = setColumnsByLinks({
   detail: '/memberCenter/handling/assign/pendingAddProcessing/detail',
-  storage: '/memberCenter/tranactionAbility/stockSellStorage/bills/detail',
+  storage: '/memberCenter/commodityAbility/stockSellStorage/bills/detail',
 })
 const AllQuery = () => {
   const intl = useIntl();

src/pages/handling/confirm/pendingAddLogistics/index.tsx

@@ -22,7 +22,7 @@ const DETAIL_LOGISTICS_PATH = '/memberCenter/logisticsAbility/logisticsBillSubmi
 const formActions = createFormActions();
 const queryColumns = setColumnsByLinks({
   detail: "/memberCenter/handling/confirm/pendingAddLogistics/detail",
-  delivery: '/memberCenter/tranactionAbility/stockSellStorage/bills/detail'
+  delivery: '/memberCenter/commodityAbility/stockSellStorage/bills/detail'
 })
 
 const AllQuery = () => {

src/pages/handling/confirm/pendingDelivered/index.tsx

@@ -19,7 +19,7 @@ import AuthButton from '@/components/AuthButton';
 const formActions = createFormActions();
 const queryColumns = setColumnsByLinks({
   detail: "/memberCenter/handling/confirm/pendingDelivered/detail",
-  delivery: '/memberCenter/tranactionAbility/stockSellStorage/bills/detail'
+  delivery: '/memberCenter/commodityAbility/stockSellStorage/bills/detail'
 })
 const PENDING_DELIVERD_PATH = "/memberCenter/handling/confirm/pendingDelivered/detail";
 

src/pages/handling/confirm/pendingReceipt/index.tsx

@@ -20,7 +20,7 @@ import { AuthUrl } from '@/components/AuthButton/AuthUrl'
 const formActions = createFormActions();
 const queryColumns = setColumnsByLinks({
   detail: "/memberCenter/handling/confirm/pendingDelivered/detail",
-  delivery: '/memberCenter/tranactionAbility/stockSellStorage/bills/detail'
+  delivery: '/memberCenter/commodityAbility/stockSellStorage/bills/detail'
 })
 const PENDING_RECEIPT_PATH = "/memberCenter/handling/confirm/pendingReceipt/detail";
 

src/pages/handling/confirm/processingInvoiceTobeAdd/index.tsx

@@ -22,9 +22,9 @@ import AuthButton from '@/components/AuthButton';
 const formActions = createFormActions();
 const queryColumns = setColumnsByLinks({
   detail: "/memberCenter/handling/confirm/query/detail",
-  delivery: '/memberCenter/tranactionAbility/stockSellStorage/bills/detail'
+  delivery: '/memberCenter/commodityAbility/stockSellStorage/bills/detail'
 })
-const ADD_DELIVERY_PATH = '/memberCenter/tranactionAbility/stockSellStorage/bills/add';
+const ADD_DELIVERY_PATH = '/memberCenter/commodityAbility/stockSellStorage/bills/add';
 
 const AllQuery = () => {
   const intl = useIntl();

src/pages/priceManage/priceLibrary/index.tsx

 import React, { useEffect, useRef } from 'react';
-import { Button, Card, Input, message } from 'antd';
+import { Button, Card, Input, InputNumber, message } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import StandardTable from '@/components/StandardTable';
 import { ColumnType } from 'antd/lib/table/interface';
@@ -80,7 +80,7 @@ const PriceLibrary: React.FC<{}> = () => {
       key: 'marketPrice',
       render: (text, record) => {
         return (
-          <Input
+          <InputNumber
             prefix={intl.formatMessage({
               id: 'priceManage.priceStrategy.columns.currency',
             })}

src/pages/transaction/stockSellStorage/bills/index.tsx

@@ -311,7 +311,7 @@ const Bills: React.FC<{}> = () => {
           icon={<PlusOutlined />}
           onClick={() =>
             history.push(
-              '/memberCenter/tranactionAbility/stockSellStorage/bills/add?source=1',
+              '/memberCenter/commodityAbility/stockSellStorage/bills/add?source=1',
             )
           }
         >

src/pages/transaction/stockSellStorage/warehouse/index.tsx

@@ -156,7 +156,7 @@ const WareHouse: React.FC<{}> = () => {
   };
 
   const handleJumpAdd = () => {
-    history.push('/memberCenter/tranactionAbility/stockSellStorage/warehouse/add');
+    history.push('/memberCenter/commodityAbility/stockSellStorage/warehouse/add');
   };
 
   const Actions = (