Merge branch 'master' of http://39.108.227.113:8001/zhusen/canrd-erp-front

PurelzMgnead
2 parents e6d31eb8 41afef47
Showing 4 changed files with 38 additions and 6 deletions
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/index.tsx
src/pages/Prepaid/constant.tsx
src/pages/ResearchGroup/components/ImportModal.tsx
@@ -741,9 +741,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   }
  
   const validateContactNumber = (_: any, value: any) => {
-    console.log(value);
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    const phoneRegex = /^\d{1,11}$/;
+    const phoneRegex = /^\d{1,11}(-\d{1,11})?$/;
  
     if (emailRegex.test(value) || phoneRegex.test(value)) {
       return Promise.resolve();
@@ -3904,7 +3904,13 @@ const OrderPage = () =&gt; {
         onClick: async () => {
           let body = { flag: 50, ...searchParams };
           exportLoading();
-          orderExport('/api/service/order/export', body, exportLoadingDestory);
+          orderExport(
+            '/api/service/order/export',
+            '订单导出结果.xls',
+            'POST',
+            body,
+            exportLoadingDestory,
+          );
         },
       },
       {
@@ -3917,7 +3923,13 @@ const OrderPage = () =&gt; {
           }
           let body = { flag: 30, id: Array.from(mainOrderSelectedMap.keys()) };
           exportLoading();
-          orderExport('/api/service/order/export', body, exportLoadingDestory);
+          orderExport(
+            '/api/service/order/export',
+            '订单导出结果.xls',
+            'POST',
+            body,
+            exportLoadingDestory,
+          );
         },
       },
       {
@@ -3926,7 +3938,13 @@ const OrderPage = () =&gt; {
         onClick: async () => {
           let body = { flag: 40, ids: [] };
           exportLoading();
-          orderExport('/api/service/order/export', body, exportLoadingDestory);
+          orderExport(
+            '/api/service/order/export',
+            '订单导出结果.xls',
+            'POST',
+            body,
+            exportLoadingDestory,
+          );
         },
       },
       {
@@ -3935,7 +3953,13 @@ const OrderPage = () =&gt; {
         onClick: async () => {
           let body = { flag: 10, ids: [] };
           exportLoading();
-          orderExport('/api/service/order/export', body, exportLoadingDestory);
+          orderExport(
+            '/api/service/order/export',
+            '订单导出结果.xls',
+            'POST',
+            body,
+            exportLoadingDestory,
+          );
         },
       },
     ];
@@ -226,6 +226,13 @@ export const BALANCE_CHANGE_COLUMNS = [
     width: 140,
   },
   {
+    title: '变动人',
+    dataIndex: 'updateBy',
+    key: 'updateBy',
+    dataType: 'text',
+    width: 200,
+  },
+  {
     title: '类型',
     dataIndex: 'title',
     key: 'title',
@@ -28,6 +28,8 @@ export default ({ onClose }) =&gt; {
     exportLoading('正在下载模板...');
     orderExport(
       '/api/research/groups/download/importTemplate',
+      '导入模板.xls',
+      'POST',
       {},
       exportLoadingDestory,
     );