Commit 425c1722e0ccade5015ff8f99f9e83a9ddec3c24
1 parent
0f992b9d
fix: 修改开票状态
Showing
4 changed files
with
16 additions
and
3 deletions
src/pages/Order/FeedBack/constant.ts
@@ -257,6 +257,7 @@ export const AFTER_INVOICING_STATUS = { | @@ -257,6 +257,7 @@ export const AFTER_INVOICING_STATUS = { | ||
257 | COMPLETE_INVOICING: '完全开票', | 257 | COMPLETE_INVOICING: '完全开票', |
258 | INVOICING: '开票中', | 258 | INVOICING: '开票中', |
259 | REISSUE: '重新开票', | 259 | REISSUE: '重新开票', |
260 | + UN_INVOICE: '不需开票', | ||
260 | }; | 261 | }; |
261 | 262 | ||
262 | export const TAGS_COLOR = new Map<string, string>([ | 263 | export const TAGS_COLOR = new Map<string, string>([ |
src/pages/Order/OrderList/FinancialMergeDrawer.tsx
@@ -142,7 +142,6 @@ export default ({ dataList, setVisible, onClose }) => { | @@ -142,7 +142,6 @@ export default ({ dataList, setVisible, onClose }) => { | ||
142 | { label: '完全开票', value: 'COMPLETE_INVOICING' }, | 142 | { label: '完全开票', value: 'COMPLETE_INVOICING' }, |
143 | { label: '部分开票', value: 'PARTIAL_INVOICING' }, | 143 | { label: '部分开票', value: 'PARTIAL_INVOICING' }, |
144 | ]} | 144 | ]} |
145 | - initialValue={'COMPLETE_INVOICING'} | ||
146 | /> | 145 | /> |
147 | <ProFormTextArea width="lg" name="invoicingNotes" label="备注" /> | 146 | <ProFormTextArea width="lg" name="invoicingNotes" label="备注" /> |
148 | </DrawerForm> | 147 | </DrawerForm> |
src/pages/Order/OrderList/OrderList.tsx
@@ -1159,7 +1159,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => { | @@ -1159,7 +1159,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => { | ||
1159 | )} | 1159 | )} |
1160 | 1160 | ||
1161 | {/* 开票状态 */} | 1161 | {/* 开票状态 */} |
1162 | - {optRecord.afterInvoicingStatus !== null ? ( | 1162 | + {/* {optRecord.afterInvoicingStatus !== null ? ( |
1163 | <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap"> | 1163 | <div className="overflow-hidden overflow-ellipsis whitespace-no-wrap"> |
1164 | <Tooltip | 1164 | <Tooltip |
1165 | title={ | 1165 | title={ |
@@ -1185,7 +1185,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => { | @@ -1185,7 +1185,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => { | ||
1185 | </div> | 1185 | </div> |
1186 | ) : ( | 1186 | ) : ( |
1187 | '' | 1187 | '' |
1188 | - )} | 1188 | + )} */} |
1189 | 1189 | ||
1190 | {/* 是否加急图标显示 */} | 1190 | {/* 是否加急图标显示 */} |
1191 | {optRecord.isUrgent ? ( | 1191 | {optRecord.isUrgent ? ( |
@@ -2748,6 +2748,18 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => { | @@ -2748,6 +2748,18 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => { | ||
2748 | </div> | 2748 | </div> |
2749 | <Divider type="vertical" /> | 2749 | <Divider type="vertical" /> |
2750 | 2750 | ||
2751 | + {/* 开票状态 */} | ||
2752 | + <div> | ||
2753 | + <span className="text-[#8C8C8C]">开票状态:</span> | ||
2754 | + <span className="text-slate-700"> | ||
2755 | + {enumValueToLabel( | ||
2756 | + record.afterInvoicingStatus, | ||
2757 | + AFTER_INVOICING_STATUS, | ||
2758 | + ) || '尚未开票'} | ||
2759 | + </span> | ||
2760 | + </div> | ||
2761 | + <Divider type="vertical" /> | ||
2762 | + | ||
2751 | {/* 添加已回款金额 */} | 2763 | {/* 添加已回款金额 */} |
2752 | <div> | 2764 | <div> |
2753 | <span className="text-[#8C8C8C]">已回款金额:¥</span> | 2765 | <span className="text-[#8C8C8C]">已回款金额:¥</span> |
src/pages/Order/constant.ts
@@ -265,6 +265,7 @@ export const FINANCIAL_STATUS_OPTIONS = { | @@ -265,6 +265,7 @@ export const FINANCIAL_STATUS_OPTIONS = { | ||
265 | 265 | ||
266 | export const AFTER_INVOICING_STATUS = { | 266 | export const AFTER_INVOICING_STATUS = { |
267 | NOT_YET_INVOICED: '尚未开票', | 267 | NOT_YET_INVOICED: '尚未开票', |
268 | + UN_INVOICE: '不需开票', | ||
268 | APPLY_FOR_INVOICING: '申请开票', | 269 | APPLY_FOR_INVOICING: '申请开票', |
269 | URGENT_INVOICE_AUDITING: '加急待审核', | 270 | URGENT_INVOICE_AUDITING: '加急待审核', |
270 | URGENT_INVOICE_AUDIT_NOTPASS: '加急审核失败', | 271 | URGENT_INVOICE_AUDIT_NOTPASS: '加急审核失败', |