Commit 5d7e77f4fe2fd05abd52d15fdb54b844b989f384

Authored by 曾国涛
1 parent 6357ebc5

feat: 新增开票功能开发

package-lock.json
... ... @@ -12,7 +12,6 @@
12 12 "@ant-design/pro-components": "^2.6.32",
13 13 "@inspir/assembly-css": "1.0.0-alpha",
14 14 "@react-buddy/ide-toolbox": "^2.4.0",
15   - "@react-buddy/palette-antd": "^5.3.0",
16 15 "@umijs/max": "^4.0.87",
17 16 "antd": "^5.10.2",
18 17 "axios": "^1.6.1",
... ... @@ -3988,19 +3987,6 @@
3988 3987 "react": "^17.0.0 || ^18.0.0"
3989 3988 }
3990 3989 },
3991   - "node_modules/@react-buddy/palette-antd": {
3992   - "version": "5.3.1",
3993   - "resolved": "https://registry.npmjs.org/@react-buddy/palette-antd/-/palette-antd-5.3.1.tgz",
3994   - "integrity": "sha512-G75Pik29FnmyvANiGLSpMFpru4Uzv5woq/IFrkmfYmJb+5vW3lhc+Y/PftLqatSH9fjXs/UOszuSbPzlykT9cw==",
3995   - "dependencies": {
3996   - "@react-buddy/ide-toolbox": "^2.4.0"
3997   - },
3998   - "peerDependencies": {
3999   - "@ant-design/icons": "^5.1.4",
4000   - "antd": "^5.3.0",
4001   - "react": "^17.0.0 || ^18.0.0"
4002   - }
4003   - },
4004 3990 "node_modules/@sinclair/typebox": {
4005 3991 "version": "0.27.8",
4006 3992 "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
... ... @@ -28469,14 +28455,6 @@
28469 28455 "integrity": "sha512-TWHX6gwa0Gop7215uHhjFMbYLLdjM/b9rr0wYE3E0m7GNJ56gbPpbZiq86w9uI8zksl827acqGeT437MkuO64w==",
28470 28456 "requires": {}
28471 28457 },
28472   - "@react-buddy/palette-antd": {
28473   - "version": "5.3.1",
28474   - "resolved": "https://registry.npmjs.org/@react-buddy/palette-antd/-/palette-antd-5.3.1.tgz",
28475   - "integrity": "sha512-G75Pik29FnmyvANiGLSpMFpru4Uzv5woq/IFrkmfYmJb+5vW3lhc+Y/PftLqatSH9fjXs/UOszuSbPzlykT9cw==",
28476   - "requires": {
28477   - "@react-buddy/ide-toolbox": "^2.4.0"
28478   - }
28479   - },
28480 28458 "@sinclair/typebox": {
28481 28459 "version": "0.27.8",
28482 28460 "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
... ...
src/pages/Invoice/components/AddInvoiceDrawerForm.tsx
... ... @@ -99,8 +99,8 @@ export default ({ onClose }) => {
99 99 name="invoiceStatus"
100 100 label="发票类型"
101 101 valueEnum={{
102   - china: 'China',
103   - usa: 'U.S.A',
  102 + SPECIALLY_INVOICED: '专票',
  103 + COMMON_INVOICED: '普票',
104 104 }}
105 105 rules={[{ required: true, message: '请选择发票类型!' }]}
106 106 />
... ...
src/services/definition.ts
... ... @@ -948,22 +948,6 @@ export interface InvoiceRecordQueryRequest {
948 948 uid?: string;
949 949 }
950 950  
951   -export interface InvoiceRecordQueryRequest {
952   - /** @format date */
953   - createTimeGe?: string;
954   - /** @format date */
955   - createTimeLe?: string;
956   - /** @format int32 */
957   - pageNumber?: number;
958   - /** @format int32 */
959   - pageSize?: number;
960   - /**
961   - * @description
962   - * 用户id
963   - */
964   - uid?: string;
965   -}
966   -
967 951 export interface Item {
968 952 billDate?: string;
969 953 billNo?: string;
... ...
src/services/request.ts
... ... @@ -50,7 +50,6 @@ import type {
50 50 MaterialUnitListRes,
51 51 MeasureUnitListRes,
52 52 MessageQueryDTO,
53   - ModelAndView,
54 53 OrderAddVO,
55 54 OrderAuditLogQueryVO,
56 55 OrderBaseInfoQueryVO,
... ... @@ -1124,7 +1123,9 @@ export interface GetErrorResponse {
1124 1123 * @description
1125 1124 * OK
1126 1125 */
1127   - 200: ModelAndView;
  1126 + 200: {
  1127 + [propertyName: string]: any;
  1128 + };
1128 1129 /**
1129 1130 * @description
1130 1131 * Unauthorized
... ... @@ -1145,9 +1146,9 @@ export interface GetErrorResponse {
1145 1146 export type GetErrorResponseSuccess = GetErrorResponse[200];
1146 1147 /**
1147 1148 * @description
1148   - * errorHtml
  1149 + * error
1149 1150 * @tags basic-error-controller
1150   - * @produces text/html
  1151 + * @produces *
1151 1152 */
1152 1153 export const getError = /* #__PURE__ */ (() => {
1153 1154 const method = 'get';
... ... @@ -1171,7 +1172,9 @@ export interface PutErrorResponse {
1171 1172 * @description
1172 1173 * OK
1173 1174 */
1174   - 200: ModelAndView;
  1175 + 200: {
  1176 + [propertyName: string]: any;
  1177 + };
1175 1178 /**
1176 1179 * @description
1177 1180 * Created
... ... @@ -1197,9 +1200,9 @@ export interface PutErrorResponse {
1197 1200 export type PutErrorResponseSuccess = PutErrorResponse[200];
1198 1201 /**
1199 1202 * @description
1200   - * errorHtml
  1203 + * error
1201 1204 * @tags basic-error-controller
1202   - * @produces text/html
  1205 + * @produces *
1203 1206 * @consumes application/json
1204 1207 */
1205 1208 export const putError = /* #__PURE__ */ (() => {
... ... @@ -1224,7 +1227,9 @@ export interface PostErrorResponse {
1224 1227 * @description
1225 1228 * OK
1226 1229 */
1227   - 200: ModelAndView;
  1230 + 200: {
  1231 + [propertyName: string]: any;
  1232 + };
1228 1233 /**
1229 1234 * @description
1230 1235 * Created
... ... @@ -1250,9 +1255,9 @@ export interface PostErrorResponse {
1250 1255 export type PostErrorResponseSuccess = PostErrorResponse[200];
1251 1256 /**
1252 1257 * @description
1253   - * errorHtml
  1258 + * error
1254 1259 * @tags basic-error-controller
1255   - * @produces text/html
  1260 + * @produces *
1256 1261 * @consumes application/json
1257 1262 */
1258 1263 export const postError = /* #__PURE__ */ (() => {
... ... @@ -1277,7 +1282,9 @@ export interface DeleteErrorResponse {
1277 1282 * @description
1278 1283 * OK
1279 1284 */
1280   - 200: ModelAndView;
  1285 + 200: {
  1286 + [propertyName: string]: any;
  1287 + };
1281 1288 /**
1282 1289 * @description
1283 1290 * No Content
... ... @@ -1298,9 +1305,9 @@ export interface DeleteErrorResponse {
1298 1305 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
1299 1306 /**
1300 1307 * @description
1301   - * errorHtml
  1308 + * error
1302 1309 * @tags basic-error-controller
1303   - * @produces text/html
  1310 + * @produces *
1304 1311 */
1305 1312 export const deleteError = /* #__PURE__ */ (() => {
1306 1313 const method = 'delete';
... ... @@ -1324,7 +1331,9 @@ export interface OptionsErrorResponse {
1324 1331 * @description
1325 1332 * OK
1326 1333 */
1327   - 200: ModelAndView;
  1334 + 200: {
  1335 + [propertyName: string]: any;
  1336 + };
1328 1337 /**
1329 1338 * @description
1330 1339 * No Content
... ... @@ -1345,9 +1354,9 @@ export interface OptionsErrorResponse {
1345 1354 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
1346 1355 /**
1347 1356 * @description
1348   - * errorHtml
  1357 + * error
1349 1358 * @tags basic-error-controller
1350   - * @produces text/html
  1359 + * @produces *
1351 1360 * @consumes application/json
1352 1361 */
1353 1362 export const optionsError = /* #__PURE__ */ (() => {
... ... @@ -1372,7 +1381,9 @@ export interface HeadErrorResponse {
1372 1381 * @description
1373 1382 * OK
1374 1383 */
1375   - 200: ModelAndView;
  1384 + 200: {
  1385 + [propertyName: string]: any;
  1386 + };
1376 1387 /**
1377 1388 * @description
1378 1389 * No Content
... ... @@ -1393,9 +1404,9 @@ export interface HeadErrorResponse {
1393 1404 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
1394 1405 /**
1395 1406 * @description
1396   - * errorHtml
  1407 + * error
1397 1408 * @tags basic-error-controller
1398   - * @produces text/html
  1409 + * @produces *
1399 1410 * @consumes application/json
1400 1411 */
1401 1412 export const headError = /* #__PURE__ */ (() => {
... ... @@ -1420,7 +1431,9 @@ export interface PatchErrorResponse {
1420 1431 * @description
1421 1432 * OK
1422 1433 */
1423   - 200: ModelAndView;
  1434 + 200: {
  1435 + [propertyName: string]: any;
  1436 + };
1424 1437 /**
1425 1438 * @description
1426 1439 * No Content
... ... @@ -1441,9 +1454,9 @@ export interface PatchErrorResponse {
1441 1454 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
1442 1455 /**
1443 1456 * @description
1444   - * errorHtml
  1457 + * error
1445 1458 * @tags basic-error-controller
1446   - * @produces text/html
  1459 + * @produces *
1447 1460 * @consumes application/json
1448 1461 */
1449 1462 export const patchError = /* #__PURE__ */ (() => {
... ...