Commit 66788e52d19eeebbd9a44abf0e8fe6277872d59a
1 parent
7b854ea1
feat: update 附件下载打开新的tab页
Showing
3 changed files
with
60 additions
and
62 deletions
src/pages/Order/components/AttachmentModal.tsx
src/services/definition.ts
... | ... | @@ -561,6 +561,11 @@ export interface ApiCreateOrderRequest { |
561 | 561 | notes?: string; |
562 | 562 | /** |
563 | 563 | * @description |
564 | + * 订单编号 | |
565 | + */ | |
566 | + orderNo?: string; | |
567 | + /** | |
568 | + * @description | |
564 | 569 | * 支付渠道 |
565 | 570 | */ |
566 | 571 | paymentChannel?: string; |
... | ... | @@ -688,6 +693,11 @@ export interface ApiQueryOrderDetailRequest { |
688 | 693 | orderStatus?: number; |
689 | 694 | /** |
690 | 695 | * @description |
696 | + * 原始订单编号:orderId存在的话,此参数无效 | |
697 | + */ | |
698 | + originalOrderNo?: string; | |
699 | + /** | |
700 | + * @description | |
691 | 701 | * 账号id |
692 | 702 | * @format int32 |
693 | 703 | */ |
... | ... | @@ -1357,6 +1367,32 @@ export interface Entry { |
1357 | 1367 | unEmpInsuranceC?: string; |
1358 | 1368 | } |
1359 | 1369 | |
1370 | +export interface File { | |
1371 | + absolute?: boolean; | |
1372 | + absoluteFile?: File; | |
1373 | + absolutePath?: string; | |
1374 | + canonicalFile?: File; | |
1375 | + canonicalPath?: string; | |
1376 | + directory?: boolean; | |
1377 | + executable?: boolean; | |
1378 | + file?: boolean; | |
1379 | + /** @format int64 */ | |
1380 | + freeSpace?: number; | |
1381 | + hidden?: boolean; | |
1382 | + /** @format int64 */ | |
1383 | + lastModified?: number; | |
1384 | + name?: string; | |
1385 | + parent?: string; | |
1386 | + parentFile?: File; | |
1387 | + path?: string; | |
1388 | + readable?: boolean; | |
1389 | + /** @format int64 */ | |
1390 | + totalSpace?: number; | |
1391 | + /** @format int64 */ | |
1392 | + usableSpace?: number; | |
1393 | + writable?: boolean; | |
1394 | +} | |
1395 | + | |
1360 | 1396 | export interface FilePathDto { |
1361 | 1397 | url?: string; |
1362 | 1398 | } |
... | ... | @@ -3427,7 +3463,7 @@ export interface ResetPwdVO { |
3427 | 3463 | |
3428 | 3464 | export interface Resource { |
3429 | 3465 | description?: string; |
3430 | - file?: TsgFile; | |
3466 | + file?: File; | |
3431 | 3467 | filename?: string; |
3432 | 3468 | inputStream?: InputStream; |
3433 | 3469 | open?: boolean; |
... | ... | @@ -3945,32 +3981,6 @@ export interface CompanyInfo { |
3945 | 3981 | taxIdIsNotNull?: boolean; |
3946 | 3982 | } |
3947 | 3983 | |
3948 | -export interface TsgFile { | |
3949 | - absolute?: boolean; | |
3950 | - absoluteFile?: TsgFile; | |
3951 | - absolutePath?: string; | |
3952 | - canonicalFile?: TsgFile; | |
3953 | - canonicalPath?: string; | |
3954 | - directory?: boolean; | |
3955 | - executable?: boolean; | |
3956 | - file?: boolean; | |
3957 | - /** @format int64 */ | |
3958 | - freeSpace?: number; | |
3959 | - hidden?: boolean; | |
3960 | - /** @format int64 */ | |
3961 | - lastModified?: number; | |
3962 | - name?: string; | |
3963 | - parent?: string; | |
3964 | - parentFile?: TsgFile; | |
3965 | - path?: string; | |
3966 | - readable?: boolean; | |
3967 | - /** @format int64 */ | |
3968 | - totalSpace?: number; | |
3969 | - /** @format int64 */ | |
3970 | - usableSpace?: number; | |
3971 | - writable?: boolean; | |
3972 | -} | |
3973 | - | |
3974 | 3984 | export interface InvoiceDetail { |
3975 | 3985 | /** @format int64 */ |
3976 | 3986 | id?: number; | ... | ... |
src/services/request.ts
... | ... | @@ -63,6 +63,7 @@ import type { |
63 | 63 | MaterialUnitListRes, |
64 | 64 | MeasureUnitListRes, |
65 | 65 | MessageQueryDTO, |
66 | + ModelAndView, | |
66 | 67 | OrderAddVO, |
67 | 68 | OrderAuditLogQueryVO, |
68 | 69 | OrderBaseInfoQueryVO, |
... | ... | @@ -3227,9 +3228,7 @@ export interface GetErrorResponse { |
3227 | 3228 | * @description |
3228 | 3229 | * OK |
3229 | 3230 | */ |
3230 | - 200: { | |
3231 | - [propertyName: string]: any; | |
3232 | - }; | |
3231 | + 200: ModelAndView; | |
3233 | 3232 | /** |
3234 | 3233 | * @description |
3235 | 3234 | * Unauthorized |
... | ... | @@ -3250,9 +3249,9 @@ export interface GetErrorResponse { |
3250 | 3249 | export type GetErrorResponseSuccess = GetErrorResponse[200]; |
3251 | 3250 | /** |
3252 | 3251 | * @description |
3253 | - * error | |
3252 | + * errorHtml | |
3254 | 3253 | * @tags basic-error-controller |
3255 | - * @produces * | |
3254 | + * @produces text/html | |
3256 | 3255 | */ |
3257 | 3256 | export const getError = /* #__PURE__ */ (() => { |
3258 | 3257 | const method = 'get'; |
... | ... | @@ -3276,9 +3275,7 @@ export interface PutErrorResponse { |
3276 | 3275 | * @description |
3277 | 3276 | * OK |
3278 | 3277 | */ |
3279 | - 200: { | |
3280 | - [propertyName: string]: any; | |
3281 | - }; | |
3278 | + 200: ModelAndView; | |
3282 | 3279 | /** |
3283 | 3280 | * @description |
3284 | 3281 | * Created |
... | ... | @@ -3304,9 +3301,9 @@ export interface PutErrorResponse { |
3304 | 3301 | export type PutErrorResponseSuccess = PutErrorResponse[200]; |
3305 | 3302 | /** |
3306 | 3303 | * @description |
3307 | - * error | |
3304 | + * errorHtml | |
3308 | 3305 | * @tags basic-error-controller |
3309 | - * @produces * | |
3306 | + * @produces text/html | |
3310 | 3307 | * @consumes application/json |
3311 | 3308 | */ |
3312 | 3309 | export const putError = /* #__PURE__ */ (() => { |
... | ... | @@ -3331,9 +3328,7 @@ export interface PostErrorResponse { |
3331 | 3328 | * @description |
3332 | 3329 | * OK |
3333 | 3330 | */ |
3334 | - 200: { | |
3335 | - [propertyName: string]: any; | |
3336 | - }; | |
3331 | + 200: ModelAndView; | |
3337 | 3332 | /** |
3338 | 3333 | * @description |
3339 | 3334 | * Created |
... | ... | @@ -3359,9 +3354,9 @@ export interface PostErrorResponse { |
3359 | 3354 | export type PostErrorResponseSuccess = PostErrorResponse[200]; |
3360 | 3355 | /** |
3361 | 3356 | * @description |
3362 | - * error | |
3357 | + * errorHtml | |
3363 | 3358 | * @tags basic-error-controller |
3364 | - * @produces * | |
3359 | + * @produces text/html | |
3365 | 3360 | * @consumes application/json |
3366 | 3361 | */ |
3367 | 3362 | export const postError = /* #__PURE__ */ (() => { |
... | ... | @@ -3386,9 +3381,7 @@ export interface DeleteErrorResponse { |
3386 | 3381 | * @description |
3387 | 3382 | * OK |
3388 | 3383 | */ |
3389 | - 200: { | |
3390 | - [propertyName: string]: any; | |
3391 | - }; | |
3384 | + 200: ModelAndView; | |
3392 | 3385 | /** |
3393 | 3386 | * @description |
3394 | 3387 | * No Content |
... | ... | @@ -3409,9 +3402,9 @@ export interface DeleteErrorResponse { |
3409 | 3402 | export type DeleteErrorResponseSuccess = DeleteErrorResponse[200]; |
3410 | 3403 | /** |
3411 | 3404 | * @description |
3412 | - * error | |
3405 | + * errorHtml | |
3413 | 3406 | * @tags basic-error-controller |
3414 | - * @produces * | |
3407 | + * @produces text/html | |
3415 | 3408 | */ |
3416 | 3409 | export const deleteError = /* #__PURE__ */ (() => { |
3417 | 3410 | const method = 'delete'; |
... | ... | @@ -3435,9 +3428,7 @@ export interface OptionsErrorResponse { |
3435 | 3428 | * @description |
3436 | 3429 | * OK |
3437 | 3430 | */ |
3438 | - 200: { | |
3439 | - [propertyName: string]: any; | |
3440 | - }; | |
3431 | + 200: ModelAndView; | |
3441 | 3432 | /** |
3442 | 3433 | * @description |
3443 | 3434 | * No Content |
... | ... | @@ -3458,9 +3449,9 @@ export interface OptionsErrorResponse { |
3458 | 3449 | export type OptionsErrorResponseSuccess = OptionsErrorResponse[200]; |
3459 | 3450 | /** |
3460 | 3451 | * @description |
3461 | - * error | |
3452 | + * errorHtml | |
3462 | 3453 | * @tags basic-error-controller |
3463 | - * @produces * | |
3454 | + * @produces text/html | |
3464 | 3455 | * @consumes application/json |
3465 | 3456 | */ |
3466 | 3457 | export const optionsError = /* #__PURE__ */ (() => { |
... | ... | @@ -3485,9 +3476,7 @@ export interface HeadErrorResponse { |
3485 | 3476 | * @description |
3486 | 3477 | * OK |
3487 | 3478 | */ |
3488 | - 200: { | |
3489 | - [propertyName: string]: any; | |
3490 | - }; | |
3479 | + 200: ModelAndView; | |
3491 | 3480 | /** |
3492 | 3481 | * @description |
3493 | 3482 | * No Content |
... | ... | @@ -3508,9 +3497,9 @@ export interface HeadErrorResponse { |
3508 | 3497 | export type HeadErrorResponseSuccess = HeadErrorResponse[200]; |
3509 | 3498 | /** |
3510 | 3499 | * @description |
3511 | - * error | |
3500 | + * errorHtml | |
3512 | 3501 | * @tags basic-error-controller |
3513 | - * @produces * | |
3502 | + * @produces text/html | |
3514 | 3503 | * @consumes application/json |
3515 | 3504 | */ |
3516 | 3505 | export const headError = /* #__PURE__ */ (() => { |
... | ... | @@ -3535,9 +3524,7 @@ export interface PatchErrorResponse { |
3535 | 3524 | * @description |
3536 | 3525 | * OK |
3537 | 3526 | */ |
3538 | - 200: { | |
3539 | - [propertyName: string]: any; | |
3540 | - }; | |
3527 | + 200: ModelAndView; | |
3541 | 3528 | /** |
3542 | 3529 | * @description |
3543 | 3530 | * No Content |
... | ... | @@ -3558,9 +3545,9 @@ export interface PatchErrorResponse { |
3558 | 3545 | export type PatchErrorResponseSuccess = PatchErrorResponse[200]; |
3559 | 3546 | /** |
3560 | 3547 | * @description |
3561 | - * error | |
3548 | + * errorHtml | |
3562 | 3549 | * @tags basic-error-controller |
3563 | - * @produces * | |
3550 | + * @produces text/html | |
3564 | 3551 | * @consumes application/json |
3565 | 3552 | */ |
3566 | 3553 | export const patchError = /* #__PURE__ */ (() => { | ... | ... |