Merge remote-tracking branch 'origin/warning' into warning

曾国涛
2 parents 84323eed 753589e0
Showing 2 changed files with 2 additions and 10 deletions
src/pages/Order/Order/index.tsx
src/pages/Order/OrderWarning/index.tsx
@@ -695,8 +695,6 @@ const OrderPage = () =&gt; {
      * @param optRecord
      */
     function getOrderStatusTag(optRecord: any): import('react').ReactNode {
-      console.log(optRecord, '5656optRecord');
-
       const orderStatus = optRecord.orderStatus;
       const paymentMethod = optRecord.paymentMethod;
       let orderStatusTagText = enumValueToLabel(
@@ -4606,7 +4604,6 @@ const OrderPage = () =&gt; {
     ) {
       setOpenCount(true);
       setOpen(true);
-      console.log(openCount, '5656openindex');
     }
     setInvoiceWarningNum(res.data.waitConfirmInvoice);
     setInvoiceRefundWarningNum(res.data.waitConfirmReceipt);
@@ -4171,7 +4171,6 @@ const OrderPage = () =&gt; {
     const formattedDate = format(newDate, 'yyyy-MM-dd HH:mm:ss');
     setCalDate(formattedDate);
     setValue1(value);
-    console.log(formattedDate, '5656formattedDate/value', value);
   };
   const [invoiceWarningNum, setInvoiceWarningNum] = useState(0);
   const [invoiceRefundWarningNum, setInvoiceRefundWarningNum] = useState(0);
@@ -4384,7 +4383,6 @@ const OrderPage = () =&gt; {
           let finalParams = {
             ...params,
           };
-          console.log(5656);
           if (value1 === 0) {
             // const currentDate = new Date();
             // const newDate = new Date(currentDate);
@@ -4430,17 +4428,16 @@ const OrderPage = () =&gt; {
             // } else {
             //   params.applyTimeLe = calDate;
             // }
-            params.applyTimeIsNotNull = true; // 要求申请时间非空
+            // params.applyTimeIsNotNull = true; // 要求申请时间非空
             params.salesCode = userInfo.username;
             params.warningStatus = 'invoiceConfirmWarning'; // 发票确认预警
             params.isDeleteQueryOrder = false; // 强制查询非作废订单
-            params.paymentMethod = 'UNPAID';
+            // params.paymentMethod = 'UNPAID';
             finalParams = {
               ...params,
               invoicingEndTime: calDate,
             };
           } else if (activeTabKey === 4) {
-            console.log(value1, 56564);
             params.warningStatus = 'paymentReceiptStatusWarning'; // 用于回款预警
             if (calDate === 'null') {
               params.applyTimeLe = null;
@@ -4455,8 +4452,6 @@ const OrderPage = () =&gt; {
             };
           }
-          console.log(params, '5656params');
-
           //保存这个搜索条件
           setSearchParam(params);
           const { data } = await postServiceOrderQueryServiceOrder({