canrd-main / canrd-erp-front · Commits

Commit 1b65ce0753957ccfb2eedf3082d927f19c0d4d3c

Authored by PurelzMgnead
1 parent ba842ae6
build: skipped

feat: 1223

Inline Side-by-side
Showing 12 changed files with 151 additions and 11 deletions
src/pages/Order/FeedBack/OrderList.tsx
  View file @1b65ce0
... ... @@ -705,7 +705,11 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
705 705 }
706 706  
707 707 //如果是未审核或者领导已审核，付款状态为预付款则需要财务审核【财务待审核】，否则仓库审核【】
708   - if (orderStatus === 'UNAUDITED' || orderStatus === 'LEADER_AUDITED') {
  708 + if (
  709 + orderStatus === 'UNAUDITED' ||
  710 + orderStatus === 'LEADER_AUDITED' ||
  711 + orderStatus === 'PROCURE_REJECT'
  712 + ) {
709 713 if (paymentMethod === 'PAYMENT_IN_ADVANCE') {
710 714 orderStatusTagText = '财务待审核';
711 715 } else {
... ... @@ -3542,6 +3546,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
3542 3546 //是审核通过及之后的订单
3543 3547 if (
3544 3548 orderStatus !== 'UNAUDITED' &&
  3549 + orderStatus !== 'PROCURE_REJECT' &&
3545 3550 orderStatus !== 'AUDIT_FAILED' &&
3546 3551 orderStatus !== 'LEADER_PROCESS' &&
3547 3552 orderStatus !== 'SALES_CONFIRM' &&
... ... @@ -3557,6 +3562,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
3557 3562 if (
3558 3563 roleCode !== 'admin' &&
3559 3564 (orderStatus === 'UNAUDITED' ||
  3565 + orderStatus === 'PROCURE_REJECT' ||
3560 3566 orderStatus === 'AUDIT_FAILED')
3561 3567 ) {
3562 3568 message.error('请选择已审核的订单进行编辑');
... ... @@ -3610,6 +3616,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
3610 3616 let orderStatus = selectedSubOrders[i].orderStatus;
3611 3617 if (
3612 3618 orderStatus !== 'UNAUDITED' &&
  3619 + orderStatus !== 'PROCURE_REJECT' &&
3613 3620 orderStatus !== 'FINANCE_PROCESS' &&
3614 3621 orderStatus !== 'LEADER_AUDITED'
3615 3622 ) {
... ... @@ -3795,6 +3802,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
3795 3802 if (
3796 3803 selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
3797 3804 selectedSubOrders[i].orderStatus !==
  3805 + 'PROCURE_REJECT' &&
  3806 + selectedSubOrders[i].orderStatus !==
3798 3807 'FINANCE_PROCESS' &&
3799 3808 selectedSubOrders[i].orderStatus !==
3800 3809 'LEADER_AUDITED'
... ...
src/pages/Order/FeedBack/constant.ts
  View file @1b65ce0
... ... @@ -181,6 +181,7 @@ export const ORDER_STATUS_OPTIONS = {
181 181 WAIT_CONFIRM_DELIVER_AFTER_INVOICE: '待开票后确认发货',
182 182 SALES_CONFIRM: '销售待确认',
183 183 UNAUDITED: '未审核',
  184 + PROCURE_REJECT: '采购驳回至销售',
184 185 LEADER_PROCESS: '领导待审核',
185 186 MODIFY_APPLY_WAIT_FOR_AUDIT: '修改待审核',
186 187 LEADER_AUDITED: '领导已审核',
... ... @@ -265,6 +266,7 @@ export const TAGS_COLOR = new Map<string, string>([
265 266 ['COMMON_INVOICED', 'processing'],
266 267 ['AFTER_INVOICED', 'success'],
267 268 ['UNAUDITED', 'warning'],
  269 + ['PROCURE_REJECT', 'warning'],
268 270 ['AUDITED', 'processing'],
269 271 ['WAIT_SHIP', 'processing'],
270 272 ['SHIPPED', 'processing'],
... ...
src/pages/Order/Order/components/ProcureCheckModal.tsx
  View file @1b65ce0
... ... @@ -50,6 +50,7 @@ export default ({ setCheckVisible, isMainOrder, orders, onClose }) => {
50 50 return [
51 51 defaultDoms[0],
52 52 <>
  53 + <Button>驳回至销售</Button>
53 54 <Popconfirm
54 55 title="是否转回仓库"
55 56 description={
... ...
src/pages/Order/Order/index copy.tsx
  View file @1b65ce0
... ... @@ -712,7 +712,11 @@ const OrderPage = () =&gt; {
712 712 }
713 713  
714 714 //如果是未审核或者领导已审核，付款状态为预付款则需要财务审核【财务待审核】，否则仓库审核【】
715   - if (orderStatus === 'UNAUDITED' || orderStatus === 'LEADER_AUDITED') {
  715 + if (
  716 + orderStatus === 'UNAUDITED' ||
  717 + orderStatus === 'LEADER_AUDITED' ||
  718 + orderStatus === 'PROCURE_REJECT'
  719 + ) {
716 720 if (paymentMethod === 'PAYMENT_IN_ADVANCE') {
717 721 orderStatusTagText = '财务待审核';
718 722 } else {
... ... @@ -3523,6 +3527,7 @@ const OrderPage = () =&gt; {
3523 3527 //是审核通过及之后的订单
3524 3528 if (
3525 3529 orderStatus !== 'UNAUDITED' &&
  3530 + orderStatus !== 'PROCURE_REJECT' &&
3526 3531 orderStatus !== 'AUDIT_FAILED' &&
3527 3532 orderStatus !== 'LEADER_PROCESS' &&
3528 3533 orderStatus !== 'SALES_CONFIRM' &&
... ... @@ -3538,6 +3543,7 @@ const OrderPage = () =&gt; {
3538 3543 if (
3539 3544 roleCode !== 'admin' &&
3540 3545 (orderStatus === 'UNAUDITED' ||
  3546 + orderStatus === 'PROCURE_REJECT' ||
3541 3547 orderStatus === 'AUDIT_FAILED')
3542 3548 ) {
3543 3549 message.error('请选择已审核的订单进行编辑');
... ... @@ -3591,6 +3597,7 @@ const OrderPage = () =&gt; {
3591 3597 let orderStatus = selectedSubOrders[i].orderStatus;
3592 3598 if (
3593 3599 orderStatus !== 'UNAUDITED' &&
  3600 + orderStatus !== 'PROCURE_REJECT' &&
3594 3601 orderStatus !== 'FINANCE_PROCESS' &&
3595 3602 orderStatus !== 'LEADER_AUDITED'
3596 3603 ) {
... ... @@ -3754,6 +3761,8 @@ const OrderPage = () =&gt; {
3754 3761 if (
3755 3762 selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
3756 3763 selectedSubOrders[i].orderStatus !==
  3764 + 'PROCURE_REJECT' &&
  3765 + selectedSubOrders[i].orderStatus !==
3757 3766 'FINANCE_PROCESS' &&
3758 3767 selectedSubOrders[i].orderStatus !==
3759 3768 'LEADER_AUDITED'
... ...
src/pages/Order/OrderList/OrderList.tsx
  View file @1b65ce0
... ... @@ -718,7 +718,11 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
718 718 }
719 719  
720 720 //如果是未审核或者领导已审核，付款状态为预付款则需要财务审核【财务待审核】，否则仓库审核【】
721   - if (orderStatus === 'UNAUDITED' || orderStatus === 'LEADER_AUDITED') {
  721 + if (
  722 + orderStatus === 'UNAUDITED' ||
  723 + orderStatus === 'LEADER_AUDITED' ||
  724 + orderStatus === 'PROCURE_REJECT'
  725 + ) {
722 726 if (paymentMethod === 'PAYMENT_IN_ADVANCE') {
723 727 orderStatusTagText = '财务待审核';
724 728 } else {
... ... @@ -3552,6 +3556,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
3552 3556 //是审核通过及之后的订单
3553 3557 if (
3554 3558 orderStatus !== 'UNAUDITED' &&
  3559 + orderStatus !== 'PROCURE_REJECT' &&
3555 3560 orderStatus !== 'AUDIT_FAILED' &&
3556 3561 orderStatus !== 'LEADER_PROCESS' &&
3557 3562 orderStatus !== 'SALES_CONFIRM' &&
... ... @@ -3567,6 +3572,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
3567 3572 if (
3568 3573 roleCode !== 'admin' &&
3569 3574 (orderStatus === 'UNAUDITED' ||
  3575 + orderStatus === 'PROCURE_REJECT' ||
3570 3576 orderStatus === 'AUDIT_FAILED')
3571 3577 ) {
3572 3578 message.error('请选择已审核的订单进行编辑');
... ... @@ -3620,6 +3626,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
3620 3626 let orderStatus = selectedSubOrders[i].orderStatus;
3621 3627 if (
3622 3628 orderStatus !== 'UNAUDITED' &&
  3629 + orderStatus !== 'PROCURE_REJECT' &&
3623 3630 orderStatus !== 'FINANCE_PROCESS' &&
3624 3631 orderStatus !== 'LEADER_AUDITED'
3625 3632 ) {
... ... @@ -3804,6 +3811,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
3804 3811 if (
3805 3812 selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
3806 3813 selectedSubOrders[i].orderStatus !==
  3814 + 'PROCURE_REJECT' &&
  3815 + selectedSubOrders[i].orderStatus !==
3807 3816 'FINANCE_PROCESS' &&
3808 3817 selectedSubOrders[i].orderStatus !==
3809 3818 'LEADER_AUDITED'
... ...
src/pages/Order/OrderList/ProcureCheckModal.tsx
  View file @1b65ce0
... ... @@ -2,6 +2,7 @@ import { RESPONSE_CODE } from &#39;@/constants/enum&#39;;
2 2 import {
3 3 postServiceOrderProcureCheckOrder,
4 4 postServiceOrderProcureConvertWarehouseKeeper,
  5 + postServiceOrderPurchaseRejectionToSale,
5 6 postServiceOrderQuerySupplier,
6 7 } from '@/services';
7 8 import {
... ... @@ -50,6 +51,25 @@ export default ({ setCheckVisible, isMainOrder, orders, onClose }) =&gt; {
50 51 return [
51 52 defaultDoms[0],
52 53 <>
  54 + <Button
  55 + type="primary"
  56 + onClick={async () => {
  57 + let res = await postServiceOrderPurchaseRejectionToSale({
  58 + data: {
  59 + subIds: ids,
  60 + checkNotes: checkNotes,
  61 + },
  62 + });
  63 +
  64 + if (res?.result === RESPONSE_CODE.SUCCESS) {
  65 + message.success(res.message);
  66 + onClose();
  67 + return true;
  68 + }
  69 + }}
  70 + >
  71 + 驳回至销售
  72 + </Button>
53 73 <Popconfirm
54 74 title="是否转回仓库"
55 75 description={
... ...
src/pages/Order/OrderWarning/index copy.tsx
  View file @1b65ce0
... ... @@ -662,7 +662,11 @@ const OrderPage = () =&gt; {
662 662 }
663 663  
664 664 //如果是未审核或者领导已审核，付款状态为预付款则需要财务审核【财务待审核】，否则仓库审核【】
665   - if (orderStatus === 'UNAUDITED' || orderStatus === 'LEADER_AUDITED') {
  665 + if (
  666 + orderStatus === 'UNAUDITED' ||
  667 + orderStatus === 'LEADER_AUDITED' ||
  668 + orderStatus === 'PROCURE_REJECT'
  669 + ) {
666 670 if (paymentMethod === 'PAYMENT_IN_ADVANCE') {
667 671 orderStatusTagText = '财务待审核';
668 672 } else {
... ... @@ -3481,6 +3485,7 @@ const OrderPage = () =&gt; {
3481 3485 //是审核通过及之后的订单
3482 3486 if (
3483 3487 orderStatus !== 'UNAUDITED' &&
  3488 + orderStatus !== 'PROCURE_REJECT' &&
3484 3489 orderStatus !== 'AUDIT_FAILED' &&
3485 3490 orderStatus !== 'LEADER_PROCESS' &&
3486 3491 orderStatus !== 'SALES_CONFIRM' &&
... ... @@ -3496,6 +3501,7 @@ const OrderPage = () =&gt; {
3496 3501 if (
3497 3502 roleCode !== 'admin' &&
3498 3503 (orderStatus === 'UNAUDITED' ||
  3504 + orderStatus === 'PROCURE_REJECT' ||
3499 3505 orderStatus === 'AUDIT_FAILED')
3500 3506 ) {
3501 3507 message.error('请选择已审核的订单进行编辑');
... ... @@ -3549,6 +3555,7 @@ const OrderPage = () =&gt; {
3549 3555 let orderStatus = selectedSubOrders[i].orderStatus;
3550 3556 if (
3551 3557 orderStatus !== 'UNAUDITED' &&
  3558 + orderStatus !== 'PROCURE_REJECT' &&
3552 3559 orderStatus !== 'FINANCE_PROCESS' &&
3553 3560 orderStatus !== 'LEADER_AUDITED'
3554 3561 ) {
... ... @@ -3712,6 +3719,8 @@ const OrderPage = () =&gt; {
3712 3719 if (
3713 3720 selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
3714 3721 selectedSubOrders[i].orderStatus !==
  3722 + 'PROCURE_REJECT' &&
  3723 + selectedSubOrders[i].orderStatus !==
3715 3724 'FINANCE_PROCESS' &&
3716 3725 selectedSubOrders[i].orderStatus !==
3717 3726 'LEADER_AUDITED'
... ...
src/pages/Order/constant.ts
  View file @1b65ce0
... ... @@ -182,6 +182,7 @@ export const ORDER_STATUS_OPTIONS = {
182 182 WAIT_CONFIRM_DELIVER_AFTER_INVOICE: '待开票后确认发货',
183 183 SALES_CONFIRM: '销售待确认',
184 184 UNAUDITED: '未审核',
  185 + PROCURE_REJECT: '采购驳回至销售',
185 186 LEADER_PROCESS: '领导待审核',
186 187 MODIFY_APPLY_WAIT_FOR_AUDIT: '修改待审核',
187 188 LEADER_AUDITED: '领导已审核',
... ... @@ -260,6 +261,7 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
260 261 ['COMMON_INVOICED', 'processing'],
261 262 ['AFTER_INVOICED', 'success'],
262 263 ['UNAUDITED', 'warning'],
  264 + ['PROCURE_REJECT', 'warning'],
263 265 ['AUDITED', 'processing'],
264 266 ['WAIT_SHIP', 'processing'],
265 267 ['SHIPPED', 'processing'],
... ...
src/pages/OrderPrint/components/HoujiePrinter.tsx
  View file @1b65ce0
... ... @@ -221,7 +221,7 @@ export default ({ mainOrder, subOrders }) =&gt; {
221 221 <td className="xl76" colSpan={2} style={{ msoIgnore: 'colSpan' }}>
222 222 客户签名：
223 223 </td>
224   - <td className="xl76">核准：屠亚辉</td>
  224 + <td className="xl76">核准：冯强</td>
225 225 <td
226 226 className="xl78"
227 227 colSpan={2}
... ... @@ -234,7 +234,7 @@ export default ({ mainOrder, subOrders }) =&gt; {
234 234 colSpan={2}
235 235 style={{ borderRight: 'none', borderBottom: 'none' }}
236 236 >
237   - 开单人：张玉红
  237 + 开单人：许铭轩
238 238 </td>
239 239 </tr>
240 240 <tr style={{ display: 'none', width: 0 }}>
... ...
src/pages/OrderPrint/index.tsx
  View file @1b65ce0
... ... @@ -339,7 +339,7 @@ function App() {
339 339 <td className="xl76" colSpan={2} style={{ msoIgnore: 'colspan' }}>
340 340 客户签名：
341 341 </td>
342   - <td className="xl76">核准：屠亚辉</td>
  342 + <td className="xl76">核准：冯强</td>
343 343 <td
344 344 className="xl78"
345 345 colSpan={2}
... ... @@ -352,7 +352,7 @@ function App() {
352 352 colSpan={2}
353 353 style={{ borderRight: 'none', borderBottom: 'none' }}
354 354 >
355   - 开单人：张玉红
  355 + 开单人：许铭轩
356 356 </td>
357 357 </tr>
358 358 <tr style={{ display: 'none', width: 0 }}>
... ...
src/services/definition.ts
  View file @1b65ce0
... ... @@ -2395,6 +2395,12 @@ export interface OrderCompletionReportVO {
2395 2395 orderStatus?: number;
2396 2396 }
2397 2397  
  2398 +export interface OrderDistrictSelVo {
  2399 + /** @format int64 */
  2400 + oid?: number;
  2401 + orderType?: string;
  2402 +}
  2403 +
2398 2404 export interface OrderFieldLockApplyQueryVO {
2399 2405 /** @format int64 */
2400 2406 applyUserId?: number;
... ... @@ -4618,6 +4624,7 @@ export interface InvoiceDetail {
4618 4624 }
4619 4625  
4620 4626 export interface InvoiceReissueRecord {
  4627 + auditNotes?: string;
4621 4628 createByName?: string;
4622 4629 /**
4623 4630 * @description
... ...
src/services/request.ts
  View file @1b65ce0
... ... @@ -74,6 +74,7 @@ import type {
74 74 OrderAddVO,
75 75 OrderAuditLogQueryVO,
76 76 OrderBaseInfoQueryVO,
  77 + OrderDistrictSelVo,
77 78 OrderFieldLockApplyQueryVO,
78 79 OrderMainProDo,
79 80 OrderOptLogQueryVO,
... ... @@ -3062,13 +3063,13 @@ export const postDistrictFindProvinceAndCityAndDistrict =
3062 3063 export interface PostDistrictSelOrderProvinceOption {
3063 3064 /**
3064 3065 * @description
3065   - * oId
  3066 + * OrderDistrictSelVo
3066 3067 */
3067 3068 body: {
3068 3069 /**
3069 3070 @description
3070   - oId */
3071   - oId: number;
  3071 + OrderDistrictSelVo */
  3072 + OrderDistrictSelVo: OrderDistrictSelVo;
3072 3073 };
3073 3074 }
3074 3075  
... ... @@ -22077,6 +22078,77 @@ export const getServiceOrderProvideToken = /* #__PURE__ */ (() =&gt; {
22077 22078 return request;
22078 22079 })();
22079 22080  
  22081 +/** @description request parameter type for postServiceOrderPurchaseRejectionToSale */
  22082 +export interface PostServiceOrderPurchaseRejectionToSaleOption {
  22083 + /**
  22084 + * @description
  22085 + * dto
  22086 + */
  22087 + body: {
  22088 + /**
  22089 + @description
  22090 + dto */
  22091 + dto: Dto;
  22092 + };
  22093 +}
  22094 +
  22095 +/** @description response type for postServiceOrderPurchaseRejectionToSale */
  22096 +export interface PostServiceOrderPurchaseRejectionToSaleResponse {
  22097 + /**
  22098 + * @description
  22099 + * OK
  22100 + */
  22101 + 200: ServerResult;
  22102 + /**
  22103 + * @description
  22104 + * Created
  22105 + */
  22106 + 201: any;
  22107 + /**
  22108 + * @description
  22109 + * Unauthorized
  22110 + */
  22111 + 401: any;
  22112 + /**
  22113 + * @description
  22114 + * Forbidden
  22115 + */
  22116 + 403: any;
  22117 + /**
  22118 + * @description
  22119 + * Not Found
  22120 + */
  22121 + 404: any;
  22122 +}
  22123 +
  22124 +export type PostServiceOrderPurchaseRejectionToSaleResponseSuccess =
  22125 + PostServiceOrderPurchaseRejectionToSaleResponse[200];
  22126 +/**
  22127 + * @description
  22128 + * 采购驳回至销售
  22129 + * @tags 内部订单
  22130 + * @produces *
  22131 + * @consumes application/json
  22132 + */
  22133 +export const postServiceOrderPurchaseRejectionToSale = /* #__PURE__ */ (() => {
  22134 + const method = 'post';
  22135 + const url = '/service/order/purchaseRejectionToSale';
  22136 + function request(
  22137 + option: PostServiceOrderPurchaseRejectionToSaleOption,
  22138 + ): Promise<PostServiceOrderPurchaseRejectionToSaleResponseSuccess> {
  22139 + return requester(request.url, {
  22140 + method: request.method,
  22141 + ...option,
  22142 + }) as unknown as Promise<PostServiceOrderPurchaseRejectionToSaleResponseSuccess>;
  22143 + }
  22144 +
  22145 + /** http method */
  22146 + request.method = method;
  22147 + /** request url */
  22148 + request.url = url;
  22149 + return request;
  22150 +})();
  22151 +
22080 22152 /** @description request parameter type for postServiceOrderQueryAfterSalesInfoSnapshot */
22081 22153 export interface PostServiceOrderQueryAfterSalesInfoSnapshotOption {
22082 22154 /**
... ...