Commit a7ea7b35ba1364a37d2195ab89832e8d5251e53e

Authored by zhongnanhuang
1 parent d2df4bf4

feat: update 备注编辑优化,供应商备注新增,筛选按钮修改为单选按钮

src/pages/Order/components/OrderNotesEditModal.tsx
1 1 import { RESPONSE_CODE } from '@/constants/enum';
2   -import { postServiceOrderDetails } from '@/services';
  2 +import { postServiceOrderNotesEdit } from '@/services';
3 3 import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
4 4 import { Form, message } from 'antd';
5   -export default ({ setNotesEditVisible, data, isMianOrder, onClose }) => {
  5 +export default ({ setNotesEditVisible, notes, ids, notesType, onClose }) => {
6 6 const [form] = Form.useForm<{ name: string; company: string }>();
7 7 return (
8 8 <ModalForm<{
... ... @@ -25,11 +25,11 @@ export default ({ setNotesEditVisible, data, isMianOrder, onClose }) =&gt; {
25 25 submitTimeout={2000}
26 26 onFinish={async (values) => {
27 27 let body = {
28   - id: data.id,
  28 + id: ids[0],
29 29 notes: values.name,
30   - checkSubOrderOrMainOrder: isMianOrder,
  30 + notesType: notesType,
31 31 };
32   - const res = await postServiceOrderDetails({ data: body });
  32 + const res = await postServiceOrderNotesEdit({ data: body });
33 33 if (res.result === RESPONSE_CODE.SUCCESS) {
34 34 message.success(res.message);
35 35 onClose();
... ... @@ -40,7 +40,7 @@ export default ({ setNotesEditVisible, data, isMianOrder, onClose }) =&gt; {
40 40 <ProFormTextArea
41 41 width="lg"
42 42 name="name"
43   - initialValue={data.notes}
  43 + initialValue={notes}
44 44 placeholder="填写备注内容"
45 45 />
46 46 </ModalForm>
... ...
src/pages/Order/components/ProcureNotesEditModal.tsx
1 1 import { RESPONSE_CODE } from '@/constants/enum';
2   -import { postServiceOrderProcureNotesEdit } from '@/services';
  2 +import { postServiceOrderNotesEdit } from '@/services';
3 3 import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
4 4 import { Form, message } from 'antd';
5   -export default ({ setNotesEditVisible, data, onClose }) => {
  5 +export default ({ setNotesEditVisible, notesType, data, onClose }) => {
6 6 const [form] = Form.useForm<{ procureNotes: string }>();
7 7 return (
8 8 <ModalForm<{
... ... @@ -24,10 +24,11 @@ export default ({ setNotesEditVisible, data, onClose }) =&gt; {
24 24 submitTimeout={2000}
25 25 onFinish={async (values) => {
26 26 let body = {
27   - subOrderId: data.id,
28   - procureNotes: values.procureNotes,
  27 + id: data.id,
  28 + notes: values.procureNotes,
  29 + notesType: notesType,
29 30 };
30   - const res = await postServiceOrderProcureNotesEdit({ data: body });
  31 + const res = await postServiceOrderNotesEdit({ data: body });
31 32 if (res.result === RESPONSE_CODE.SUCCESS) {
32 33 message.success(res.message);
33 34 onClose();
... ...
src/pages/Order/index.tsx
... ... @@ -47,6 +47,7 @@ import {
47 47 Flex,
48 48 Image,
49 49 MenuProps,
  50 + Radio,
50 51 Space,
51 52 Tag,
52 53 Tooltip,
... ... @@ -72,7 +73,6 @@ import OrderDrawer from &#39;./components/OrderDrawer&#39;;
72 73 import OrderNotesEditModal from './components/OrderNotesEditModal';
73 74 import ProcureCheckModal from './components/ProcureCheckModal';
74 75 import ProcureConvertModal from './components/ProcureConvertModal';
75   -import ProcureNotesEditModal from './components/ProcureNotesEditModal';
76 76 import SubOrderComfirmReceiptImagesModal from './components/SubOrderComfirmReceiptImagesModal';
77 77 import {
78 78 AFTER_INVOICING_STATUS,
... ... @@ -104,8 +104,6 @@ const OrderPage = () =&gt; {
104 104 ] = useState<boolean>(false);
105 105 const [data, setData] = useState([]); //列表数据
106 106 const [notesEditVisible, setNotesEditVisible] = useState<boolean>(false);
107   - const [procureNotesEditModalVisible, setProcureNotesEditModalVisible] =
108   - useState<boolean>(false);
109 107 const [financialMergeDrawerVisible, setFinancialMergeDrawerVisible] =
110 108 useState<boolean>(false);
111 109 const [attachmentModalVisible, setAttachmentModalVisible] =
... ... @@ -138,6 +136,8 @@ const OrderPage = () =&gt; {
138 136 const [isEdit, setIsEdit] = useState<boolean>(false);
139 137 const [expandedRowKeys, setExpandedRowKeys] = useState<Key[]>([]);
140 138 const [orderRow, setOrderRow] = useState<Partial<OrderType>>({});
  139 + const [notesType, setNotesType] = useState(1);
  140 + const [notes, setNotes] = useState(1);
141 141 const [mainOrderAllItemKeys, setMainOrderAllItemKeys] = useState([]);
142 142 const [rolePath, setRolePath] = useState([]); //当前角色权限(新增跟打印按钮)
143 143 const userInfo = getUserInfo();
... ... @@ -149,20 +149,9 @@ const OrderPage = () =&gt; {
149 149 const [pageSize, setPageSize] = useState(10);
150 150 const [currentPage, setCurrentPage] = useState(1);
151 151 const [orderCheckType, setOrderCheckType] = useState('');
152   - const [onlyShowCancelOrder, setOnlyShowCancelOrder] = useState(false);
153   - const [onlyShowProcureToBeProcessed, setOnlyShowProcureToBeProcessed] =
154   - useState(false);
155   - const [
156   - showCurrentLeaderNeedAuditOrders,
157   - setShowCurrentLeaderNeedAuditOrders,
158   - ] = useState(false);
  152 + const [filterCondifion, setFilterCondition] = useState(0);
159 153 const [mainOrderSelectedMap] = useState(new Map()); //选中的主订单Map
160 154 const [mainOrderSelectedRows, setMainOrderSelectedRows] = useState([]); //选中的主订单集合
161   - const [onlyShowFinancialToBeProcessed, setOnlyShowFinancialToBeProcessed] =
162   - useState(false);
163   - const [onlyShowIsUrgentOrders, setOnlyShowIsUrgentOrders] = useState(false);
164   - const [onlyShowSalesCreateProcessed, setOnlyShowSalesCreateProcessed] =
165   - useState(false);
166 155 const mainTableRef = useRef<ActionType>();
167 156 const mainTableFormRef = useRef<ProFormInstance>();
168 157 let [searchParams, setSearchParam] = useState(Object); //表格的查询条件存储
... ... @@ -201,35 +190,40 @@ const OrderPage = () =&gt; {
201 190 setSelectedRowKeys([]);
202 191 };
203 192  
204   - function changeCancelOrderShow(e: any) {
205   - setOnlyShowCancelOrder(e.target.checked);
206   - refreshTable();
207   - }
208   -
209   - function changeProcureToBeProcessed(e: any) {
210   - setOnlyShowProcureToBeProcessed(e.target.checked);
211   - refreshTable();
212   - }
213   -
214   - function changeShowCurrentLeaderNeedAuditOrders(e: any) {
215   - setShowCurrentLeaderNeedAuditOrders(e.target.checked);
216   - refreshTable();
217   - }
218   -
219   - function changeFinancialToBeProcessed(e: any) {
220   - setOnlyShowFinancialToBeProcessed(e.target.checked);
221   - refreshTable();
222   - }
223   -
224   - function changeOnlyShowIsUrgentOrders(e: any) {
225   - setOnlyShowIsUrgentOrders(e.target.checked);
226   - refreshTable();
227   - }
228   -
229   - function changeSalesCreateProcessed(e: any) {
230   - setOnlyShowSalesCreateProcessed(e.target.checked);
231   - refreshTable();
232   - }
  193 + // function changeCancelOrderShow(e: any) {
  194 + // setOnlyShowCancelOrder(e.target.checked);
  195 + // refreshTable();
  196 + // }
  197 +
  198 + // function changeProcureToBeProcessed(e: any) {
  199 + // setOnlyShowProcureToBeProcessed(e.target.checked);
  200 + // refreshTable();
  201 + // }
  202 +
  203 + // function changeOnlyShowOtherProcure(e: any) {
  204 + // setOnlyShowOtherProcure(e.target.checked);
  205 + // refreshTable();
  206 + // }
  207 +
  208 + // function changeShowCurrentLeaderNeedAuditOrders(e: any) {
  209 + // setShowCurrentLeaderNeedAuditOrders(e.target.checked);
  210 + // refreshTable();
  211 + // }
  212 +
  213 + // function changeFinancialToBeProcessed(e: any) {
  214 + // setOnlyShowFinancialToBeProcessed(e.target.checked);
  215 + // refreshTable();
  216 + // }
  217 +
  218 + // function changeOnlyShowIsUrgentOrders(e: any) {
  219 + // setOnlyShowIsUrgentOrders(e.target.checked);
  220 + // refreshTable();
  221 + // }
  222 +
  223 + // function changeSalesCreateProcessed(e: any) {
  224 + // setOnlyShowSalesCreateProcessed(e.target.checked);
  225 + // refreshTable();
  226 + // }
233 227  
234 228 /**
235 229 * 复制订单到剪贴板
... ... @@ -579,8 +573,9 @@ const OrderPage = () =&gt; {
579 573 className="pl-1 hover:curcor-pointer"
580 574 onClick={() => {
581 575 setNotesEditVisible(true);
582   - setOrderRow(optRecord);
583   - setIsMainOrder(false);
  576 + setSelectedRows([optRecord.id]);
  577 + setNotes(optRecord.notes);
  578 + setNotesType(1);
584 579 }}
585 580 />
586 581 </Flex>
... ... @@ -600,8 +595,35 @@ const OrderPage = () =&gt; {
600 595 <EditTwoTone
601 596 className="pl-1 hover:curcor-pointer"
602 597 onClick={() => {
603   - setOrderRow(optRecord);
604   - setProcureNotesEditModalVisible(true);
  598 + setSelectedRows([optRecord.id]);
  599 + setNotes(optRecord.procureNotes);
  600 + setNotesEditVisible(true);
  601 + setNotesType(2);
  602 + }}
  603 + />
  604 + </Flex>
  605 + ) : (
  606 + ''
  607 + )}
  608 +
  609 + {roleCode === 'procure' || roleCode === 'admin' ? (
  610 + <Flex title={optRecord.supplierNotes}>
  611 + <div className="max-w-[90%] whitespace-no-wrap overflow-hidden overflow-ellipsis">
  612 + <span className="text-[#8C8C8C]">
  613 + 供应商备注:
  614 + {optRecord.supplierNotes === null
  615 + ? '暂无备注'
  616 + : optRecord.supplierNotes}
  617 + </span>
  618 + </div>
  619 + {/* 编辑备注按钮 */}
  620 + <EditTwoTone
  621 + className="pl-1 hover:curcor-pointer"
  622 + onClick={() => {
  623 + setSelectedRows([optRecord.id]);
  624 + setNotes(optRecord.supplierNotes);
  625 + setNotesEditVisible(true);
  626 + setNotesType(3);
605 627 }}
606 628 />
607 629 </Flex>
... ... @@ -1288,10 +1310,10 @@ const OrderPage = () =&gt; {
1288 1310 <EditTwoTone
1289 1311 className="pl-1 hover:curcor-pointer"
1290 1312 onClick={() => {
1291   - setApplyForInvoicingVisible(true);
1292   - setSelectedRows([optRecord]);
1293   - setIsEdit(true);
1294   - setIsMainOrder(false);
  1313 + setNotesEditVisible(true);
  1314 + setSelectedRows([optRecord.id]);
  1315 + setNotes(optRecord.applyInvoicingNotes);
  1316 + setNotesType(4);
1295 1317 }}
1296 1318 />
1297 1319 </Tooltip>
... ... @@ -1475,8 +1497,9 @@ const OrderPage = () =&gt; {
1475 1497 className="pl-1 hover:curcor-pointer"
1476 1498 onClick={() => {
1477 1499 setNotesEditVisible(true);
1478   - setOrderRow(record);
1479   - setIsMainOrder(true);
  1500 + setSelectedRows([record.id]);
  1501 + setNotes(record.notes);
  1502 + setNotesType(0);
1480 1503 }}
1481 1504 />
1482 1505 </Tooltip>
... ... @@ -2422,6 +2445,19 @@ const OrderPage = () =&gt; {
2422 2445 },
2423 2446 );
2424 2447  
  2448 + /**
  2449 + * 采购可以筛选供应商备注
  2450 + */
  2451 + if (roleCode === 'procure' || roleCode === 'admin') {
  2452 + mainOrdersColumns.push({
  2453 + title: '供应商备注',
  2454 + width: 120,
  2455 + dataIndex: 'supplierNotes',
  2456 + valueType: 'text',
  2457 + hideInTable: true,
  2458 + });
  2459 + }
  2460 +
2425 2461 //判断是否是采购,是的话新增一个筛选条件
2426 2462 if (roleCode === 'procure' || roleCode === 'admin') {
2427 2463 mainOrdersColumns.push({
... ... @@ -2435,72 +2471,63 @@ const OrderPage = () =&gt; {
2435 2471  
2436 2472 function toolBarRender() {
2437 2473 let toolBtns = [];
  2474 + let radios: any[] = [];
  2475 +
  2476 + radios.push(<Radio value={0}>全部</Radio>);
2438 2477  
2439 2478 if (
2440   - roleCode === 'admin' &&
2441   - roleCode === 'salesManager' &&
  2479 + roleCode === 'admin' ||
  2480 + roleCode === 'salesManager' ||
2442 2481 roleCode === 'salesRepresentative'
2443 2482 ) {
2444   - toolBtns.push(
2445   - <Checkbox onChange={changeCancelOrderShow}>只看作废</Checkbox>,
2446   - );
  2483 + radios.push(<Radio value={70}>只看作废</Radio>);
2447 2484 }
2448 2485  
2449 2486 if (roleCode === 'warehouseKeeper') {
2450   - toolBtns.push(
2451   - <Checkbox onChange={changeShowCurrentLeaderNeedAuditOrders}>
2452   - 待审核
2453   - </Checkbox>,
2454   - );
  2487 + radios.push(<Radio value={40}>待处理</Radio>);
2455 2488 }
2456 2489  
2457 2490 //采购可以筛选出需要处理的订单
2458 2491 if (roleCode === 'procure') {
2459   - toolBtns.push(
2460   - <Checkbox onChange={changeProcureToBeProcessed}>只看需处理</Checkbox>,
2461   - );
  2492 + radios.push(<Radio value={60}>其他采购</Radio>);
  2493 + radios.push(<Radio value={10}>待处理</Radio>);
2462 2494 }
2463 2495  
2464 2496 //财务可以将需要处理的订单排序到前面
2465 2497 if (roleCode === 'finance') {
2466   - toolBtns.push(
2467   - <Checkbox onChange={changeFinancialToBeProcessed}>排序</Checkbox>,
2468   - );
  2498 + radios.push(<Radio value={20}>排序</Radio>);
2469 2499  
2470   - toolBtns.push(
2471   - <Checkbox onChange={changeOnlyShowIsUrgentOrders}>加急</Checkbox>,
2472   - );
  2500 + radios.push(<Radio value={50}>加急</Radio>);
2473 2501  
2474   - toolBtns.push(
2475   - <Checkbox onChange={changeShowCurrentLeaderNeedAuditOrders}>
2476   - 待审核
2477   - </Checkbox>,
2478   - );
  2502 + radios.push(<Radio value={40}>待处理</Radio>);
2479 2503 }
2480 2504  
2481 2505 if (roleCode === 'salesRepresentative' || roleCode === 'salesManager') {
2482   - toolBtns.push(
2483   - <Checkbox onChange={changeSalesCreateProcessed}>只看我创建</Checkbox>,
2484   - );
  2506 + radios.push(<Radio value={30}>只看我创建</Radio>);
2485 2507  
2486   - toolBtns.push(
2487   - <Checkbox onChange={changeShowCurrentLeaderNeedAuditOrders}>
2488   - 待审核
2489   - </Checkbox>,
2490   - );
  2508 + radios.push(<Radio value={40}>待审核</Radio>);
2491 2509 }
2492 2510  
2493 2511 if (roleCode === 'admin') {
2494   - toolBtns.push(
2495   - <Checkbox onChange={changeProcureToBeProcessed}>
2496   - 只看需处理(采购)
2497   - </Checkbox>,
2498   - );
2499   - toolBtns.push(
2500   - <Checkbox onChange={changeFinancialToBeProcessed}>排序</Checkbox>,
2501   - );
  2512 + radios.push(<Radio value={10}>待处理</Radio>);
  2513 + radios.push(<Radio value={20}>排序</Radio>);
2502 2514 }
2503 2515  
  2516 + //筛选按钮配置
  2517 + let radioGroup = (
  2518 + <Radio.Group
  2519 + onChange={(e: any) => {
  2520 + setFilterCondition(e.target.value);
  2521 + refreshTable();
  2522 + }}
  2523 + defaultValue={0}
  2524 + >
  2525 + {radios}
  2526 + </Radio.Group>
  2527 + );
  2528 +
  2529 + toolBtns.push(radioGroup);
  2530 +
2504 2531 //导出按钮配置
2505 2532 const items: MenuProps['items'] = [
2506 2533 {
... ... @@ -2704,6 +2731,7 @@ const OrderPage = () =&gt; {
2704 2731 // </Button>,
2705 2732 // );
2706 2733  
  2734 + console.log(toolBtns);
2707 2735 return toolBtns;
2708 2736 }
2709 2737  
... ... @@ -2805,32 +2833,11 @@ const OrderPage = () =&gt; {
2805 2833 });
2806 2834 }
2807 2835 }
2808   - //采购是否只查看需要自己处理的
2809   - if (onlyShowProcureToBeProcessed) {
2810   - params.condition = 10;
2811   - }
2812 2836  
2813   - //财务是否只查看需要自己处理的
2814   - if (onlyShowFinancialToBeProcessed) {
2815   - params.condition = 20;
2816   - }
2817   -
2818   - //销售只查看自己创建的订单
2819   - if (onlyShowSalesCreateProcessed) {
2820   - params.condition = 30;
2821   - }
2822   - //只看自己需要审核的订单
2823   - if (showCurrentLeaderNeedAuditOrders) {
2824   - params.condition = 40;
2825   - }
2826   -
2827   - //只看加急开票的订单
2828   - if (onlyShowIsUrgentOrders) {
2829   - params.condition = 50;
2830   - }
  2837 + params.condition = filterCondifion;
2831 2838  
2832 2839 //是否只查看已作废
2833   - params.isDeleteQueryOrder = onlyShowCancelOrder;
  2840 + params.isDeleteQueryOrder = filterCondifion === 70;
2834 2841 //保存这个搜索条件
2835 2842 setSearchParam(params);
2836 2843 const { data } = await postServiceOrderQueryServiceOrder({
... ... @@ -2918,24 +2925,14 @@ const OrderPage = () =&gt; {
2918 2925 {notesEditVisible && (
2919 2926 <OrderNotesEditModal
2920 2927 setNotesEditVisible={setNotesEditVisible}
2921   - data={orderRow}
2922   - isMianOrder={isMainOrder}
  2928 + ids={selectedRows}
  2929 + notesType={notesType}
  2930 + notes={notes}
2923 2931 onClose={() => {
2924 2932 setNotesEditVisible(false);
2925   - setOrderRow({});
2926   - setIsMainOrder(false);
2927   - refreshTable();
2928   - }}
2929   - />
2930   - )}
2931   -
2932   - {procureNotesEditModalVisible && (
2933   - <ProcureNotesEditModal
2934   - setNotesEditVisible={setProcureNotesEditModalVisible}
2935   - data={orderRow}
2936   - onClose={() => {
2937   - setProcureNotesEditModalVisible(false);
2938   - setOrderRow({});
  2933 + setSelectedRows([]);
  2934 + setNotes(notes);
  2935 + setNotesType(1);
2939 2936 refreshTable();
2940 2937 }}
2941 2938 />
... ...
src/services/definition.ts
... ... @@ -1132,12 +1132,6 @@ export interface ProcureConvertProcureDto {
1132 1132 subIds?: Array<number>;
1133 1133 }
1134 1134  
1135   -export interface ProcureNotesEditDto {
1136   - procureNotes?: string;
1137   - /** @format int64 */
1138   - subOrderId?: number;
1139   -}
1140   -
1141 1135 export interface ProcureOrderDto {
1142 1136 /**
1143 1137 * @description
... ...
src/services/request.ts
... ... @@ -39,7 +39,6 @@ import type {
39 39 MaterialStockRes,
40 40 MaterialUnitListRes,
41 41 MeasureUnitListRes,
42   - ModelAndView,
43 42 OrderAddVO,
44 43 OrderAuditLogQueryVO,
45 44 OrderBaseInfoQueryVO,
... ... @@ -49,7 +48,6 @@ import type {
49 48 OrderUnlockFieldApplyVO,
50 49 OrderUpdateVO,
51 50 ProcureConvertProcureDto,
52   - ProcureNotesEditDto,
53 51 ProcureOrderDto,
54 52 ProcurePrintDto,
55 53 ProductInformationDto,
... ... @@ -249,7 +247,9 @@ export interface GetErrorResponse {
249 247 * @description
250 248 * OK
251 249 */
252   - 200: ModelAndView;
  250 + 200: {
  251 + [propertyName: string]: any;
  252 + };
253 253 /**
254 254 * @description
255 255 * Unauthorized
... ... @@ -270,9 +270,9 @@ export interface GetErrorResponse {
270 270 export type GetErrorResponseSuccess = GetErrorResponse[200];
271 271 /**
272 272 * @description
273   - * errorHtml
  273 + * error
274 274 * @tags basic-error-controller
275   - * @produces text/html
  275 + * @produces *
276 276 */
277 277 export const getError = /* #__PURE__ */ (() => {
278 278 const method = 'get';
... ... @@ -296,7 +296,9 @@ export interface PutErrorResponse {
296 296 * @description
297 297 * OK
298 298 */
299   - 200: ModelAndView;
  299 + 200: {
  300 + [propertyName: string]: any;
  301 + };
300 302 /**
301 303 * @description
302 304 * Created
... ... @@ -322,9 +324,9 @@ export interface PutErrorResponse {
322 324 export type PutErrorResponseSuccess = PutErrorResponse[200];
323 325 /**
324 326 * @description
325   - * errorHtml
  327 + * error
326 328 * @tags basic-error-controller
327   - * @produces text/html
  329 + * @produces *
328 330 * @consumes application/json
329 331 */
330 332 export const putError = /* #__PURE__ */ (() => {
... ... @@ -349,7 +351,9 @@ export interface PostErrorResponse {
349 351 * @description
350 352 * OK
351 353 */
352   - 200: ModelAndView;
  354 + 200: {
  355 + [propertyName: string]: any;
  356 + };
353 357 /**
354 358 * @description
355 359 * Created
... ... @@ -375,9 +379,9 @@ export interface PostErrorResponse {
375 379 export type PostErrorResponseSuccess = PostErrorResponse[200];
376 380 /**
377 381 * @description
378   - * errorHtml
  382 + * error
379 383 * @tags basic-error-controller
380   - * @produces text/html
  384 + * @produces *
381 385 * @consumes application/json
382 386 */
383 387 export const postError = /* #__PURE__ */ (() => {
... ... @@ -402,7 +406,9 @@ export interface DeleteErrorResponse {
402 406 * @description
403 407 * OK
404 408 */
405   - 200: ModelAndView;
  409 + 200: {
  410 + [propertyName: string]: any;
  411 + };
406 412 /**
407 413 * @description
408 414 * No Content
... ... @@ -423,9 +429,9 @@ export interface DeleteErrorResponse {
423 429 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
424 430 /**
425 431 * @description
426   - * errorHtml
  432 + * error
427 433 * @tags basic-error-controller
428   - * @produces text/html
  434 + * @produces *
429 435 */
430 436 export const deleteError = /* #__PURE__ */ (() => {
431 437 const method = 'delete';
... ... @@ -449,7 +455,9 @@ export interface OptionsErrorResponse {
449 455 * @description
450 456 * OK
451 457 */
452   - 200: ModelAndView;
  458 + 200: {
  459 + [propertyName: string]: any;
  460 + };
453 461 /**
454 462 * @description
455 463 * No Content
... ... @@ -470,9 +478,9 @@ export interface OptionsErrorResponse {
470 478 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
471 479 /**
472 480 * @description
473   - * errorHtml
  481 + * error
474 482 * @tags basic-error-controller
475   - * @produces text/html
  483 + * @produces *
476 484 * @consumes application/json
477 485 */
478 486 export const optionsError = /* #__PURE__ */ (() => {
... ... @@ -497,7 +505,9 @@ export interface HeadErrorResponse {
497 505 * @description
498 506 * OK
499 507 */
500   - 200: ModelAndView;
  508 + 200: {
  509 + [propertyName: string]: any;
  510 + };
501 511 /**
502 512 * @description
503 513 * No Content
... ... @@ -518,9 +528,9 @@ export interface HeadErrorResponse {
518 528 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
519 529 /**
520 530 * @description
521   - * errorHtml
  531 + * error
522 532 * @tags basic-error-controller
523   - * @produces text/html
  533 + * @produces *
524 534 * @consumes application/json
525 535 */
526 536 export const headError = /* #__PURE__ */ (() => {
... ... @@ -545,7 +555,9 @@ export interface PatchErrorResponse {
545 555 * @description
546 556 * OK
547 557 */
548   - 200: ModelAndView;
  558 + 200: {
  559 + [propertyName: string]: any;
  560 + };
549 561 /**
550 562 * @description
551 563 * No Content
... ... @@ -566,9 +578,9 @@ export interface PatchErrorResponse {
566 578 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
567 579 /**
568 580 * @description
569   - * errorHtml
  581 + * error
570 582 * @tags basic-error-controller
571   - * @produces text/html
  583 + * @produces *
572 584 * @consumes application/json
573 585 */
574 586 export const patchError = /* #__PURE__ */ (() => {
... ... @@ -6719,77 +6731,6 @@ export const postServiceOrderConfirmReceipt = /* #__PURE__ */ (() =&gt; {
6719 6731 return request;
6720 6732 })();
6721 6733  
6722   -/** @description request parameter type for postServiceOrderDetails */
6723   -export interface PostServiceOrderDetailsOption {
6724   - /**
6725   - * @description
6726   - * dto
6727   - */
6728   - body: {
6729   - /**
6730   - @description
6731   - dto */
6732   - dto: Dto;
6733   - };
6734   -}
6735   -
6736   -/** @description response type for postServiceOrderDetails */
6737   -export interface PostServiceOrderDetailsResponse {
6738   - /**
6739   - * @description
6740   - * OK
6741   - */
6742   - 200: ServerResult;
6743   - /**
6744   - * @description
6745   - * Created
6746   - */
6747   - 201: any;
6748   - /**
6749   - * @description
6750   - * Unauthorized
6751   - */
6752   - 401: any;
6753   - /**
6754   - * @description
6755   - * Forbidden
6756   - */
6757   - 403: any;
6758   - /**
6759   - * @description
6760   - * Not Found
6761   - */
6762   - 404: any;
6763   -}
6764   -
6765   -export type PostServiceOrderDetailsResponseSuccess =
6766   - PostServiceOrderDetailsResponse[200];
6767   -/**
6768   - * @description
6769   - * 编辑订单详情(现在所有的角色在订单任何状态都可以进行修改)
6770   - * @tags 内部订单
6771   - * @produces *
6772   - * @consumes application/json
6773   - */
6774   -export const postServiceOrderDetails = /* #__PURE__ */ (() => {
6775   - const method = 'post';
6776   - const url = '/service/order/details';
6777   - function request(
6778   - option: PostServiceOrderDetailsOption,
6779   - ): Promise<PostServiceOrderDetailsResponseSuccess> {
6780   - return requester(request.url, {
6781   - method: request.method,
6782   - ...option,
6783   - }) as unknown as Promise<PostServiceOrderDetailsResponseSuccess>;
6784   - }
6785   -
6786   - /** http method */
6787   - request.method = method;
6788   - /** request url */
6789   - request.url = url;
6790   - return request;
6791   -})();
6792   -
6793 6734 /** @description request parameter type for postServiceOrderEditOrder */
6794 6735 export interface PostServiceOrderEditOrderOption {
6795 6736 /**
... ... @@ -7696,6 +7637,77 @@ export const postServiceOrderNoNeedSend = /* #__PURE__ */ (() =&gt; {
7696 7637 return request;
7697 7638 })();
7698 7639  
  7640 +/** @description request parameter type for postServiceOrderNotesEdit */
  7641 +export interface PostServiceOrderNotesEditOption {
  7642 + /**
  7643 + * @description
  7644 + * dto
  7645 + */
  7646 + body: {
  7647 + /**
  7648 + @description
  7649 + dto */
  7650 + dto: Dto;
  7651 + };
  7652 +}
  7653 +
  7654 +/** @description response type for postServiceOrderNotesEdit */
  7655 +export interface PostServiceOrderNotesEditResponse {
  7656 + /**
  7657 + * @description
  7658 + * OK
  7659 + */
  7660 + 200: ServerResult;
  7661 + /**
  7662 + * @description
  7663 + * Created
  7664 + */
  7665 + 201: any;
  7666 + /**
  7667 + * @description
  7668 + * Unauthorized
  7669 + */
  7670 + 401: any;
  7671 + /**
  7672 + * @description
  7673 + * Forbidden
  7674 + */
  7675 + 403: any;
  7676 + /**
  7677 + * @description
  7678 + * Not Found
  7679 + */
  7680 + 404: any;
  7681 +}
  7682 +
  7683 +export type PostServiceOrderNotesEditResponseSuccess =
  7684 + PostServiceOrderNotesEditResponse[200];
  7685 +/**
  7686 + * @description
  7687 + * 编辑备注
  7688 + * @tags 内部订单
  7689 + * @produces *
  7690 + * @consumes application/json
  7691 + */
  7692 +export const postServiceOrderNotesEdit = /* #__PURE__ */ (() => {
  7693 + const method = 'post';
  7694 + const url = '/service/order/notesEdit';
  7695 + function request(
  7696 + option: PostServiceOrderNotesEditOption,
  7697 + ): Promise<PostServiceOrderNotesEditResponseSuccess> {
  7698 + return requester(request.url, {
  7699 + method: request.method,
  7700 + ...option,
  7701 + }) as unknown as Promise<PostServiceOrderNotesEditResponseSuccess>;
  7702 + }
  7703 +
  7704 + /** http method */
  7705 + request.method = method;
  7706 + /** request url */
  7707 + request.url = url;
  7708 + return request;
  7709 +})();
  7710 +
7699 7711 /** @description request parameter type for postServiceOrderOrderCancel */
7700 7712 export interface PostServiceOrderOrderCancelOption {
7701 7713 /**
... ... @@ -8052,77 +8064,6 @@ export const postServiceOrderProcureConvertWarehouseKeeper =
8052 8064 return request;
8053 8065 })();
8054 8066  
8055   -/** @description request parameter type for postServiceOrderProcureNotesEdit */
8056   -export interface PostServiceOrderProcureNotesEditOption {
8057   - /**
8058   - * @description
8059   - * dto
8060   - */
8061   - body: {
8062   - /**
8063   - @description
8064   - dto */
8065   - dto: ProcureNotesEditDto;
8066   - };
8067   -}
8068   -
8069   -/** @description response type for postServiceOrderProcureNotesEdit */
8070   -export interface PostServiceOrderProcureNotesEditResponse {
8071   - /**
8072   - * @description
8073   - * OK
8074   - */
8075   - 200: ServerResult;
8076   - /**
8077   - * @description
8078   - * Created
8079   - */
8080   - 201: any;
8081   - /**
8082   - * @description
8083   - * Unauthorized
8084   - */
8085   - 401: any;
8086   - /**
8087   - * @description
8088   - * Forbidden
8089   - */
8090   - 403: any;
8091   - /**
8092   - * @description
8093   - * Not Found
8094   - */
8095   - 404: any;
8096   -}
8097   -
8098   -export type PostServiceOrderProcureNotesEditResponseSuccess =
8099   - PostServiceOrderProcureNotesEditResponse[200];
8100   -/**
8101   - * @description
8102   - * 编辑采购备注
8103   - * @tags 内部订单
8104   - * @produces *
8105   - * @consumes application/json
8106   - */
8107   -export const postServiceOrderProcureNotesEdit = /* #__PURE__ */ (() => {
8108   - const method = 'post';
8109   - const url = '/service/order/procureNotesEdit';
8110   - function request(
8111   - option: PostServiceOrderProcureNotesEditOption,
8112   - ): Promise<PostServiceOrderProcureNotesEditResponseSuccess> {
8113   - return requester(request.url, {
8114   - method: request.method,
8115   - ...option,
8116   - }) as unknown as Promise<PostServiceOrderProcureNotesEditResponseSuccess>;
8117   - }
8118   -
8119   - /** http method */
8120   - request.method = method;
8121   - /** request url */
8122   - request.url = url;
8123   - return request;
8124   -})();
8125   -
8126 8067 /** @description request parameter type for postServiceOrderProcureOrder */
8127 8068 export interface PostServiceOrderProcureOrderOption {
8128 8069 /**
... ...