canrd-main / canrd-erp-front · Commits

Commit 7cc5f5a5cf7cf8d75181ad16df0a2cb9b1e6c458

Authored by zhongnanhuang
2 parents 318b94d2 029101a8
build: skipped

Merge branch 'znh' into 'develop' 

Znh



See merge request !18
Inline Side-by-side
Showing 3 changed files with 19 additions and 21 deletions
src/pages/Order/components/HistoryModal.tsx
  View file @7cc5f5a
@@ -2,11 +2,7 @@ import { postServiceOrderQueryHistoryOrderRecord } from '@/services'; @@ -2,11 +2,7 @@ import { postServiceOrderQueryHistoryOrderRecord } from '@/services';
2 import { enumValueToLabel, formatDateTime } from '@/utils'; 2 import { enumValueToLabel, formatDateTime } from '@/utils';
3 import { Button, Col, Empty, Flex, Modal, Row, Spin } from 'antd'; 3 import { Button, Col, Empty, Flex, Modal, Row, Spin } from 'antd';
4 import { useEffect, useState } from 'react'; 4 import { useEffect, useState } from 'react';
5 -import {  
6 - FINANCIAL_STATUS_OPTIONS,  
7 - HISTORY_OPT_TYPE,  
8 - ORDER_STATUS_OPTIONS,  
9 -} from '../constant'; 5 +import { HISTORY_OPT_TYPE, ORDER_STATUS_OPTIONS } from '../constant';
10 6
11 export default ({ subOrders, isCancelledOrder, onClose }) => { 7 export default ({ subOrders, isCancelledOrder, onClose }) => {
12 let subOrderIds = subOrders?.map((subOrder: any) => { 8 let subOrderIds = subOrders?.map((subOrder: any) => {
@@ -81,26 +77,19 @@ export default ({ subOrders, isCancelledOrder, onClose }) => { @@ -81,26 +77,19 @@ export default ({ subOrders, isCancelledOrder, onClose }) => {
81 {HISTORY_OPT_TYPE.get(history.record)} 77 {HISTORY_OPT_TYPE.get(history.record)}
82 </span> 78 </span>
83 ， 79 ，
84 - {enumValueToLabel(  
85 - history.status,  
86 - ORDER_STATUS_OPTIONS,  
87 - ) === undefined  
88 - ? '子订单开票状态为'  
89 - : '子订单状态为'} 80 + {history.record === 'INVOICING' ? '开票状态为' : ''}
  81 + {history.record !== 'INVOICING' ? '订单状态为' : ''}
90 ： 82 ：
91 <span className="text-[#3b83e5]"> 83 <span className="text-[#3b83e5]">
92 - {enumValueToLabel(  
93 - history.status,  
94 - ORDER_STATUS_OPTIONS,  
95 - ) === undefined 84 + {history.status === 'INVOICING' ? '已开票' : ''}
  85 + {history.status === null ? '已作废' : ''}
  86 + {history.status !== null &&
  87 + history.status !== 'INVOICING'
96 ? enumValueToLabel( 88 ? enumValueToLabel(
97 history.status, 89 history.status,
98 - FINANCIAL_STATUS_OPTIONS,  
99 - )  
100 - : enumValueToLabel(  
101 - history.status,  
102 ORDER_STATUS_OPTIONS, 90 ORDER_STATUS_OPTIONS,
103 - )} 91 + )
  92 + : ''}
104 </span> 93 </span>
105 </div> 94 </div>
106 ); 95 );
src/pages/Order/constant.ts
  View file @7cc5f5a
@@ -216,6 +216,7 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([ @@ -216,6 +216,7 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([
216 ['AFTER_SALES_COMPLETION', '完成售后子订单'], 216 ['AFTER_SALES_COMPLETION', '完成售后子订单'],
217 ['PROCURE_PRINT', '采购打印子订单'], 217 ['PROCURE_PRINT', '采购打印子订单'],
218 ['PROCURE_SEND', '采购发货子订单'], 218 ['PROCURE_SEND', '采购发货子订单'],
  219 + ['NO_NEED_SEND', '不需要发货'],
219 ]); 220 ]);
220 221
221 export const MAIN_ORDER_COLUMNS = [ 222 export const MAIN_ORDER_COLUMNS = [
src/pages/Order/index.tsx
  View file @7cc5f5a
@@ -1273,8 +1273,16 @@ const OrderPage = () =&gt; { @@ -1273,8 +1273,16 @@ const OrderPage = () =&gt; {
1273 setSelectedRows(selectedSubOrders); 1273 setSelectedRows(selectedSubOrders);
1274 for (let i = 0; i < selectedSubOrders.length; i++) { 1274 for (let i = 0; i < selectedSubOrders.length; i++) {
1275 if ( 1275 if (
  1276 + selectedSubOrders[i].orderStatus !== 'AUDITED' &&
1276 selectedSubOrders[i].orderStatus !== 1277 selectedSubOrders[i].orderStatus !==
1277 - 'CONFIRM_RECEIPT' 1278 + 'PROCURE_PROCESS' &&
  1279 + selectedSubOrders[i].orderStatus !==
  1280 + 'PROCURE_PROCESS_FOR_MINE' &&
  1281 + selectedSubOrders[i].orderStatus !==
  1282 + 'PROCURE_WAIT_SHIP' &&
  1283 + selectedSubOrders[i].orderStatus !==
  1284 + 'SUPPLIER_WAIT_SHIP' &&
  1285 + selectedSubOrders[i].orderStatus !== 'WAIT_SHIP'
1278 ) { 1286 ) {
1279 message.error( 1287 message.error(
1280 '请选择未发货的子订单进行无需发货操作', 1288 '请选择未发货的子订单进行无需发货操作',