canrd-main / canrd-erp-front · Commits

Commit 9e4ff9d0802f7073e3d6297892e45d98f918a0a0

Authored by boyang
1 parent 1cd15d85

fix: 修改预警salescode

Inline Side-by-side
Showing 2 changed files with 16 additions and 15 deletions
.umirc.ts
  View file @9e4ff9d
... ... @@ -14,9 +14,9 @@ export default defineConfig({
14 14 },
15 15 proxy: {
16 16 '/api/': {
17   - target: 'http://localhost:8085/',
  17 + // target: 'http://localhost:8085/',
18 18 // target: 'http://192.168.1.6:8085/',
19   - //target: 'http://39.108.227.113:8085/',
  19 + target: 'http://39.108.227.113:8085/',
20 20 changeOrigin: true,
21 21 pathRewrite: { '^/api': '' },
22 22 },
... ...
src/pages/Order/OrderWarning/index.tsx
  View file @9e4ff9d
... ... @@ -4181,12 +4181,12 @@ const OrderPage = () => {
4181 4181 const [invoiceRefundWarningNum, setInvoiceRefundWarningNum] = useState(0);
4182 4182 const [waitConfirmPayment, setWaitConfirmPayment] = useState(0);
4183 4183 const [waitFeedback, setWaitFeedback] = useState(0);
4184   - const [staticSalesCode, setStaticSalesCode] = useState(userInfo.userName);
  4184 + const [staticSalesCode, setStaticSalesCode] = useState(userInfo.username);
4185 4185 const [salesCodePermission, setSalesCodePermission] = useState(false);
4186 4186 //修改预警数请求salesCode
4187 4187 const changeSalesCode = () => {
4188 4188 if (salesCodeSelect === undefined) {
4189   - setStaticSalesCode(userInfo.userName);
  4189 + setStaticSalesCode(userInfo.username);
4190 4190 } else {
4191 4191 setStaticSalesCode(salesCodeSelect);
4192 4192 }
... ... @@ -4350,14 +4350,14 @@ const OrderPage = () => {
4350 4350 width="200px"
4351 4351 actionRef={mainTableRef}
4352 4352 formRef={mainTableFormRef}
4353   - initialValue={userInfo.userName}
  4353 + initialValue={userInfo.username}
4354 4354 showSearch
4355 4355 label="销售代表"
4356 4356 placeholder="请输入销售代表"
4357 4357 options={salesCodeOptions}
4358 4358 onChange={(_, option) => {
4359 4359 if (option === undefined) {
4360   - selectSalesCode(userInfo.userName);
  4360 + selectSalesCode(userInfo.username);
4361 4361 }
4362 4362 // if (option.value !== undefined) {
4363 4363 // selectSalesCode(option.value);
... ... @@ -4448,7 +4448,7 @@ const OrderPage = () => {
4448 4448 });
4449 4449 }
4450 4450 }
4451   - params.salesCode = userInfo.userName;
  4451 + params.salesCode = userInfo.username;
4452 4452 params.condition = filterCondifion;
4453 4453 //排序
4454 4454 params.sorted = sorted;
... ... @@ -4473,8 +4473,9 @@ const OrderPage = () => {
4473 4473 // params.applyTimeIsNotNull = true; // 要求申请时间非空
4474 4474 params.orderStatus = 'SHIPPED'; // 发票确认预警
4475 4475 params.isDeleteQueryOrder = false; // 强制查询非作废订单
4476   - params.salesCode = userInfo.userName;
4477   - if (salesCodeSelect !== undefined) {
  4476 + console.log(userInfo, '5656userInfo');
  4477 + params.salesCode = userInfo.username;
  4478 + if (salesCodeSelect !== undefined && salesCodeSelect !== null) {
4478 4479 params.salesCode = salesCodeSelect;
4479 4480 }
4480 4481 // params.paymentMethod = 'UNPAID';
... ... @@ -4490,8 +4491,8 @@ const OrderPage = () => {
4490 4491 // params.applyTimeLe = calDate;
4491 4492 // }
4492 4493 // params.applyTimeIsNotNull = true; // 要求申请时间非空
4493   - params.salesCode = userInfo.userName;
4494   - if (salesCodeSelect !== undefined) {
  4494 + params.salesCode = userInfo.username;
  4495 + if (salesCodeSelect !== undefined && salesCodeSelect !== null) {
4495 4496 params.salesCode = salesCodeSelect;
4496 4497 }
4497 4498 params.warningStatus = 'waitFeedbackWarning'; // 发票确认预警
... ... @@ -4509,8 +4510,8 @@ const OrderPage = () => {
4509 4510 // params.applyTimeLe = calDate;
4510 4511 // }
4511 4512 // params.applyTimeIsNotNull = true; // 要求申请时间非空
4512   - params.salesCode = userInfo.userName;
4513   - if (salesCodeSelect !== undefined) {
  4513 + params.salesCode = userInfo.username;
  4514 + if (salesCodeSelect !== undefined && salesCodeSelect !== null) {
4514 4515 params.salesCode = salesCodeSelect;
4515 4516 }
4516 4517 params.warningStatus = 'invoiceConfirmWarning'; // 发票确认预警
... ... @@ -4527,8 +4528,8 @@ const OrderPage = () => {
4527 4528 } else {
4528 4529 params.applyTimeLe = calDate;
4529 4530 }
4530   - params.salesCode = userInfo.userName;
4531   - if (salesCodeSelect !== undefined) {
  4531 + params.salesCode = userInfo.username;
  4532 + if (salesCodeSelect !== undefined && salesCodeSelect !== null) {
4532 4533 params.salesCode = salesCodeSelect;
4533 4534 }
4534 4535 params.isDeleteQueryOrder = false; // 强制查询非作废订单
... ...