fix: 修改预警salescode

boyang
1 parent 1cd15d85
Showing 2 changed files with 16 additions and 15 deletions
.umirc.ts
src/pages/Order/OrderWarning/index.tsx
@@ -14,9 +14,9 @@ export default defineConfig({
   },
   proxy: {
     '/api/': {
-      target: 'http://localhost:8085/',
+      // target: 'http://localhost:8085/',
       // target: 'http://192.168.1.6:8085/',
-      //target: 'http://39.108.227.113:8085/',
+      target: 'http://39.108.227.113:8085/',
       changeOrigin: true,
       pathRewrite: { '^/api': '' },
     },
@@ -4181,12 +4181,12 @@ const OrderPage = () =&gt; {
   const [invoiceRefundWarningNum, setInvoiceRefundWarningNum] = useState(0);
   const [waitConfirmPayment, setWaitConfirmPayment] = useState(0);
   const [waitFeedback, setWaitFeedback] = useState(0);
-  const [staticSalesCode, setStaticSalesCode] = useState(userInfo.userName);
+  const [staticSalesCode, setStaticSalesCode] = useState(userInfo.username);
   const [salesCodePermission, setSalesCodePermission] = useState(false);
   //修改预警数请求salesCode
   const changeSalesCode = () => {
     if (salesCodeSelect === undefined) {
-      setStaticSalesCode(userInfo.userName);
+      setStaticSalesCode(userInfo.username);
     } else {
       setStaticSalesCode(salesCodeSelect);
     }
@@ -4350,14 +4350,14 @@ const OrderPage = () =&gt; {
               width="200px"
               actionRef={mainTableRef}
               formRef={mainTableFormRef}
-              initialValue={userInfo.userName}
+              initialValue={userInfo.username}
               showSearch
               label="销售代表"
               placeholder="请输入销售代表"
               options={salesCodeOptions}
               onChange={(_, option) => {
                 if (option === undefined) {
-                  selectSalesCode(userInfo.userName);
+                  selectSalesCode(userInfo.username);
                 }
                 // if (option.value !== undefined) {
                 //   selectSalesCode(option.value);
@@ -4448,7 +4448,7 @@ const OrderPage = () =&gt; {
               });
             }
           }
-          params.salesCode = userInfo.userName;
+          params.salesCode = userInfo.username;
           params.condition = filterCondifion;
           //排序
           params.sorted = sorted;
@@ -4473,8 +4473,9 @@ const OrderPage = () =&gt; {
             // params.applyTimeIsNotNull = true; // 要求申请时间非空
             params.orderStatus = 'SHIPPED'; // 发票确认预警
             params.isDeleteQueryOrder = false; // 强制查询非作废订单
-            params.salesCode = userInfo.userName;
-            if (salesCodeSelect !== undefined) {
+            console.log(userInfo, '5656userInfo');
+            params.salesCode = userInfo.username;
+            if (salesCodeSelect !== undefined && salesCodeSelect !== null) {
               params.salesCode = salesCodeSelect;
             }
             // params.paymentMethod = 'UNPAID';
@@ -4490,8 +4491,8 @@ const OrderPage = () =&gt; {
             //   params.applyTimeLe = calDate;
             // }
             // params.applyTimeIsNotNull = true; // 要求申请时间非空
-            params.salesCode = userInfo.userName;
-            if (salesCodeSelect !== undefined) {
+            params.salesCode = userInfo.username;
+            if (salesCodeSelect !== undefined && salesCodeSelect !== null) {
               params.salesCode = salesCodeSelect;
             }
             params.warningStatus = 'waitFeedbackWarning'; // 发票确认预警
@@ -4509,8 +4510,8 @@ const OrderPage = () =&gt; {
             //   params.applyTimeLe = calDate;
             // }
             // params.applyTimeIsNotNull = true; // 要求申请时间非空
-            params.salesCode = userInfo.userName;
-            if (salesCodeSelect !== undefined) {
+            params.salesCode = userInfo.username;
+            if (salesCodeSelect !== undefined && salesCodeSelect !== null) {
               params.salesCode = salesCodeSelect;
             }
             params.warningStatus = 'invoiceConfirmWarning'; // 发票确认预警
@@ -4527,8 +4528,8 @@ const OrderPage = () =&gt; {
             } else {
               params.applyTimeLe = calDate;
             }
-            params.salesCode = userInfo.userName;
-            if (salesCodeSelect !== undefined) {
+            params.salesCode = userInfo.username;
+            if (salesCodeSelect !== undefined && salesCodeSelect !== null) {
               params.salesCode = salesCodeSelect;
             }
             params.isDeleteQueryOrder = false; // 强制查询非作废订单