canrd-main / canrd-erp-front · Commits

Commit 1a33ea021db20c9554a6ba8c18bc28f85cc374d5

Authored by 曾国涛
2 parents e5e4ea57 53bf932d
build: skipped

Merge branch 'bugfix-zengguotao-20250513-invoicingstatus' into 'master' 

feat(Order): 开票状态显示错误bug修复



See merge request !33
Inline Side-by-side
Showing 4 changed files with 18 additions and 12 deletions
src/pages/Order/FeedBack/OrderList.tsx
  View file @1a33ea0
... ... @@ -1193,8 +1193,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
1193 1193 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
1194 1194 <Tag
1195 1195 color={
1196   - optRecord.invoicingTime === null ||
1197   - optRecord.invoicingTime === undefined
  1196 + optRecord.afterInvoicingStatus !== 'COMPLETE_INVOICING' &&
  1197 + optRecord.afterInvoicingStatus !== 'PARTIAL_INVOICING'
1198 1198 ? TAGS_COLOR.get(optRecord.invoicingStatus)
1199 1199 : 'success'
1200 1200 }
... ...
src/pages/Order/FeedBack/constant.ts
  View file @1a33ea0
... ... @@ -121,10 +121,10 @@ export const CHECK_TYPE = {
121 121 * @param subOrder
122 122 */
123 123 export const getNeedInvoicing = (subOrder: any) => {
124   - if (subOrder.invoicingTime !== null && subOrder.invoicingTime !== undefined) {
125   - return '已开票';
126   - }
127   - if (subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING') {
  124 + if (
  125 + subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING' ||
  126 + subOrder.afterInvoicingStatus === 'PARTIAL_INVOICING'
  127 + ) {
128 128 return '已开票';
129 129 }
130 130 if (subOrder.afterInvoicingStatus === 'REISSUE') {
... ... @@ -133,6 +133,12 @@ export const getNeedInvoicing = (subOrder: any) =&gt; {
133 133 if (subOrder.invoicingStatus === 'UN_INVOICE') {
134 134 return '不需开票';
135 135 }
  136 + if (subOrder.afterInvoicingStatus === 'WAIT_FLUSH') {
  137 + return '待冲红';
  138 + }
  139 + if (subOrder.afterInvoicingStatus === 'FLUSHED') {
  140 + return '已冲红';
  141 + }
136 142 return '需要开票';
137 143 };
138 144  
... ...
src/pages/Order/OrderList/OrderList.tsx
  View file @1a33ea0
... ... @@ -1219,8 +1219,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1219 1219 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
1220 1220 <Tag
1221 1221 color={
1222   - optRecord.invoicingTime === null ||
1223   - optRecord.invoicingTime === undefined
  1222 + optRecord.afterInvoicingStatus !== 'COMPLETE_INVOICING' &&
  1223 + optRecord.afterInvoicingStatus !== 'PARTIAL_INVOICING'
1224 1224 ? TAGS_COLOR.get(optRecord.invoicingStatus)
1225 1225 : 'success'
1226 1226 }
... ...
src/pages/Order/constant.ts
  View file @1a33ea0
... ... @@ -136,10 +136,10 @@ export const CHECK_TYPE = {
136 136 * @param subOrder
137 137 */
138 138 export const getNeedInvoicing = (subOrder: any) => {
139   - if (subOrder.invoicingTime !== null && subOrder.invoicingTime !== undefined) {
140   - return '已开票';
141   - }
142   - if (subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING') {
  139 + if (
  140 + subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING' ||
  141 + subOrder.afterInvoicingStatus === 'PARTIAL_INVOICING'
  142 + ) {
143 143 return '已开票';
144 144 }
145 145 if (subOrder.afterInvoicingStatus === 'REISSUE') {
... ...