canrd-main / canrd-erp-front · Commits

Commit ba39c9d2b6269e3008ebae5b986ef394e70361b9

Authored by boyang
1 parent 6a6bf420
build: skipped

fix: 修改预警参数

Inline Side-by-side
Showing 3 changed files with 49 additions and 2 deletions
src/pages/Client/Client/Components/ClientModal.tsx
  View file @ba39c9d
... ... @@ -21,6 +21,52 @@ import { Button, Col, Form, Row, message } from 'antd';
21 21 import { RcFile } from 'antd/es/upload';
22 22 import './style.css';
23 23 export default ({ data, type, reloadTable }) => {
  24 + // const [activeKey, setActiveKey] = useState(initialItems[0].key);
  25 + // const [items, setItems] = useState(initialItems);
  26 + // const newTabIndex = useRef(0);
  27 +
  28 + // const onChange = (newActiveKey: string) => {
  29 + // setActiveKey(newActiveKey);
  30 + // };
  31 +
  32 + // const add = () => {
  33 + // const newActiveKey = `newTab${newTabIndex.current++}`;
  34 + // const newPanes = [...items];
  35 + // newPanes.push({ label: 'New Tab', children: 'Content of new Tab', key: newActiveKey });
  36 + // setItems(newPanes);
  37 + // setActiveKey(newActiveKey);
  38 + // };
  39 +
  40 + // const remove = (targetKey: TargetKey) => {
  41 + // let newActiveKey = activeKey;
  42 + // let lastIndex = -1;
  43 + // items.forEach((item, i) => {
  44 + // if (item.key === targetKey) {
  45 + // lastIndex = i - 1;
  46 + // }
  47 + // });
  48 + // const newPanes = items.filter((item) => item.key !== targetKey);
  49 + // if (newPanes.length && newActiveKey === targetKey) {
  50 + // if (lastIndex >= 0) {
  51 + // newActiveKey = newPanes[lastIndex].key;
  52 + // } else {
  53 + // newActiveKey = newPanes[0].key;
  54 + // }
  55 + // }
  56 + // setItems(newPanes);
  57 + // setActiveKey(newActiveKey);
  58 + // };
  59 +
  60 + // const onEdit = (
  61 + // targetKey: React.MouseEvent | React.KeyboardEvent | string,
  62 + // action: 'add' | 'remove',
  63 + // ) => {
  64 + // if (action === 'add') {
  65 + // add();
  66 + // } else {
  67 + // remove(targetKey);
  68 + // }
  69 + // };
24 70 const [form] = Form.useForm();
25 71 const onfinish = async (values) => {
26 72 const res = await postAdminClientAddOrModifyClientComunicationInfo({
... ...
src/pages/Order/Order/index.tsx
  View file @ba39c9d
... ... @@ -44,7 +44,7 @@ const OrderPage = () => {
44 44 waitConfirmReiceptStatusDateTimeLe: setOriginTime(7),
45 45 waitConfirmPaymentOrderCreatedDateTimeGe: setOriginTime(21),
46 46 waitFeedbackStatusDateTimeLe: setOriginTime(20),
47   - waitConfirmInvoiceStatusDateTimeLe: setOriginTime(5),
  47 + waitInvoiceStatusDateTimeLe: setOriginTime(5),
48 48 waitConfirmPaymentStatusDateTimeLe: setOriginTime(30),
49 49 },
50 50 });
... ...
src/pages/Order/OrderWarning/index.tsx
  View file @ba39c9d
... ... @@ -143,7 +143,7 @@ const OrderPage = () => {
143 143 options2[0].value,
144 144 ),
145 145 waitFeedbackStatusDateTimeLe: setOriginTime(options3[0].value),
146   - waitConfirmInvoiceStatusDateTimeLe: setOriginTime(options4[0].value),
  146 + waitInvoiceStatusDateTimeLe: setOriginTime(options4[0].value),
147 147 waitConfirmPaymentStatusDateTimeLe: setOriginTime(options5[0].value),
148 148 },
149 149 });
... ... @@ -460,6 +460,7 @@ const OrderPage = () => {
460 460 // 初始化参数
461 461 let initialParams = {};
462 462 initialParams.isDeleteQueryOrderNow = false;
  463 + initialParams.salesCode = userInfo.username;
463 464 if (salesCodePermission) {
464 465 if (salesCodeSelect !== undefined && salesCodeSelect !== null) {
465 466 initialParams.salesCode = salesCodeSelect;
... ...