canrd-main / canrd-erp-front · Commits

Commit 53bf932d9b1c814e1589ea68c5ee7d7b66181111

Authored by 曾国涛
1 parent 31715192
build: skipped

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

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