🦄 refactor(订单管理): 修改订单管理路由

config/routes/refactorRoutes/index.ts

@@ -17,12 +17,12 @@ const RefactorRoutes = [
   MemberManageRoutes,
   transactionManageRoutes,
   purchaseManageRoutes,
-  // orderManageRoutes,
+  orderManageRoutes,
   // afterServiceRoutes,
   // settlementManageRoutes,
   // logisticsRoutes,
   // productionNoticeRoutes,
-  // MarketingManageRoutes,
+  MarketingManageRoutes,
   // pageCustomized,
   // contentRoute,
   // systemManageRoute,

src/pages/comment/manage/index.less → src/pages/orderManage/comment/manage/index.less

-@import '../../../global/styles/utils.less';
-
-.productName {
-  .textOverflow();
-}
\ No newline at end of file
+@import '../../../../global/styles/utils.less';
+
+.productName {
+  .textOverflow();
+}

src/pages/comment/manage/schema/index.tsx → src/pages/orderManage/comment/manage/schema/index.tsx

-import { ISchema } from '@formily/antd';
-import { FORM_FILTER_PATH } from '@/formSchema/const';
-
-export const listSearchSchema: ISchema = {
-  type: 'object',
-  properties: {
-    megaLayout: {
-      type: 'object',
-      'x-component': 'mega-layout',
-      properties: {
-        TOPLAYOUT: {
-          type: 'object',
-          'x-component': 'Mega-Layout',
-          'x-component-props': {
-            grid: true,
-          },
-          properties: {
-            ctl: {
-              type: 'object',
-              'x-component': 'Children',
-              'x-component-props': {
-                children: '{{controllerBtns}}',
-              },
-            },
-            product: {
-              type: 'string',
-              'x-component': 'Search',
-              'x-component-props': {
-                placeholder: '搜索', 
-                tip: '输入 交易商品 进行搜索', 
-              },
-            },
-          },
-        },
-        [FORM_FILTER_PATH]: {
-          type: 'object',
-          'x-component': 'Flex-Layout',
-          'x-component-props': {
-            colStyle: {
-              marginLeft: 20,
-            },
-          },
-          properties: {
-            subMemberName: {
-              type: 'string',
-              default: undefined,
-              'x-component-props': {
-                placeholder: '被评价方',
-                allowClear: true, 
-                style: {
-                  width: 160, 
-                }, 
-              },
-            },
-            memberName: {
-              type: 'string',
-              default: undefined,
-              'x-component-props': {
-                placeholder: '评价方', 
-                allowClear: true, 
-                style: {
-                  width: 160, 
-                }, 
-              },
-            },
-            star: {
-              type: 'string',
-              default: undefined,
-              enum: [
-                {
-                  label: '一星', 
-                  value: 1, 
-                }, 
-                {
-                  label: '二星', 
-                  value: 2, 
-                }, 
-                {
-                  label: '三星', 
-                  value: 3, 
-                }, 
-                {
-                  label: '四星', 
-                  value: 4, 
-                }, 
-                {
-                  label: '五星', 
-                  value: 5, 
-                }, 
-              ], 
-              'x-component-props': {
-                placeholder: '评价星级(全部)',
-                allowClear: true, 
-                style: {
-                  width: 160, 
-                }, 
-              },
-            },
-            '[createTimeStart, createTimeEnd]': {
-              type: 'string',
-              default: '',
-              'x-component': 'dateSelect', 
-              'x-component-props': {
-                placeholder: '评价时间(全部)', 
-                allowClear: true, 
-                style: {
-                  width: 160, 
-                }, 
-              },
-            },
-            '[dealTimeStart, dealTimeEnd]': {
-              type: 'string',
-              default: '',
-              'x-component': 'dateSelect', 
-              'x-component-props': {
-                placeholder: '交易时间(全部)', 
-                allowClear: true, 
-                style: {
-                  width: 160, 
-                }, 
-              },
-            },
-            'comment': {
-              type: 'string',
-              default: '',
-              'x-component-props': {
-                placeholder: '评价内容', 
-                allowClear: true, 
-                style: {
-                  width: 160, 
-                }, 
-              },
-            },
-            submit: {
-              'x-component': 'Submit',
-              'x-mega-props': {
-                span: 1,
-              },
-              'x-component-props': {
-                children: '查询',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
+import { ISchema } from '@formily/antd';
+import { FORM_FILTER_PATH } from '@/formSchema/const';
+
+export const listSearchSchema: ISchema = {
+  type: 'object',
+  properties: {
+    megaLayout: {
+      type: 'object',
+      'x-component': 'mega-layout',
+      properties: {
+        TOPLAYOUT: {
+          type: 'object',
+          'x-component': 'Mega-Layout',
+          'x-component-props': {
+            grid: true,
+          },
+          properties: {
+            ctl: {
+              type: 'object',
+              'x-component': 'Children',
+              'x-component-props': {
+                children: '{{controllerBtns}}',
+              },
+            },
+            product: {
+              type: 'string',
+              'x-component': 'Search',
+              'x-component-props': {
+                placeholder: '搜索', 
+                tip: '输入 交易商品 进行搜索', 
+              },
+            },
+          },
+        },
+        [FORM_FILTER_PATH]: {
+          type: 'object',
+          'x-component': 'Flex-Layout',
+          'x-component-props': {
+            colStyle: {
+              marginLeft: 20,
+            },
+          },
+          properties: {
+            subMemberName: {
+              type: 'string',
+              default: undefined,
+              'x-component-props': {
+                placeholder: '被评价方',
+                allowClear: true, 
+                style: {
+                  width: 160, 
+                }, 
+              },
+            },
+            memberName: {
+              type: 'string',
+              default: undefined,
+              'x-component-props': {
+                placeholder: '评价方', 
+                allowClear: true, 
+                style: {
+                  width: 160, 
+                }, 
+              },
+            },
+            star: {
+              type: 'string',
+              default: undefined,
+              enum: [
+                {
+                  label: '一星', 
+                  value: 1, 
+                }, 
+                {
+                  label: '二星', 
+                  value: 2, 
+                }, 
+                {
+                  label: '三星', 
+                  value: 3, 
+                }, 
+                {
+                  label: '四星', 
+                  value: 4, 
+                }, 
+                {
+                  label: '五星', 
+                  value: 5, 
+                }, 
+              ], 
+              'x-component-props': {
+                placeholder: '评价星级(全部)',
+                allowClear: true, 
+                style: {
+                  width: 160, 
+                }, 
+              },
+            },
+            '[createTimeStart, createTimeEnd]': {
+              type: 'string',
+              default: '',
+              'x-component': 'dateSelect', 
+              'x-component-props': {
+                placeholder: '评价时间(全部)', 
+                allowClear: true, 
+                style: {
+                  width: 160, 
+                }, 
+              },
+            },
+            '[dealTimeStart, dealTimeEnd]': {
+              type: 'string',
+              default: '',
+              'x-component': 'dateSelect', 
+              'x-component-props': {
+                placeholder: '交易时间(全部)', 
+                allowClear: true, 
+                style: {
+                  width: 160, 
+                }, 
+              },
+            },
+            'comment': {
+              type: 'string',
+              default: '',
+              'x-component-props': {
+                placeholder: '评价内容', 
+                allowClear: true, 
+                style: {
+                  width: 160, 
+                }, 
+              },
+            },
+            submit: {
+              'x-component': 'Submit',
+              'x-mega-props': {
+                span: 1,
+              },
+              'x-component-props': {
+                children: '查询',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
 };
\ No newline at end of file

src/pages/comment/query/detailed/components/RecordList/index.less → src/pages/orderManage/comment/query/detailed/components/RecordList/index.less

-@import '../../../../../../global/styles/utils.less';
+@import '../../../../../../../global/styles/utils.less';
 
 .record {
   padding: 0;
   margin: 0;
-  
+
   &-item {
     padding: 14px 16px;
     line-height: 14px;
@@ -80,4 +80,4 @@
       margin-bottom: 16px;
     }
   }
-}
\ No newline at end of file
+}

src/pages/comment/query/detailed/components/Shelves/index.less → src/pages/orderManage/comment/query/detailed/components/Shelves/index.less

-@import '../../../../../../global/styles/index.less';
+@import '../../../../../../../global/styles/index.less';
 
 .shelves {
   &-title {
@@ -25,4 +25,4 @@
   &-content {
     padding: 30px 0;
   }
-}
\ No newline at end of file
+}

src/pages/comment/query/schema/index.tsx → src/pages/orderManage/comment/query/schema/index.tsx

-import { ISchema } from '@formily/antd';
-import { FORM_FILTER_PATH } from '@/formSchema/const';
-
-export const listSearchSchema: ISchema = {
-  type: 'object',
-  properties: {
-    megaLayout: {
-      type: 'object',
-      'x-component': 'mega-layout',
-      properties: {
-        memberName: {
-          type: 'string',
-          'x-component': 'Search',
-          'x-component-props': {
-            placeholder: '搜索',
-            align: 'flex-left',
-            tip: '输入 会员名称 进行搜索', 
-          },
-        },
-        [FORM_FILTER_PATH]: {
-          type: 'object',
-          'x-component': 'mega-layout',
-          'x-component-props': {
-            grid: true,
-            full: true,
-            autoRow: true,
-            columns: 6,
-          },
-          properties: {
-            memberTypeId: {
-              type: 'string',
-              default: undefined,
-              enum: [],
-              'x-component-props': {
-                placeholder: '会员类型(全部)',
-                allowClear: true, 
-              },
-            },
-            roleId: {
-              type: 'string',
-              default: undefined,
-              enum: [],
-              'x-component-props': {
-                placeholder: '会员角色(全部)', 
-                allowClear: true, 
-              },
-            },
-            level: {
-              type: 'string',
-              default: undefined,
-              enum: [],
-              'x-component-props': {
-                placeholder: '会员等级(全部)',
-                allowClear: true, 
-              },
-            },
-            avgStar: {
-              type: 'string',
-              default: undefined,
-              enum: [
-                {
-                  label: '一星', 
-                  value: 1, 
-                }, 
-                {
-                  label: '二星', 
-                  value: 2, 
-                }, 
-                {
-                  label: '三星', 
-                  value: 3, 
-                }, 
-                {
-                  label: '四星', 
-                  value: 4, 
-                }, 
-                {
-                  label: '五星', 
-                  value: 5, 
-                }, 
-              ], 
-              'x-component-props': {
-                placeholder: '交易满意度(全部)',
-                allowClear: true, 
-              },
-            },
-            submit: {
-              'x-component': 'Submit',
-              'x-mega-props': {
-                span: 1,
-              },
-              'x-component-props': {
-                children: '查询',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
+import { ISchema } from '@formily/antd';
+import { FORM_FILTER_PATH } from '@/formSchema/const';
+
+export const listSearchSchema: ISchema = {
+  type: 'object',
+  properties: {
+    megaLayout: {
+      type: 'object',
+      'x-component': 'mega-layout',
+      properties: {
+        memberName: {
+          type: 'string',
+          'x-component': 'Search',
+          'x-component-props': {
+            placeholder: '搜索',
+            align: 'flex-left',
+            tip: '输入 会员名称 进行搜索', 
+          },
+        },
+        [FORM_FILTER_PATH]: {
+          type: 'object',
+          'x-component': 'mega-layout',
+          'x-component-props': {
+            grid: true,
+            full: true,
+            autoRow: true,
+            columns: 6,
+          },
+          properties: {
+            memberTypeId: {
+              type: 'string',
+              default: undefined,
+              enum: [],
+              'x-component-props': {
+                placeholder: '会员类型(全部)',
+                allowClear: true, 
+              },
+            },
+            roleId: {
+              type: 'string',
+              default: undefined,
+              enum: [],
+              'x-component-props': {
+                placeholder: '会员角色(全部)', 
+                allowClear: true, 
+              },
+            },
+            level: {
+              type: 'string',
+              default: undefined,
+              enum: [],
+              'x-component-props': {
+                placeholder: '会员等级(全部)',
+                allowClear: true, 
+              },
+            },
+            avgStar: {
+              type: 'string',
+              default: undefined,
+              enum: [
+                {
+                  label: '一星', 
+                  value: 1, 
+                }, 
+                {
+                  label: '二星', 
+                  value: 2, 
+                }, 
+                {
+                  label: '三星', 
+                  value: 3, 
+                }, 
+                {
+                  label: '四星', 
+                  value: 4, 
+                }, 
+                {
+                  label: '五星', 
+                  value: 5, 
+                }, 
+              ], 
+              'x-component-props': {
+                placeholder: '交易满意度(全部)',
+                allowClear: true, 
+              },
+            },
+            submit: {
+              'x-component': 'Submit',
+              'x-mega-props': {
+                span: 1,
+              },
+              'x-component-props': {
+                children: '查询',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
 };
\ No newline at end of file

src/pages/orderSystem/orderDetail/components/ContractList/index.less → src/pages/orderManage/orderSystem/orderDetail/components/ContractList/index.less

-@import '../../../../../global/styles/utils.less';
+@import '../../../../../../global/styles/utils.less';
 
 .contractList {
   padding: 0;
@@ -34,4 +34,4 @@
 
 .noData {
   color: #909399;
-}
\ No newline at end of file
+}

src/pages/purchaseManage/procurement/callForBidsSearch/detail/index.tsx

@@ -4,8 +4,8 @@ import { BidDetailContext } from '@/pages/purchaseManage/procurement/_public/bid
 import { useBidDetail } from '@/pages/purchaseManage/procurement/_public/bid/effects/useBidDetail';
 import BidDetailHeader from '@/pages/purchaseManage/procurement/components/bidDetailHeader';
 import BidDetailSection from '@/pages/purchaseManage/procurement/components/bidDetailSection';
-import OrderDetailWrapper from '@/pages/orderSystem/components/OrderDetailWrapper';
 import { BidOuterWorkState } from '@/constants';
+import OrderDetailWrapper from '@/pages/orderManage/orderSystem/components/OrderDetailWrapper';
 
 const CallForBidsSearchDetail: React.FC = () => {
   const { formContext, id } = useBidDetail({ type: 'callForBid' })

src/pages/purchaseManage/procurement/readyCheckBid/detail/index.tsx

@@ -9,7 +9,7 @@ import BidDetailHeader from '@/pages/purchaseManage/procurement/components/bidDe
 import BidDetailSection from '@/pages/purchaseManage/procurement/components/bidDetailSection';
 import ApprovedModal from '@/pages/purchaseManage/procurement/components/approvedModal';
 import { PublicApi } from '@/services/api';
-import OrderDetailWrapper from '@/pages/orderSystem/components/OrderDetailWrapper';
+import OrderDetailWrapper from '@/pages/orderManage/orderSystem/components/OrderDetailWrapper';
 
 const FirstCheckedBidDetail: React.FC = () => {
   const { formContext, id } = useBidDetail({type: 'callForBid'})

src/pages/purchaseManage/procurement/tenderSearch/detail/index.tsx

@@ -5,7 +5,7 @@ import { BidDetailContext } from '@/pages/purchaseManage/procurement/_public/bid
 import { useBidDetail } from '@/pages/purchaseManage/procurement/_public/bid/effects/useBidDetail';
 import BidDetailHeader from '@/pages/purchaseManage/procurement/components/bidDetailHeader';
 import BidDetailSection from '@/pages/purchaseManage/procurement/components/bidDetailSection';
-import OrderDetailWrapper from '@/pages/orderSystem/components/OrderDetailWrapper';
+import OrderDetailWrapper from '@/pages/orderManage/orderSystem/components/OrderDetailWrapper';
 
 const TenderSearchDetail: React.FC = () => {
   const { formContext, id } = useBidDetail({type: 'tender'})