Merge remote-tracking branch 'origin/master'

曾国涛
2 parents 0e55a8c7 903e51ef
Showing 7 changed files with 46 additions and 7 deletions
.umirc.ts
src/pages/Instalment/components/upload/uploadApp.tsx
src/pages/Instalment/components/upload/uploadModel.tsx
src/pages/Order/Order/components/OrderDrawer.tsx
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/OrderReport/components/OrderDualAxes.tsx
src/pages/OrderReport/index.tsx
@@ -15,6 +15,7 @@ export default defineConfig({
   proxy: {
     '/api/': {
       target: 'http://localhost:8085/',
+      // target: 'http://192.168.31.242:8085/',
       // target: 'http://192.168.1.6:8085/',
       // target: 'http://39.108.227.113:8085/',
       changeOrigin: true,
@@ -56,7 +57,6 @@ export default defineConfig({
         {
           name: '预警白名单',
           path: 'WarningWhitelist',
-          access: 'canReadAdminAndSalesManager',
           component: './Order/WarningWhitelist',
         },
         {
@@ -24,7 +24,7 @@ const App: React.FC = ({ uploadFile }) =&gt; {
         <p className="ant-upload-text">点击或者拖动文件到此处</p>
       </Dragger>
       <a
-        href="https://order-erp.oss-cn-qingdao.aliyuncs.com/%E5%88%86%E6%9C%9F%E4%BB%98%E6%AC%BE-%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx?Expires=2036232762&OSSAccessKeyId=LTAIZCPI7OaWud0m&Signature=rtc7LNVK9g3flXQeHdeGOXFOocY%3D"
+        href="https://order-erp.oss-cn-qingdao.aliyuncs.com/%E5%88%86%E6%9C%9F%E4%BB%98%E6%AC%BE-%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx?Expires=2052956820&OSSAccessKeyId=LTAI5t8KJVEXp3k5CT8pt9wG&Signature=Y3uJ4sOXBf8I6sxURlRhs%2BjRCrI%3D"
         className="modul-a"
       >
         下载模板
@@ -25,7 +25,7 @@ export default ({ toReload }) =&gt; {
       name: string;
       company: string;
     }>
-      title="新建表单"
+      title="导入数据表单"
       trigger={
         <Button
           type="primary"
@@ -36,6 +36,7 @@ import {
   ProFormDateTimePicker,
   ProFormDigit,
   ProFormList,
+  ProFormRadio,
   ProFormSelect,
   ProFormText,
   ProFormTextArea,
@@ -106,6 +107,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     filePaths: [];
     notes: '';
     invoiceFirst: boolean;
+    proxy: '';
     list: [
       {
         productCode: '';
@@ -842,6 +844,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 disabled={optType('after-sales-check')}
                 onClick={() => {
                   setSubmitBtnLoading(true);
+                  console.log(props);
                   props.submit();
                 }}
               >
@@ -1983,6 +1986,22 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     rules={[{ required: true, message: '所属事业部必填' }]}
                     disabled={optType('after-sales-check')}
                   />,
+                  <ProFormRadio.Group
+                    key="proxy"
+                    name="proxy"
+                    label="是否代买代购"
+                    initialValue={false}
+                    options={[
+                      {
+                        label: '是',
+                        value: true,
+                      },
+                      {
+                        label: '否',
+                        value: false,
+                      },
+                    ]}
+                  />,
                   <ProFormSelect
                     key={'shippingWarehouse' + listMeta.index}
                     placeholder="请选择发货仓库"
@@ -44,7 +44,7 @@ import {
   ProFormTextArea,
   ProFormUploadDragger,
 } from '@ant-design/pro-components';
-import { Group } from '@ant-design/pro-form';
+import { Group, ProFormRadio } from '@ant-design/pro-form';
 import { Button, Form, message, Modal } from 'antd';
 import { cloneDeep } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
@@ -2114,6 +2114,22 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     rules={[{ required: true, message: '所属事业部必填' }]}
                     disabled={optType('after-sales-check')}
                   />,
+                  <ProFormRadio.Group
+                    key="proxy"
+                    name="proxy"
+                    label="是否代买代购"
+                    initialValue={false}
+                    options={[
+                      {
+                        label: '是',
+                        value: true,
+                      },
+                      {
+                        label: '否',
+                        value: false,
+                      },
+                    ]}
+                  />,
                   <ProFormSelect
                     key={'shippingWarehouse' + listMeta.index}
                     placeholder="请选择发货仓库"
@@ -52,7 +52,6 @@ const OrderDualAxes = ({ data, statisticMethod, onXValueClick }) =&gt; {
           if (!yearFromXValue) {
             return;
           }
-          console.log(pointData, '5656pointData');
           // // 减 1 获得目标年份
           // const targetYear = String(Number(yearFromXValue) - 1); // "2024"
@@ -21,8 +21,13 @@ import OrderStatisticCard from &#39;./components/OrderStatisticCard&#39;;
 import './index.less';
 const OrderReportPage = () => {
   const [salesCodeOptions, setSalesCodeOptions] = useState([]);
+  const getCurrentMonth = () => {
+    const month = new Date().getMonth(); // Returns a 0-based month (0-11)
+    return month + 1; // To make it 1-based (1-12)
+  };
+  const month = getCurrentMonth();
   const [selectedYear, setSelectedYear] = useState('2025');
-  const [selectedMonth, setSelectedMonth] = useState('0');
+  const [selectedMonth, setSelectedMonth] = useState(month);
   /**
    * 获取销售代码枚举，在复制和编辑的时候判断是否为旧的代码
    */
@@ -45,7 +50,7 @@ const OrderReportPage = () =&gt; {
   }>();
   const [statisticData, setStatisticData] = useState([]);
   const [loading, setLoading] = useState(false);
-  const [statisticsMethod, setStatisticsMethod] = useState('YEAR_STATISTICS');
+  const [statisticsMethod, setStatisticsMethod] = useState('MONTH_STATISTICS');
   // const onChange = (key: string) => {
   //   if (key === '本月') {
   //     setStatisticsMethod('MONTH_STATISTICS');