canrd-main / canrd-erp-front · Commits

Commit a2a8a66076716f64d1fbbbdc73ff01c9836f106c

Authored by zhongnanhuang
2 parents 50feec82 3860b9ab

Merge branch 'znh-small' into znh

Inline Side-by-side
Showing 3 changed files with 22 additions and 8 deletions
src/pages/Order/components/FinancialDrawer.tsx
  View file @a2a8a66
... ... @@ -16,14 +16,20 @@ import { Form, message } from 'antd';
16 16 import { useEffect, useState } from 'react';
17 17 import { INVOCING_STATUS_OPTIONS_OLD } from '../constant';
18 18  
19   -export default ({ mainOrder, subOrders, isEdit, isMainOrder, onClose }) => {
  19 +export default ({
  20 + mainOrder,
  21 + subOrders,
  22 + isEdit,
  23 + isMainOrder,
  24 + cancel,
  25 + onClose,
  26 +}) => {
20 27 const [invoicingStatus, setInvoicingStatus] = useState('');
21 28 const subIds = subOrders.map((item) => item.id);
22   - console.log(subOrders);
23 29 useEffect(() => {
24 30 // 在组件挂载或数据变化时，更新组件状态
25 31 if (mainOrder) {
26   - setInvoicingStatus(subOrders[0].invoicingStatus);
  32 + setInvoicingStatus(subOrders[0]?.invoicingStatus);
27 33 }
28 34 }, [mainOrder]);
29 35  
... ... @@ -70,7 +76,7 @@ export default ({ mainOrder, subOrders, isEdit, isMainOrder, onClose }) => {
70 76 }
71 77 }}
72 78 onOpenChange={(val) => {
73   - return !val && onClose();
  79 + return !val && cancel();
74 80 }}
75 81 >
76 82 {isMainOrder ? (
... ... @@ -81,6 +87,7 @@ export default ({ mainOrder, subOrders, isEdit, isMainOrder, onClose }) => {
81 87 label="是否需要开票"
82 88 options={enumToSelect(INVOCING_STATUS_OPTIONS_OLD)}
83 89 onChange={setInvoicingStatus}
  90 + initialValue={subOrders[0]?.invoicingStatus}
84 91 // disabled={mainInfoDisbled}
85 92 rules={[{ required: true, message: '是否需要开票必填' }]}
86 93 />
... ... @@ -121,14 +128,14 @@ export default ({ mainOrder, subOrders, isEdit, isMainOrder, onClose }) => {
121 128 rules={[
122 129 { required: !isEdit ? true : false, message: '这是必填项' },
123 130 ]}
124   - initialValue={subOrders[0].invoicingTime}
  131 + initialValue={subOrders[0]?.invoicingTime}
125 132 />,
126 133 <ProFormDatePicker
127 134 key="collectMoneyTime"
128 135 width="lg"
129 136 name="collectMoneyTime"
130 137 label="收款时间"
131   - initialValue={subOrders[0].collectMoneyTime}
  138 + initialValue={subOrders[0]?.collectMoneyTime}
132 139 />,
133 140 ]
134 141 : ''}
... ... @@ -137,7 +144,7 @@ export default ({ mainOrder, subOrders, isEdit, isMainOrder, onClose }) =&gt; {
137 144 width="lg"
138 145 name="invoicingNotes"
139 146 label="备注"
140   - initialValue={subOrders[0].invoicingNotes}
  147 + initialValue={subOrders[0]?.invoicingNotes}
141 148 />
142 149 </DrawerForm>
143 150 );
... ...
src/pages/Order/constant.ts
  View file @a2a8a66
... ... @@ -49,7 +49,7 @@ export const INVOCING_STATUS = {
49 49 * @param subOrder
50 50 */
51 51 export const getNeedInvoicing = (subOrder: any) => {
52   - if (subOrder.invoicingTime !== undefined) {
  52 + if (subOrder.invoicingTime !== null && subOrder.invoicingTime !== undefined) {
53 53 return '已开票';
54 54 }
55 55 if (subOrder.invoicingStatus === 'UN_INVOICE') {
... ...
src/pages/Order/index.tsx
  View file @a2a8a66
... ... @@ -327,6 +327,7 @@ const OrderPage = () =&gt; {
327 327 <div className="whitespace-no-wrap overflow-hidden overflow-ellipsis">
328 328 <Tag
329 329 color={
  330 + optRecord.invoicingTime === null ||
330 331 optRecord.invoicingTime === undefined
331 332 ? TAGS_COLOR.get(optRecord.invoicingStatus)
332 333 : 'success'
... ... @@ -1240,6 +1241,12 @@ const OrderPage = () =&gt; {
1240 1241 mainOrder={orderRow}
1241 1242 subOrders={selectedRows}
1242 1243 isMainOrder={isMainOrder}
  1244 + cancel={() => {
  1245 + setFinancialVisible(false);
  1246 + setOrderRow({});
  1247 + setIsMainOrder(false);
  1248 + setIsFinalcialEdit(false);
  1249 + }}
1243 1250 onClose={() => {
1244 1251 setFinancialVisible(false);
1245 1252 setOrderRow({});
... ...