Merge branch 'fix-material-links' into 'v2-220418'

src/pages/commodity/material/materialPendingAdd/add.tsx

@@ -80,6 +80,7 @@ const MaterialAdd = (props) => {
     if (!formatInitialValue) {
       return
     }
+    console.log(formatInitialValue?.interiorState, "formatInitialValue?.interiorState")
     if (formatInitialValue?.interiorState === HAS_CONFIRM) {
       formActions.setFieldState('changeCard', (state) => {
         FormPath.setIn(state, 'visible', true);
@@ -173,6 +174,7 @@ const MaterialAdd = (props) => {
       phone,
       userName,
       materialGroup,
+      type,
       ...rest 
     } = value;
     const formatGoodsPic = goodsPic?.map((_item) => _item.url);
@@ -250,12 +252,12 @@ const MaterialAdd = (props) => {
       costPrice: costPrice,
       remark: remark,
       unitId: unitId,
+      type: type,
       ...formatBrand,
       ...withId,
       ...withSourceList,
       ...withMaterialGroup,
       ...withChangeData,
-      ...rest,
     }
     console.log("postData", postData)
     setSubmitLoading(true);

src/pages/home/components/Centers/OrderCenter.tsx

@@ -8,8 +8,8 @@ import useGetAuth from '../../hooks/useGetAuth';
 interface Iprops { };
 
 const { StaticsDataList } = Layout
-const purchaseOrderUrl = '/memberCenter/tranactionAbility/purchaseOrder/orderList';
-const saleOrderUrl = '/memberCenter/tranactionAbility/saleOrder/orderList'
+const purchaseOrderUrl = '/memberCenter/order/purchaseOrder/orderList';
+const saleOrderUrl = '/memberCenter/order/saleOrder/orderList'
 
 const KEY_TITLE = {
   saleOrderList: getIntl().formatMessage({ id: 'home.orderCenter.saleOrderList' }),

src/pages/home/hooks/useGetAuth.tsx

@@ -46,10 +46,10 @@ const useGetAuth = () => {
   const abilityUrls = useMemo(() => {
     return {
       "orderAbility": [
-        "/memberCenter/tranactionAbility/saleOrder/",
-        "/memberCenter/tranactionAbility/supplierEvaluation/",
-        "/memberCenter/tranactionAbility/purchaseOrder/",
-        "/memberCenter/tranactionAbility/purchaserEvaluation/",
+        "/memberCenter/order/saleOrder",
+        "/memberCenter/order/supplierEvaluation/",
+        "/memberCenter/order/purchaseOrder/",
+        "/memberCenter/order/purchaserEvaluation/",
       ],
       "shopAbility": [
         '/memberCenter/commodityAbility/commodity/products',
@@ -136,7 +136,7 @@ const useGetAuth = () => {
    */
   const getLayoutCenters = useCallback(() => {
     const name2link = {
-      '/memberCenter/tranactionAbility': "订单中心",
+      '/memberCenter/order': "订单中心",
       '/memberCenter/shopAbility': "店铺中心",
       // '/memberCenter/tranactionAbility': "交易中心",
       '/memberCenter/tranactionAbility/productInquiry': '交易中心',