Commit 8534395efd81213e74e4d35f81ea31e2c5b0d498
1 parent
ba39c9d2
fix: 修改预警参数
Showing
3 changed files
with
21 additions
and
5 deletions
src/pages/Client/Client/Components/ClientModal.tsx
@@ -20,19 +20,28 @@ import { | @@ -20,19 +20,28 @@ import { | ||
20 | import { Button, Col, Form, Row, message } from 'antd'; | 20 | import { Button, Col, Form, Row, message } from 'antd'; |
21 | import { RcFile } from 'antd/es/upload'; | 21 | import { RcFile } from 'antd/es/upload'; |
22 | import './style.css'; | 22 | import './style.css'; |
23 | +// import { useRef, useState } from 'react'; | ||
23 | export default ({ data, type, reloadTable }) => { | 24 | export default ({ data, type, reloadTable }) => { |
25 | + // const initialItems = [ | ||
26 | + // { label: 'Tab 1', children: 'Content of Tab 1', key: '1' }, | ||
27 | + // ]; | ||
24 | // const [activeKey, setActiveKey] = useState(initialItems[0].key); | 28 | // const [activeKey, setActiveKey] = useState(initialItems[0].key); |
25 | // const [items, setItems] = useState(initialItems); | 29 | // const [items, setItems] = useState(initialItems); |
26 | - // const newTabIndex = useRef(0); | 30 | + // const newTabIndex = useRef(1); |
27 | 31 | ||
28 | // const onChange = (newActiveKey: string) => { | 32 | // const onChange = (newActiveKey: string) => { |
29 | // setActiveKey(newActiveKey); | 33 | // setActiveKey(newActiveKey); |
30 | // }; | 34 | // }; |
31 | 35 | ||
32 | // const add = () => { | 36 | // const add = () => { |
33 | - // const newActiveKey = `newTab${newTabIndex.current++}`; | 37 | + // // 生成新的标签名,格式为 'Tab {num}' |
38 | + // const newTabLabel = `Tab ${newTabIndex.current + 1}`; | ||
39 | + // // 增加索引,保证下次生成新的Tab名称时,num会递增 | ||
40 | + // newTabIndex.current++; | ||
41 | + // // 创建新的panes,追加新Tab | ||
42 | + // const newActiveKey = `newTab${newTabIndex.current}`; | ||
34 | // const newPanes = [...items]; | 43 | // const newPanes = [...items]; |
35 | - // newPanes.push({ label: 'New Tab', children: 'Content of new Tab', key: newActiveKey }); | 44 | + // newPanes.push({ label: newTabLabel, children: 'Content of new Tab', key: newActiveKey }); |
36 | // setItems(newPanes); | 45 | // setItems(newPanes); |
37 | // setActiveKey(newActiveKey); | 46 | // setActiveKey(newActiveKey); |
38 | // }; | 47 | // }; |
@@ -309,6 +318,13 @@ export default ({ data, type, reloadTable }) => { | @@ -309,6 +318,13 @@ export default ({ data, type, reloadTable }) => { | ||
309 | hidden | 318 | hidden |
310 | ></ProFormText> | 319 | ></ProFormText> |
311 | <ProFormText initialValue={data?.id} name="id" hidden></ProFormText> | 320 | <ProFormText initialValue={data?.id} name="id" hidden></ProFormText> |
321 | + {/* <Tabs | ||
322 | + type="editable-card" | ||
323 | + onChange={onChange} | ||
324 | + activeKey={activeKey} | ||
325 | + onEdit={onEdit} | ||
326 | + items={items} | ||
327 | + /> */} | ||
312 | <div className="styled-text"> | 328 | <div className="styled-text"> |
313 | <div className="vertical-line"></div> | 329 | <div className="vertical-line"></div> |
314 | <span className="text">工单指派</span> | 330 | <span className="text">工单指派</span> |
src/pages/Order/Order/index.tsx
@@ -44,7 +44,7 @@ const OrderPage = () => { | @@ -44,7 +44,7 @@ const OrderPage = () => { | ||
44 | waitConfirmReiceptStatusDateTimeLe: setOriginTime(7), | 44 | waitConfirmReiceptStatusDateTimeLe: setOriginTime(7), |
45 | waitConfirmPaymentOrderCreatedDateTimeGe: setOriginTime(21), | 45 | waitConfirmPaymentOrderCreatedDateTimeGe: setOriginTime(21), |
46 | waitFeedbackStatusDateTimeLe: setOriginTime(20), | 46 | waitFeedbackStatusDateTimeLe: setOriginTime(20), |
47 | - waitInvoiceStatusDateTimeLe: setOriginTime(5), | 47 | + waitInvoicingStatusDateTimeLe: setOriginTime(5), |
48 | waitConfirmPaymentStatusDateTimeLe: setOriginTime(30), | 48 | waitConfirmPaymentStatusDateTimeLe: setOriginTime(30), |
49 | }, | 49 | }, |
50 | }); | 50 | }); |
src/pages/Order/OrderWarning/index.tsx
@@ -143,7 +143,7 @@ const OrderPage = () => { | @@ -143,7 +143,7 @@ const OrderPage = () => { | ||
143 | options2[0].value, | 143 | options2[0].value, |
144 | ), | 144 | ), |
145 | waitFeedbackStatusDateTimeLe: setOriginTime(options3[0].value), | 145 | waitFeedbackStatusDateTimeLe: setOriginTime(options3[0].value), |
146 | - waitInvoiceStatusDateTimeLe: setOriginTime(options4[0].value), | 146 | + waitInvoicingStatusDateTimeLe: setOriginTime(options4[0].value), |
147 | waitConfirmPaymentStatusDateTimeLe: setOriginTime(options5[0].value), | 147 | waitConfirmPaymentStatusDateTimeLe: setOriginTime(options5[0].value), |
148 | }, | 148 | }, |
149 | }); | 149 | }); |