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

config/routes/index.ts

@@ -118,8 +118,8 @@ const router = [
       // platformCouponManageRoute,
       // afterServiceRoutes,
       // marketingManageRoutes,
-      ...asyncRoutes,
-      // ...refactorRoutes,
+      // ...asyncRoutes,
+      ...refactorRoutes,
       // purchaseBidRoute,
       {
         path: '/noAuth',

config/routes/refactorRoutes/afterServiceRoutes/returnManageRoute.ts

@@ -23,7 +23,6 @@ const returnManageRoute = {
       component: '@/pages/afterService/returnManage/query/detail',
       hideInMenu: true,
       hidePageHeader: true,
-      noMargin: true,
     },
     // 退货申请单详情-订单详情
     {

config/routes/refactorRoutes/index.ts

@@ -18,8 +18,8 @@ const RefactorRoutes = [
   transactionManageRoutes,
   purchaseManageRoutes,
   orderManageRoutes,
-  // afterServiceRoutes,
-  // settlementManageRoutes,
+  afterServiceRoutes,
+  settlementManageRoutes,
   // logisticsRoutes,
   // productionNoticeRoutes,
   MarketingManageRoutes,

src/pages/capitalAccount/accountLists/index.tsx → src/pages/settlementManage/capitalAccount/accountLists/index.tsx

@@ -35,7 +35,7 @@ const AccountLists: React.FC<{}> = () => {
       className: 'commonPickColor',
       render: (text, record) => <>
         <EyePreview
-          url={`/capitalAccount/accountLists/detail?id=${record.id}`}
+          url={`/settlementManage/capitalAccount/accountLists/detail?id=${record.id}`}
         >
           {text}
         </EyePreview>

src/pages/capitalAccount/checkWithdraw/index.tsx → src/pages/settlementManage/capitalAccount/checkWithdraw/index.tsx

@@ -94,7 +94,7 @@ const CheckWithdraw: React.FC<{}> = () => {
       preview: r.preview,
       status: r.status,
     }
-    history.push(`/capitalAccount/checkWithdraw/detail?detailinfo=${btoa(JSON.stringify(params))}`)
+    history.push(`/settlementManage/capitalAccount/checkWithdraw/detail?detailinfo=${btoa(JSON.stringify(params))}`)
   }
 
   const handleBatchCheck = () => {

src/pages/capitalAccount/paymentWithdraw/index.tsx → src/pages/settlementManage/capitalAccount/paymentWithdraw/index.tsx

@@ -88,7 +88,7 @@ const PaymentWithdraw: React.FC<{}> = () => {
       preview: r.preview,
       status: r.status,
     }
-    history.push(`/capitalAccount/paymentWithdraw/detail?detailinfo=${btoa(JSON.stringify(params))}`)
+    history.push(`/settlementManage/capitalAccount/paymentWithdraw/detail?detailinfo=${btoa(JSON.stringify(params))}`)
   }
 
   return (

src/pages/platformSettlement/accountPayable/index.tsx → src/pages/settlementManage/platformSettlement/accountPayable/index.tsx

@@ -70,7 +70,7 @@ const SettlementList = () => {
       title: '结算单号',
       dataIndex: 'settlementNo',
       render: (text, record) => {
-        const url = `/balanced/accountPayable/detail?id=${record.id}`;
+        const url = `/settlementManage/platformSettlement/balanced/accountPayable/detail?id=${record.id}`;
         return (
           <EyePreview url={url}>
             {text}

src/pages/platformSettlement/receipt/index.tsx → src/pages/settlementManage/platformSettlement/receipt/index.tsx

@@ -36,7 +36,7 @@ interface ItemIprops extends ReceiptProps {
 const ReceiptItem: React.FC<ItemIprops> = (props: ItemIprops) => {
   const { id, kindName, typeName, invoiceTitle, taxNo, bankOfDeposit, account, address, tel, defaultName } = props;
   const handleRouterPush = () => {
-    history.push(`/balanced/receipt/detail?id=${id}`);
+    history.push(`/settlementManage/platformSettlement/balanced/receipt/detail?id=${id}`);
   }
   const handleDelete = (id: number | string) => {
     props.onRemove(id);
@@ -113,7 +113,7 @@ const Receipt: React.FC<{}> = () => {
   }, [])
 
   const handleRouterAdd = () => {
-    history.push('/balanced/receipt/add')
+    history.push('/settlementManage/platformSettlement/balanced/receipt/add')
   }
 
   // 删除发票

src/pages/platformSettlement/receipt/info.tsx → src/pages/settlementManage/platformSettlement/receipt/info.tsx

@@ -55,7 +55,7 @@ const schema = {
               {label: '增值税专用发票', value: 2}
             ],
           },
-          
+
           'x-rules': [
             {required: true, message: '请选择发票种类'}
           ]
@@ -67,7 +67,7 @@ const schema = {
             {required: true, message: '请填写发票抬头'},
             {limitByte: true, maxByte: 40 }
           ],
-        
+
         },
         taxNo: {
           type: 'string',
@@ -112,7 +112,7 @@ const schema = {
           title: '是否默认',
           'x-component': 'SchemaSwitch'
         },
-        
+
       }
     }
   }
@@ -129,11 +129,11 @@ const Info: React.FC = () => {
 
   const handleSubmit = (value) => {
     console.log(value);
-  
+
     const serviceActions = isAdd
       ? PublicApi.postSettleAccountsPlatformConfigAddPlatformInvoice
       : PublicApi.postSettleAccountsPlatformConfigUpdatePlatformInvoice
-    
+
     let tempData = {...value, isDefault: value.isDefault ? 1 : 0};
     const postData = isAdd ?  tempData : {...tempData, id};
     setSubmitLoading(true);
@@ -141,7 +141,7 @@ const Info: React.FC = () => {
     serviceActions(postData).then((data) => {
       setSubmitLoading(false);
       if(data.code === 1000) {
-        history.push('/balanced/receipt')
+        history.push('/settlementManage/platformSettlement/balanced/receipt')
       }
     })
   }
@@ -158,7 +158,7 @@ const Info: React.FC = () => {
   }, [id])
 
   const handleCancel = () => {
-    history.push('/balanced/receipt')
+    history.push('/settlementManage/platformSettlement/balanced/receipt')
   }
 
   return (
@@ -175,12 +175,12 @@ const Info: React.FC = () => {
           <FormButtonGroup offset={4}>
             <Submit loading={submitLoading}>提交</Submit>
             <Button onClick={handleCancel}>取消</Button>
-          </FormButtonGroup>  
+          </FormButtonGroup>
         </NiceForm>
       </Card>
       <Prompt when={unsaved} message={"内容未保存，确定要离开？"} />
     </PageHeaderWrapper>
-    
+
   )
 }
 

src/pages/platformSettlement/score/list/index.tsx → src/pages/settlementManage/platformSettlement/score/list/index.tsx

@@ -69,7 +69,7 @@ const SettlementList = () => {
       title: '结算单号',
       dataIndex: 'settlementNo',
       render: (text, record) => {
-        const url = `/balanced/scorePayable/detail?id=${record.id}`;
+        const url = `/settlementManage/platformSettlement/balanced/scorePayable/detail?id=${record.id}`;
         return (
           <EyePreview url={url}>
             {text}