canrd-main / canrd-erp-front · Commits

Commit 96904e652633f11ce907d7fbc25b19514358ed96

Authored by zhongnanhuang
2 parents 37bc9823 c56d1a59

feat: update 合并

Inline Side-by-side
Showing 20 changed files with 1405 additions and 522 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 20 of 21 files are displayed.

.umirc.ts
  View file @96904e6
... ... @@ -80,6 +80,13 @@ export default defineConfig({
80 80 access: 'canReadLinda',
81 81 },
82 82 {
  83 + name: '区域管理',
  84 + path: '/zoning',
  85 + component: './ZoNing',
  86 + icon: 'BookOutlined',
  87 + access: 'canReadAdminAndSales',
  88 + },
  89 + {
83 90 name: '打印',
84 91 path: '/print',
85 92 component: './OrderPrint',
... ...
src/pages/Instalment/components/comfire/comfire.tsx
  View file @96904e6
... ... @@ -34,7 +34,7 @@ export default ({ currtDid, sureDelete }) => {
34 34 }
35 35 form={form}
36 36 autoFocusFirstInput
37   - width={190}
  37 + width={280}
38 38 modalProps={{
39 39 destroyOnClose: true,
40 40 }}
... ...
src/pages/Instalment/components/payWayDetail/payWayDetail.tsx
  View file @96904e6
... ... @@ -223,7 +223,7 @@ export default ({ payBody, thisId, currtSave }) => {
223 223 <ProFormUploadButton
224 224 name={record.id}
225 225 onChange={(value) => {
226   - // console.log(value);
  226 + console.log(value);
227 227 // console.log(payWayDetailBody);
228 228 let remakeBody = [];
229 229 let remakeBodyItem = {};
... ... @@ -231,8 +231,8 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
231 231 if (item.id === record.id) {
232 232 remakeBodyItem = {
233 233 ...item,
234   - fileUrl: value.file.originFileObj,
235   - fileName: value.file.name,
  234 + fileUrl: value.fileList.originFileObj,
  235 + fileName: value.fileList.name,
236 236 };
237 237 } else {
238 238 remakeBodyItem = { ...item };
... ...
src/pages/Instalment/components/read/readPayWay.tsx
  View file @96904e6
... ... @@ -167,25 +167,19 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
167 167 dataIndex: 'payDate',
168 168 editable: false,
169 169 render: (_text, record) => {
170   - return (
171   - <span>
172   - {new Intl.DateTimeFormat('zh-CN', {
173   - year: 'numeric',
174   - month: 'long',
175   - day: 'numeric',
176   - }).format(record.payDate)}
177   - </span>
178   - // <ProFormDatePicker
179   - // className='dataChoose'
180   - // initialValue={record.payDate}
181   - // value={record.payDate}
182   - // placeholder={"请填写时间"}
183   - // fieldProps={{
184   - // format: (value) => value.format('YYYY-MM-DD'),
185   - // onChange: handleChange,
186   - // }}
187   - // />
188   - );
  170 + if (record.payDate) {
  171 + return (
  172 + <span>
  173 + {new Intl.DateTimeFormat('zh-CN', {
  174 + year: 'numeric',
  175 + month: 'long',
  176 + day: 'numeric',
  177 + }).format(record.payDate)}
  178 + </span>
  179 + );
  180 + } else {
  181 + return <span></span>;
  182 + }
189 183 },
190 184 },
191 185 {
... ...
src/pages/Instalment/components/read/readProduct.tsx
  View file @96904e6
... ... @@ -85,7 +85,7 @@ export default ({ productBody, EditProductBody }) =&gt; {
85 85 {
86 86 title: '设备型号',
87 87 dataIndex: 'deviceModel',
88   - width: '15%',
  88 + width: '20%',
89 89 formItemProps: () => {
90 90 return {
91 91 rules: [{ required: true, message: '此项为必填项' }],
... ...
src/pages/Instalment/components/title/title.tsx
  View file @96904e6
... ... @@ -166,7 +166,10 @@ export default () =&gt; {
166 166 {
167 167 title: '文件编号',
168 168 dataIndex: 'id',
169   - width: '7%',
  169 + width: 100,
  170 + disable: true,
  171 + onFilter: true,
  172 + ellipsis: true,
170 173 render: (_, record) => {
171 174 if (record.id) {
172 175 const text = record.id.toString();
... ... @@ -179,116 +182,108 @@ export default () =&gt; {
179 182 title: '签合同日期',
180 183 dataIndex: 'dateRange',
181 184 valueType: 'date',
182   - filters: true,
  185 + width: 100,
  186 + disable: true,
183 187 onFilter: true,
184 188 ellipsis: true,
185   - width: '8%',
186 189 },
187 190 {
188   - disable: true,
189 191 title: '合同编号',
190 192 dataIndex: 'contract',
191   - filters: true,
  193 + width: 200,
  194 + disable: true,
192 195 onFilter: true,
193 196 ellipsis: true,
194   - width: '9%',
195 197 },
196 198 {
197   - disable: true,
198 199 title: '供应商名称',
199 200 dataIndex: 'vendor',
200   - filters: true,
  201 + width: 200,
  202 + disable: true,
201 203 onFilter: true,
202 204 ellipsis: true,
203 205 },
204 206 {
205   - disable: true,
206 207 title: '终端名称',
207 208 dataIndex: 'terminal',
208   - filters: true,
  209 + width: 200,
  210 + disable: true,
209 211 onFilter: true,
210 212 ellipsis: true,
211   - width: '6%',
212 213 },
213 214 {
214   - disable: true,
215 215 title: '设备名称',
216 216 dataIndex: 'deviceName',
217   - filters: true,
  217 + width: 200,
  218 + disable: true,
218 219 onFilter: true,
219 220 ellipsis: true,
220 221 },
221 222 {
222   - disable: true,
223 223 title: '设备型号',
224 224 dataIndex: 'deviceModel',
225   - filters: true,
226 225 hideInSearch: true,
227   - onFilter: false,
  226 + width: 200,
  227 + disable: true,
  228 + onFilter: true,
228 229 ellipsis: true,
229   - width: '10%',
230 230 },
231 231 {
232   - disable: true,
233 232 title: '数量',
234 233 dataIndex: 'count',
235   - filters: true,
236 234 hideInSearch: true,
237   - onFilter: false,
  235 + width: 100,
  236 + disable: true,
  237 + onFilter: true,
238 238 ellipsis: true,
239   - width: '4%',
240 239 },
241 240 {
242   - disable: true,
243 241 title: '单价',
244 242 dataIndex: 'unitPrice',
245   - filters: true,
246 243 hideInSearch: true,
247   - onFilter: false,
  244 + width: 100,
  245 + disable: true,
  246 + onFilter: true,
248 247 ellipsis: true,
249   - width: '5%',
250 248 },
251 249 {
252   - disable: true,
253 250 title: '总价',
254 251 dataIndex: 'price',
255   - filters: true,
256 252 hideInSearch: true,
257   - onFilter: false,
  253 + width: 100,
  254 + disable: true,
  255 + onFilter: true,
258 256 ellipsis: true,
259   - width: '5%',
260 257 },
261 258 {
262   - disable: true,
263 259 title: '合同总金额',
264 260 dataIndex: 'totalPrice',
265   - filters: true,
266 261 hideInSearch: true,
267   - onFilter: false,
  262 + width: 100,
  263 + disable: true,
  264 + onFilter: true,
268 265 ellipsis: true,
269   - width: '6%',
270 266 },
271 267 {
272   - disable: true,
273 268 title: '付款方式',
274 269 dataIndex: 'payWay',
275   - filters: true,
276 270 hideInSearch: true,
277   - onFilter: false,
  271 + width: 100,
  272 + disable: true,
  273 + onFilter: true,
278 274 ellipsis: true,
279 275 },
280 276 {
281   - disable: true,
282 277 title: '附件',
283 278 dataIndex: 'annex',
284   - filters: true,
285 279 hideInSearch: true,
286   - onFilter: false,
  280 + width: 100,
  281 + disable: true,
  282 + onFilter: true,
287 283 ellipsis: true,
288   - width: '5%',
289 284 render: (_, record) => {
290   - if (record.id) {
291   - return <a href={record.annex}>{record.annex}</a>;
  285 + if (record.id && record.annex !== null) {
  286 + return <a href={record.annex}>附件文件</a>;
292 287 }
293 288 },
294 289 },
... ... @@ -300,13 +295,20 @@ export default () =&gt; {
300 295 hideInSearch: true,
301 296 onFilter: false,
302 297 ellipsis: true,
303   - width: '5%',
  298 + width: 100,
  299 + disable: true,
  300 + onFilter: true,
  301 + ellipsis: true,
304 302 },
305 303 {
306 304 title: '操作',
307 305 valueType: 'option',
308 306 key: 'option',
309   - width: '10%',
  307 + fixed: 'right',
  308 + width: 120,
  309 + disable: true,
  310 + onFilter: true,
  311 + ellipsis: true,
310 312 render: (_text, record) => {
311 313 if (record?.id) {
312 314 return (
... ... @@ -335,8 +337,9 @@ export default () =&gt; {
335 337 className="title-index"
336 338 columnEmptyText=""
337 339 columns={columns}
338   - actionRef={ref}
339 340 cardBordered
  341 + actionRef={ref}
  342 + scroll={{ x: 1400, y: 360 }}
340 343 request={async (params) => {
341 344 // console.log(params);
342 345 if (
... ...
src/pages/Instalment/components/upload/uploadApp.css 0 → 100644
  View file @96904e6
  1 +.modul-a {
  2 + position: absolute;
  3 + bottom: 25px;
  4 +}
... ...
src/pages/Instalment/components/upload/uploadApp.less 0 → 100644
  View file @96904e6
  1 +.modul-a {
  2 + position: absolute;
  3 + bottom: 25px;
  4 +}
... ...
src/pages/Instalment/components/upload/uploadApp.tsx
  View file @96904e6
1 1 import { InboxOutlined } from '@ant-design/icons';
2 2 import { Upload } from 'antd';
3 3 import React from 'react';
  4 +import './uploadApp.less';
4 5  
5 6 const App: React.FC = ({ uploadFile }) => {
6 7 const { Dragger } = Upload;
... ... @@ -15,18 +16,26 @@ const App: React.FC = ({ uploadFile }) =&gt; {
15 16 };
16 17  
17 18 return (
18   - <Dragger {...props}>
19   - <p className="ant-upload-drag-icon">
20   - <InboxOutlined />
21   - </p>
22   - <p className="ant-upload-text">
23   - Click or drag file to this area to upload
24   - </p>
25   - <p className="ant-upload-hint">
26   - Support for a single or bulk upload. Strictly prohibited from uploading
27   - company data or other banned files.
28   - </p>
29   - </Dragger>
  19 + <>
  20 + <Dragger {...props}>
  21 + <p className="ant-upload-drag-icon">
  22 + <InboxOutlined />
  23 + </p>
  24 + <p className="ant-upload-text">
  25 + Click or drag file to this area to upload
  26 + </p>
  27 + <p className="ant-upload-hint">
  28 + Support for a single or bulk upload. Strictly prohibited from
  29 + uploading company data or other banned files.
  30 + </p>
  31 + </Dragger>
  32 + <a
  33 + href="https://order-erp.oss-cn-qingdao.aliyuncs.com/%E5%88%86%E6%9C%9F%E4%BB%98%E6%AC%BE-%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx?Expires=2035527699&OSSAccessKeyId=LTAIZCPI7OaWud0m&Signature=npHyEhfRd6LugJ0St8OkvRmLYtQ%3D"
  34 + className="modul-a"
  35 + >
  36 + 下载模板
  37 + </a>
  38 + </>
30 39 );
31 40 };
32 41  
... ...
src/pages/Instalment/components/upload/uploadModel.tsx
  View file @96904e6
... ... @@ -27,7 +27,12 @@ export default ({ toReload }) =&gt; {
27 27 }>
28 28 title="新建表单"
29 29 trigger={
30   - <Button type="primary">
  30 + <Button
  31 + type="primary"
  32 + onClick={() => {
  33 + setUploadFile({});
  34 + }}
  35 + >
31 36 <VerticalAlignBottomOutlined />
32 37 导入
33 38 </Button>
... ... @@ -39,6 +44,9 @@ export default ({ toReload }) =&gt; {
39 44 }}
40 45 submitTimeout={2000}
41 46 onFinish={async () => {
  47 + if (!(uploadFile instanceof File)) {
  48 + return false;
  49 + }
42 50 const formData = new FormData();
43 51 formData.append('file', uploadFile as RcFile);
44 52 const res = await postOrderErpOrderStagesImport({
... ...
src/pages/Order/components/ApplyForInvoicingModal.tsx
  View file @96904e6
... ... @@ -4,6 +4,7 @@ import { enumToSelect, getAliYunOSSFileNameFromUrl } from &#39;@/utils&#39;;
4 4 import {
5 5 ModalForm,
6 6 ProFormSelect,
  7 + ProFormText,
7 8 ProFormTextArea,
8 9 ProFormUploadDragger,
9 10 } from '@ant-design/pro-components';
... ... @@ -139,6 +140,14 @@ export default ({
139 140 },
140 141 }}
141 142 />
  143 + <ProFormText
  144 + width="lg"
  145 + name="purchaser"
  146 + label="抬头名称"
  147 + key="purchaser"
  148 + placeholder="请输入抬头名称"
  149 + rules={[{ required: true, message: '抬头名称必填' }]}
  150 + />
142 151 <ProFormSelect
143 152 placeholder="选择收款单位"
144 153 name="receivingCompany"
... ...
src/pages/Order/components/FinancialDrawer.tsx
  View file @96904e6
... ... @@ -34,6 +34,9 @@ export default ({
34 34 setInvoicingStatus(subOrders[0]?.invoicingStatus);
35 35 }
36 36 }, [mainOrder]);
  37 + useEffect(() => {
  38 + console.log(JSON.stringify(subOrders));
  39 + }, []);
37 40  
38 41 const [form] = Form.useForm<{ name: string; company: string }>();
39 42  
... ... @@ -153,6 +156,17 @@ export default ({
153 156 ]}
154 157 initialValue={subOrders[0]?.invoicingTime}
155 158 />,
  159 + <ProFormText
  160 + key="purchaser"
  161 + width="lg"
  162 + name="purchaser"
  163 + label="抬头名称"
  164 + disabled={isEdit}
  165 + rules={[
  166 + { required: !isEdit ? true : false, message: '这是必填项' },
  167 + ]}
  168 + initialValue={subOrders[0]?.purchaser}
  169 + />,
156 170 <ProFormDatePicker
157 171 key="financialReceiptIssuanceTime"
158 172 width="lg"
... ...
src/pages/Order/components/ImportExpressBillModal.tsx 0 → 100644
  View file @96904e6
  1 +import { RESPONSE_CODE } from '@/constants/enum';
  2 +import { postOrderImportImportWeightAndVolume } from '@/services';
  3 +import { ModalForm, ProFormUploadDragger } from '@ant-design/pro-components';
  4 +import { Button, Form, message } from 'antd';
  5 +
  6 +export default () => {
  7 + const [form] = Form.useForm();
  8 + const [messageApi, contextHolder] = message.useMessage();
  9 + return (
  10 + <>
  11 + <ModalForm
  12 + title="导入重量、体积"
  13 + trigger={<Button type="primary">导入重量、体积</Button>}
  14 + form={form}
  15 + autoFocusFirstInput
  16 + modalProps={{
  17 + destroyOnClose: true,
  18 + }}
  19 + submitTimeout={2000}
  20 + onFinish={async (values) => {
  21 + console.log(values);
  22 + const formData = new FormData();
  23 + formData.append('file', values.express[0].originFileObj);
  24 + messageApi.open({
  25 + type: 'loading',
  26 + content: '正在导入...',
  27 + duration: 0,
  28 + });
  29 + const res = await postOrderImportImportWeightAndVolume({
  30 + data: formData,
  31 + headers: {
  32 + 'Content-Type':
  33 + 'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
  34 + },
  35 + });
  36 + if (res.result === RESPONSE_CODE.SUCCESS) {
  37 + message.error('导入成功');
  38 + } else {
  39 + message.error('导入失败');
  40 + }
  41 + messageApi.destroy();
  42 + return true;
  43 + }}
  44 + >
  45 + <ProFormUploadDragger max={1} label="上传快递单" name="express" />
  46 + </ModalForm>
  47 + {contextHolder}
  48 + </>
  49 + );
  50 +};
... ...
src/pages/Order/components/ReissueModal.tsx
  View file @96904e6
... ... @@ -65,10 +65,7 @@ export default ({ setVisible, mainOrder, onClose }) =&gt; {
65 65 onFinish={async (values) => {
66 66 setSubmitting(true);
67 67 postServiceInvoiceReissue({
68   - data: {
69   - invoiceId: values.invoiceId,
70   - notes: values.notes,
71   - },
  68 + data: values,
72 69 });
73 70 setVisible(false);
74 71 onClose();
... ... @@ -96,6 +93,14 @@ export default ({ setVisible, mainOrder, onClose }) =&gt; {
96 93 }}
97 94 />
98 95 <ProFormText
  96 + width="lg"
  97 + name="purchaser"
  98 + label="抬头名称"
  99 + key="purchaser"
  100 + placeholder="请输入抬头名称"
  101 + rules={[{ required: true, message: '抬头名称必填' }]}
  102 + />
  103 + <ProFormText
99 104 width="md"
100 105 name="关联订单"
101 106 label="发票关联订单号"
... ...
src/pages/Order/index.tsx
  View file @96904e6
1 1 import ButtonConfirm from '@/components/ButtomConfirm';
2 2 import { RESPONSE_CODE } from '@/constants/enum';
  3 +import ImportExpressBillModal from '@/pages/Order/components/ImportExpressBillModal';
3 4 import InvoicingDrawerForm from '@/pages/Order/components/InvoicingDrawerForm';
4 5 import ReissueModal from '@/pages/Order/components/ReissueModal';
5 6 import {
... ... @@ -3896,6 +3897,8 @@ const OrderPage = () =&gt; {
3896 3897  
3897 3898 toolBtns.push(radioGroup);
3898 3899  
  3900 + toolBtns.push(<ImportExpressBillModal></ImportExpressBillModal>);
  3901 +
3899 3902 //导出按钮配置
3900 3903 const exportItems: MenuProps['items'] = [
3901 3904 {
... ...
src/pages/ZoNing/components/constant.tsx 0 → 100644
  View file @96904e6
  1 +import { List } from 'lodash';
  2 +
  3 +export type zoningItem = {
  4 + id: number; //id
  5 + zoning: string; //区域名称
  6 + orderProvinceVoList: List<provinceItem>; //所包含的省份列表
  7 + orderUserVoList: List<userItem>; //所包含的销售列表
  8 +};
  9 +
  10 +export type zoningShowItem = {
  11 + id: number; //id
  12 + zoning: string; //区域名称
  13 + orderProvinceShowList: string; //所包含的省份列表
  14 + orderUserShowList: string; //所包含的销售列表
  15 +};
  16 +
  17 +export type provinceItem = {
  18 + pId: number;
  19 + province: string;
  20 +};
  21 +
  22 +export type userItem = {
  23 + uId: number;
  24 + userName: string;
  25 +};
... ...
src/pages/ZoNing/components/modal.tsx 0 → 100644
  View file @96904e6
  1 +import { getOrderErpOrderZoNingSelectProvinceAll } from '@/services';
  2 +import { PlusOutlined } from '@ant-design/icons';
  3 +import {
  4 + ModalForm,
  5 + ProForm,
  6 + ProFormSelect,
  7 + ProFormText,
  8 +} from '@ant-design/pro-components';
  9 +import { Button, Form, message } from 'antd';
  10 +import { zoningItem } from './constant';
  11 +
  12 +const waitTime = (time: number = 100) => {
  13 + return new Promise((resolve) => {
  14 + setTimeout(() => {
  15 + resolve(true);
  16 + }, time);
  17 + });
  18 +};
  19 +
  20 +export default () => {
  21 + const [form] = Form.useForm<zoningItem>();
  22 + return (
  23 + <ModalForm<{
  24 + name: string;
  25 + company: string;
  26 + }>
  27 + title="新增区域"
  28 + trigger={
  29 + <Button type="primary">
  30 + <PlusOutlined />
  31 + 新增区域
  32 + </Button>
  33 + }
  34 + form={form}
  35 + autoFocusFirstInput
  36 + modalProps={{
  37 + destroyOnClose: true,
  38 + onCancel: () => console.log('run'),
  39 + }}
  40 + submitTimeout={2000}
  41 + onFinish={async (values) => {
  42 + await waitTime(2000);
  43 + console.log(values.name);
  44 + message.success('提交成功');
  45 + return true;
  46 + }}
  47 + >
  48 + <ProForm.Group>
  49 + <ProFormText
  50 + width="md"
  51 + name="zoning"
  52 + label="区域名称"
  53 + placeholder="请输入"
  54 + />
  55 + </ProForm.Group>
  56 + <ProForm.Group>
  57 + <ProFormSelect
  58 + request={async () => {
  59 + const provinceList =
  60 + await getOrderErpOrderZoNingSelectProvinceAll();
  61 + if (provinceList) {
  62 + return provinceList.data.map((item) => ({
  63 + value: { pId: item.pId, province: item.province },
  64 + label: item.province,
  65 + }));
  66 + }
  67 + return [];
  68 + }}
  69 + width="xs"
  70 + name="orderProvinceVoList"
  71 + label="合同约定生效方式"
  72 + />
  73 + </ProForm.Group>
  74 + <ProForm.Group>
  75 + <ProFormSelect
  76 + width="xs"
  77 + options={[
  78 + {
  79 + value: 'time',
  80 + label: '履行完终止',
  81 + },
  82 + ]}
  83 + name="orderUserVoList"
  84 + label="合同约定失效效方式"
  85 + />
  86 + </ProForm.Group>
  87 + </ModalForm>
  88 + );
  89 +};
... ...
src/pages/ZoNing/components/table.tsx 0 → 100644
  View file @96904e6
  1 +import type { ProColumns } from '@ant-design/pro-components';
  2 +import {
  3 + EditableProTable,
  4 + ProCard,
  5 + ProFormField,
  6 +} from '@ant-design/pro-components';
  7 +import React, { useState } from 'react';
  8 +import { zoningItem, zoningShowItem } from './constant';
  9 +import Modal from './modal';
  10 +
  11 +const waitTime = (time: number = 100) => {
  12 + return new Promise((resolve) => {
  13 + setTimeout(() => {
  14 + resolve(true);
  15 + }, time);
  16 + });
  17 +};
  18 +
  19 +const defaultData: zoningItem[] = [
  20 + {
  21 + id: 1,
  22 + zoning: '华南地区',
  23 + orderProvinceVoList: [
  24 + {
  25 + pId: 1,
  26 + province: '广东省',
  27 + },
  28 + {
  29 + pId: 2,
  30 + province: '四川省',
  31 + },
  32 + {
  33 + pId: 3,
  34 + province: '北京市',
  35 + },
  36 + {
  37 + pId: 4,
  38 + province: '上海市',
  39 + },
  40 + ],
  41 + orderUserVoList: [
  42 + {
  43 + uId: 1,
  44 + userName: '李华',
  45 + },
  46 + ],
  47 + },
  48 +];
  49 +
  50 +const defaultShowData: zoningShowItem[] = defaultData.map((item) => {
  51 + let orderProvinceShowList = '';
  52 + let orderUserShowList = '';
  53 +
  54 + item.orderProvinceVoList.forEach((element, index) => {
  55 + orderProvinceShowList += element.province;
  56 + if (index < item.orderProvinceVoList.length - 1) {
  57 + orderProvinceShowList += '、';
  58 + }
  59 + });
  60 +
  61 + item.orderUserVoList.forEach((event, index) => {
  62 + orderUserShowList += event.userName;
  63 + if (index < item.orderUserVoList.length - 1) {
  64 + orderUserShowList += '、';
  65 + }
  66 + });
  67 +
  68 + return {
  69 + id: item.id,
  70 + zoning: item.zoning,
  71 + orderProvinceShowList,
  72 + orderUserShowList,
  73 + };
  74 +});
  75 +
  76 +export default () => {
  77 + const [editableKeys, setEditableRowKeys] = useState<React.Key[]>([]);
  78 + const [dataSource, setDataSource] = useState<readonly zoningItem[]>([]);
  79 + const [position] = useState<'top' | 'bottom' | 'hidden'>('hidden');
  80 +
  81 + const columns: ProColumns<zoningItem>[] = [
  82 + {
  83 + title: '区域名称',
  84 + dataIndex: 'zoning',
  85 + width: 200,
  86 + },
  87 + {
  88 + title: '管辖省份',
  89 + dataIndex: 'orderProvinceShowList',
  90 + readonly: true,
  91 + width: 600,
  92 + },
  93 + {
  94 + title: '负责销售',
  95 + key: 'state',
  96 + dataIndex: 'orderUserShowList',
  97 + valueType: 'select',
  98 + width: 200,
  99 + },
  100 + {
  101 + title: '操作',
  102 + valueType: 'option',
  103 + width: 200,
  104 + render: (text, record, _, action) => [
  105 + <a
  106 + key="editable"
  107 + onClick={() => {
  108 + action?.startEditable?.(record.id);
  109 + }}
  110 + >
  111 + 编辑
  112 + </a>,
  113 + <a
  114 + key="delete"
  115 + onClick={() => {
  116 + setDataSource(dataSource.filter((item) => item.id !== record.id));
  117 + }}
  118 + >
  119 + 删除
  120 + </a>,
  121 + ],
  122 + },
  123 + ];
  124 +
  125 + return (
  126 + <>
  127 + <EditableProTable<zoningItem>
  128 + rowKey="id"
  129 + headerTitle={<Modal></Modal>}
  130 + maxLength={5}
  131 + scroll={{
  132 + x: 960,
  133 + }}
  134 + recordCreatorProps={
  135 + position !== 'hidden'
  136 + ? {
  137 + position: position as 'top',
  138 + record: () => ({ id: (Math.random() * 1000000).toFixed(0) }),
  139 + }
  140 + : false
  141 + }
  142 + loading={false}
  143 + columns={columns}
  144 + request={async () => ({
  145 + data: defaultShowData,
  146 + })}
  147 + value={dataSource}
  148 + onChange={setDataSource}
  149 + editable={{
  150 + type: 'multiple',
  151 + editableKeys,
  152 + onSave: async (rowKey, data, row) => {
  153 + console.log(rowKey, data, row);
  154 + await waitTime(2000);
  155 + },
  156 + onChange: setEditableRowKeys,
  157 + }}
  158 + />
  159 + <ProCard title="表格数据" headerBordered collapsible defaultCollapsed>
  160 + <ProFormField
  161 + ignoreFormItem
  162 + fieldProps={{
  163 + style: {
  164 + width: '100%',
  165 + },
  166 + }}
  167 + mode="read"
  168 + valueType="jsonCode"
  169 + text={JSON.stringify(dataSource)}
  170 + />
  171 + </ProCard>
  172 + </>
  173 + );
  174 +};
... ...
src/pages/ZoNing/index.tsx 0 → 100644
  View file @96904e6
  1 +import Table from './components/table';
  2 +const instalment_contect: React.FC = () => (
  3 + <>
  4 + <Table></Table>
  5 + </>
  6 +);
  7 +
  8 +export default instalment_contect;
... ...
src/services/definition.ts
  View file @96904e6
... ... @@ -86,8 +86,6 @@ export interface AdminAuthUserVO {
86 86 export interface AdminDeptQueryVO {
87 87 /** @format int32 */
88 88 current?: number;
89   - /** @format int32 */
90   - end?: number;
91 89 /** @format int64 */
92 90 id?: number;
93 91 ids?: Array<number>;
... ... @@ -97,8 +95,6 @@ export interface AdminDeptQueryVO {
97 95 /** @format int64 */
98 96 pid?: number;
99 97 /** @format int32 */
100   - start?: number;
101   - /** @format int32 */
102 98 total?: number;
103 99 }
104 100  
... ... @@ -113,8 +109,6 @@ export interface AdminDeptVO {
113 109 export interface AdminJobQueryVO {
114 110 /** @format int32 */
115 111 current?: number;
116   - /** @format int32 */
117   - end?: number;
118 112 /** @format int64 */
119 113 id?: number;
120 114 ids?: Array<number>;
... ... @@ -124,8 +118,6 @@ export interface AdminJobQueryVO {
124 118 /** @format int32 */
125 119 sort?: number;
126 120 /** @format int32 */
127   - start?: number;
128   - /** @format int32 */
129 121 total?: number;
130 122 }
131 123  
... ... @@ -144,8 +136,6 @@ export interface AdminMenuQueryVO {
144 136 /** @format int32 */
145 137 current?: number;
146 138 /** @format int32 */
147   - end?: number;
148   - /** @format int32 */
149 139 hidden?: number;
150 140 icon?: string;
151 141 /** @format int64 */
... ... @@ -161,8 +151,6 @@ export interface AdminMenuQueryVO {
161 151 /** @format int64 */
162 152 pid?: number;
163 153 /** @format int32 */
164   - start?: number;
165   - /** @format int32 */
166 154 total?: number;
167 155 /** @format int32 */
168 156 type?: number;
... ... @@ -193,8 +181,6 @@ export interface AdminRoleQueryVO {
193 181 /** @format int32 */
194 182 current?: number;
195 183 dataScope?: string;
196   - /** @format int32 */
197   - end?: number;
198 184 /** @format int64 */
199 185 id?: number;
200 186 ids?: Array<number>;
... ... @@ -206,8 +192,6 @@ export interface AdminRoleQueryVO {
206 192 permission?: string;
207 193 remark?: string;
208 194 /** @format int32 */
209   - start?: number;
210   - /** @format int32 */
211 195 total?: number;
212 196 }
213 197  
... ... @@ -225,30 +209,22 @@ export interface AdminUserLoginByPhoneVO {
225 209 /** @format int32 */
226 210 current?: number;
227 211 /** @format int32 */
228   - end?: number;
229   - /** @format int32 */
230 212 pageSize?: number;
231 213 phone?: string;
232 214 smsCaptchaCode?: string;
233 215 /** @format int32 */
234   - start?: number;
235   - /** @format int32 */
236 216 total?: number;
237 217 }
238 218  
239 219 export interface AdminUserLoginByPwdVO {
240 220 /** @format int32 */
241 221 current?: number;
242   - /** @format int32 */
243   - end?: number;
244 222 imgCaptchaCode?: string;
245 223 imgCaptchaUuid?: string;
246 224 /** @format int32 */
247 225 pageSize?: number;
248 226 password?: string;
249 227 /** @format int32 */
250   - start?: number;
251   - /** @format int32 */
252 228 total?: number;
253 229 userName?: string;
254 230 }
... ... @@ -258,15 +234,11 @@ export interface AdminUserModifyPwdVO {
258 234 /** @format int32 */
259 235 current?: number;
260 236 /** @format int32 */
261   - end?: number;
262   - /** @format int32 */
263 237 pageSize?: number;
264 238 password?: string;
265 239 phone?: string;
266 240 smsCaptchaCode?: string;
267 241 /** @format int32 */
268   - start?: number;
269   - /** @format int32 */
270 242 total?: number;
271 243 }
272 244  
... ... @@ -274,12 +246,8 @@ export interface AdminUserPasswordRecoverEmailVO {
274 246 /** @format int32 */
275 247 current?: number;
276 248 /** @format int32 */
277   - end?: number;
278   - /** @format int32 */
279 249 pageSize?: number;
280 250 /** @format int32 */
281   - start?: number;
282   - /** @format int32 */
283 251 total?: number;
284 252 userName?: string;
285 253 }
... ... @@ -288,8 +256,6 @@ export interface AdminUserQueryVO {
288 256 /** @format int32 */
289 257 current?: number;
290 258 email?: string;
291   - /** @format int32 */
292   - end?: number;
293 259 /** @format int64 */
294 260 id?: number;
295 261 ids?: Array<number>;
... ... @@ -300,8 +266,6 @@ export interface AdminUserQueryVO {
300 266 phone?: string;
301 267 sex?: string;
302 268 /** @format int32 */
303   - start?: number;
304   - /** @format int32 */
305 269 total?: number;
306 270 userName?: string;
307 271 workerType?: string;
... ... @@ -312,8 +276,6 @@ export interface AdminUserRegisterVO {
312 276 /** @format int32 */
313 277 current?: number;
314 278 email?: string;
315   - /** @format int32 */
316   - end?: number;
317 279 isAgreeAgreement?: boolean;
318 280 /** @format int32 */
319 281 pageSize?: number;
... ... @@ -323,8 +285,6 @@ export interface AdminUserRegisterVO {
323 285 safeQuestion?: string;
324 286 smsCaptchaCode?: string;
325 287 /** @format int32 */
326   - start?: number;
327   - /** @format int32 */
328 288 total?: number;
329 289 userName?: string;
330 290 }
... ... @@ -520,12 +480,8 @@ export interface ApiOrderCustomersRequest {
520 480 /** @format int32 */
521 481 current?: number;
522 482 /** @format int32 */
523   - end?: number;
524   - /** @format int32 */
525 483 pageSize?: number;
526 484 /** @format int32 */
527   - start?: number;
528   - /** @format int32 */
529 485 total?: number;
530 486 }
531 487  
... ... @@ -572,6 +528,221 @@ export interface ApiQueryOrderStatusCountsRequest {
572 528 uid?: number;
573 529 }
574 530  
  531 +export interface ApplyInvoiceDto {
  532 + /**
  533 + * @description
  534 + * 备注
  535 + */
  536 + applyInvoicingNotes?: string;
  537 + /**
  538 + * @description
  539 + * 开票备注
  540 + */
  541 + comment?: string;
  542 + /**
  543 + * @description
  544 + * 联系人
  545 + */
  546 + contacts?: string;
  547 + /**
  548 + * @description
  549 + * 开票内容
  550 + */
  551 + content?: string;
  552 + createByName?: string;
  553 + /** @format date-time */
  554 + createTime?: string;
  555 + failureReason?: string;
  556 + /**
  557 + * @description
  558 + * id
  559 + * @format int64
  560 + */
  561 + id?: number;
  562 + /**
  563 + * @description
  564 + * 发票地址
  565 + */
  566 + invoiceAddress?: string;
  567 + /**
  568 + * @description
  569 + * 发票明细
  570 + */
  571 + invoiceDetails?: Array<InvoiceDetail>;
  572 + /**
  573 + * @description
  574 + * 关联发票id
  575 + */
  576 + invoiceId?: string;
  577 + /**
  578 + * @description
  579 + * 发票号码
  580 + */
  581 + invoiceNumber?: string;
  582 + /**
  583 + * @description
  584 + * 开票人
  585 + */
  586 + invoicingPerson?: string;
  587 + /**
  588 + * @description
  589 + * 开票时间
  590 + * @format date-time
  591 + */
  592 + invoicingTime?: string;
  593 + /**
  594 + * @description
  595 + * 开具类型
  596 + */
  597 + invoicingType?: string;
  598 + /**
  599 + * @description
  600 + * 开具类型
  601 + */
  602 + invoicingTypeText?: string;
  603 + /** @format date */
  604 + invoicingdate?: string;
  605 + /**
  606 + * @description
  607 + * 是否加急
  608 + */
  609 + isUrgent?: boolean;
  610 + /**
  611 + * @description
  612 + * 是否加急文本
  613 + */
  614 + isUrgentText?: string;
  615 + logicDelete?: boolean;
  616 + /**
  617 + * @description
  618 + * 买方注册地址
  619 + */
  620 + partyAAddress?: string;
  621 + /**
  622 + * @description
  623 + * 买方开户行账号
  624 + */
  625 + partyABankAccount?: string;
  626 + /**
  627 + * @description
  628 + * 买方名称
  629 + */
  630 + partyAName?: string;
  631 + /**
  632 + * @description
  633 + * 买方开户行
  634 + */
  635 + partyAOpenBank?: string;
  636 + /**
  637 + * @description
  638 + * 买方电话号码
  639 + */
  640 + partyAPhoneNumber?: string;
  641 + /**
  642 + * @description
  643 + * 买方税号
  644 + */
  645 + partyATaxid?: string;
  646 + /**
  647 + * @description
  648 + * 抬头类型
  649 + */
  650 + partyAType?: string;
  651 + partyB?: string;
  652 + /**
  653 + * @description
  654 + * 卖方注册地址
  655 + */
  656 + partyBAddress?: string;
  657 + /**
  658 + * @description
  659 + * 卖方开户行账号
  660 + */
  661 + partyBBankAccount?: string;
  662 + /**
  663 + * @description
  664 + * 卖方名称
  665 + */
  666 + partyBName?: string;
  667 + /**
  668 + * @description
  669 + * 卖方开户行
  670 + */
  671 + partyBOpenBank?: string;
  672 + /**
  673 + * @description
  674 + * 卖方电话号码
  675 + */
  676 + partyBPhoneNumber?: string;
  677 + /**
  678 + * @description
  679 + * 卖方税号
  680 + */
  681 + partyBTaxid?: string;
  682 + /**
  683 + * @description
  684 + * 发票金额
  685 + * @format double
  686 + */
  687 + price?: number;
  688 + /**
  689 + * @description
  690 + * 接收邮箱地址
  691 + */
  692 + receiveEmail?: string;
  693 + /**
  694 + * @description
  695 + * 订单来源
  696 + */
  697 + salesCodes?: Array<string>;
  698 + /**
  699 + * @description
  700 + * 订单来源
  701 + */
  702 + salesCodesText?: string;
  703 + /**
  704 + * @description
  705 + * 开票状态
  706 + */
  707 + status?: string;
  708 + /**
  709 + * @description
  710 + * 开票状态
  711 + */
  712 + statusText?: string;
  713 + /**
  714 + * @description
  715 + * 子订单id
  716 + */
  717 + subOrderIds?: Array<number>;
  718 + /**
  719 + * @description
  720 + * 关联订单
  721 + */
  722 + subOrders?: Array<SubOrder>;
  723 + /** @format double */
  724 + totalPrice?: number;
  725 + totalPriceText?: string;
  726 + /**
  727 + * @description
  728 + * 开票类型
  729 + */
  730 + type?: string;
  731 + /**
  732 + * @description
  733 + * 开票类型文本
  734 + */
  735 + typeText?: string;
  736 + /**
  737 + * @description
  738 + * 用户id
  739 + */
  740 + uid?: string;
  741 + updateByName?: string;
  742 + /** @format date-time */
  743 + updateTime?: string;
  744 +}
  745 +
575 746 export interface AuditDto {
576 747 /**
577 748 * @description
... ... @@ -596,15 +767,11 @@ export interface AuditDto {
596 767 export interface AuditVO {
597 768 /** @format int32 */
598 769 current?: number;
599   - /** @format int32 */
600   - end?: number;
601 770 /** @format int64 */
602 771 id?: number;
603 772 /** @format int32 */
604 773 pageSize?: number;
605 774 /** @format int32 */
606   - start?: number;
607   - /** @format int32 */
608 775 status?: number;
609 776 /** @format int32 */
610 777 total?: number;
... ... @@ -674,32 +841,16 @@ export interface CancelSendOrderDto {
674 841 export interface CaptchaMessageVO {
675 842 /** @format int32 */
676 843 current?: number;
677   - /** @format int32 */
678   - end?: number;
679 844 imgCaptchaCode?: string;
680 845 imgCaptchaUuid?: string;
681 846 /** @format int32 */
682 847 pageSize?: number;
683 848 phone?: string;
684 849 /** @format int32 */
685   - start?: number;
686   - /** @format int32 */
687 850 total?: number;
688 851 type?: string;
689 852 }
690 853  
691   -export interface CommonAuditRequest {
692   - extend?: any;
693   - /**
694   - * @description
695   - * id集合
696   - */
697   - ids?: Array<string>;
698   - notes?: string;
699   - pass?: boolean;
700   - type?: string;
701   -}
702   -
703 854 export interface Contactperson {
704 855 birthday?: string;
705 856 contactAddress?: string;
... ... @@ -887,8 +1038,6 @@ export interface DictionaryQueryVO {
887 1038 dictCode?: string;
888 1039 dictName?: string;
889 1040 dictValue?: string;
890   - /** @format int32 */
891   - end?: number;
892 1041 /** @format int64 */
893 1042 id?: number;
894 1043 ids?: Array<number>;
... ... @@ -898,8 +1047,6 @@ export interface DictionaryQueryVO {
898 1047 /** @format int32 */
899 1048 sort?: number;
900 1049 /** @format int32 */
901   - start?: number;
902   - /** @format int32 */
903 1050 total?: number;
904 1051 }
905 1052  
... ... @@ -1030,28 +1177,401 @@ export interface InvoiceDto {
1030 1177 status?: string;
1031 1178 }
1032 1179  
1033   -export interface InvoiceRecordQueryRequest {
1034   - /** @format date */
1035   - createTimeGe?: string;
1036   - /** @format date */
1037   - createTimeLe?: string;
1038   - /** @format int32 */
1039   - pageNumber?: number;
1040   - /** @format int32 */
1041   - pageSize?: number;
  1180 +export interface InvoiceRecordDto {
  1181 + applyInvoicingNotes?: string;
1042 1182 /**
1043 1183 * @description
1044   - * 用户id
  1184 + * 开票备注
1045 1185 */
1046   - uid?: string;
1047   -}
1048   -
1049   -export interface Item {
1050   - billDate?: string;
1051   - billNo?: string;
1052   - entryList?: Array<Entry>;
1053   - id?: string;
1054   - remark?: string;
  1186 + comment?: string;
  1187 + /**
  1188 + * @description
  1189 + * 联系人
  1190 + */
  1191 + contacts?: string;
  1192 + /**
  1193 + * @description
  1194 + * 开票内容
  1195 + */
  1196 + content?: string;
  1197 + createByName?: string;
  1198 + /** @format date-time */
  1199 + createTime?: string;
  1200 + failureReason?: string;
  1201 + /**
  1202 + * @description
  1203 + * id
  1204 + * @format int64
  1205 + */
  1206 + id?: number;
  1207 + /**
  1208 + * @description
  1209 + * 发票地址
  1210 + */
  1211 + invoiceAddress?: string;
  1212 + /**
  1213 + * @description
  1214 + * 发票明细
  1215 + */
  1216 + invoiceDetails?: Array<InvoiceDetail>;
  1217 + /**
  1218 + * @description
  1219 + * 关联发票id
  1220 + */
  1221 + invoiceId?: string;
  1222 + /**
  1223 + * @description
  1224 + * 发票号码
  1225 + */
  1226 + invoiceNumber?: string;
  1227 + /**
  1228 + * @description
  1229 + * 开票人
  1230 + */
  1231 + invoicingPerson?: string;
  1232 + /**
  1233 + * @description
  1234 + * 开票时间
  1235 + * @format date-time
  1236 + */
  1237 + invoicingTime?: string;
  1238 + /**
  1239 + * @description
  1240 + * 开具类型
  1241 + */
  1242 + invoicingType?: string;
  1243 + /**
  1244 + * @description
  1245 + * 开具类型
  1246 + */
  1247 + invoicingTypeText?: string;
  1248 + /** @format date */
  1249 + invoicingdate?: string;
  1250 + /**
  1251 + * @description
  1252 + * 是否加急
  1253 + */
  1254 + isUrgent?: boolean;
  1255 + /**
  1256 + * @description
  1257 + * 是否加急文本
  1258 + */
  1259 + isUrgentText?: string;
  1260 + logicDelete?: boolean;
  1261 + /**
  1262 + * @description
  1263 + * 买方注册地址
  1264 + */
  1265 + partyAAddress?: string;
  1266 + /**
  1267 + * @description
  1268 + * 买方开户行账号
  1269 + */
  1270 + partyABankAccount?: string;
  1271 + /**
  1272 + * @description
  1273 + * 买方名称
  1274 + */
  1275 + partyAName?: string;
  1276 + /**
  1277 + * @description
  1278 + * 买方开户行
  1279 + */
  1280 + partyAOpenBank?: string;
  1281 + /**
  1282 + * @description
  1283 + * 买方电话号码
  1284 + */
  1285 + partyAPhoneNumber?: string;
  1286 + /**
  1287 + * @description
  1288 + * 买方税号
  1289 + */
  1290 + partyATaxid?: string;
  1291 + /**
  1292 + * @description
  1293 + * 抬头类型
  1294 + */
  1295 + partyAType?: string;
  1296 + partyB?: string;
  1297 + /**
  1298 + * @description
  1299 + * 卖方注册地址
  1300 + */
  1301 + partyBAddress?: string;
  1302 + /**
  1303 + * @description
  1304 + * 卖方开户行账号
  1305 + */
  1306 + partyBBankAccount?: string;
  1307 + /**
  1308 + * @description
  1309 + * 卖方名称
  1310 + */
  1311 + partyBName?: string;
  1312 + /**
  1313 + * @description
  1314 + * 卖方开户行
  1315 + */
  1316 + partyBOpenBank?: string;
  1317 + /**
  1318 + * @description
  1319 + * 卖方电话号码
  1320 + */
  1321 + partyBPhoneNumber?: string;
  1322 + /**
  1323 + * @description
  1324 + * 卖方税号
  1325 + */
  1326 + partyBTaxid?: string;
  1327 + /**
  1328 + * @description
  1329 + * 发票金额
  1330 + * @format double
  1331 + */
  1332 + price?: number;
  1333 + /**
  1334 + * @description
  1335 + * 接收邮箱地址
  1336 + */
  1337 + receiveEmail?: string;
  1338 + /**
  1339 + * @description
  1340 + * 订单来源
  1341 + */
  1342 + salesCodes?: Array<string>;
  1343 + /**
  1344 + * @description
  1345 + * 订单来源
  1346 + */
  1347 + salesCodesText?: string;
  1348 + /**
  1349 + * @description
  1350 + * 开票状态
  1351 + */
  1352 + status?: string;
  1353 + /**
  1354 + * @description
  1355 + * 开票状态
  1356 + */
  1357 + statusText?: string;
  1358 + /**
  1359 + * @description
  1360 + * 子订单id
  1361 + */
  1362 + subOrderIds?: Array<number>;
  1363 + /**
  1364 + * @description
  1365 + * 关联订单
  1366 + */
  1367 + subOrders?: Array<SubOrder>;
  1368 + /** @format double */
  1369 + totalPrice?: number;
  1370 + totalPriceText?: string;
  1371 + /**
  1372 + * @description
  1373 + * 开票类型
  1374 + */
  1375 + type?: string;
  1376 + /**
  1377 + * @description
  1378 + * 开票类型文本
  1379 + */
  1380 + typeText?: string;
  1381 + /**
  1382 + * @description
  1383 + * 用户id
  1384 + */
  1385 + uid?: string;
  1386 + updateByName?: string;
  1387 + /** @format date-time */
  1388 + updateTime?: string;
  1389 +}
  1390 +
  1391 +export interface InvoiceRecordQueryRequest {
  1392 + /**
  1393 + * @description
  1394 + * 联系人
  1395 + */
  1396 + contactsLike?: string;
  1397 + /** @format date-time */
  1398 + createTimeGe?: string;
  1399 + /** @format date-time */
  1400 + createTimeLe?: string;
  1401 + /** @format int32 */
  1402 + current?: number;
  1403 + /** @format int32 */
  1404 + end?: number;
  1405 + /**
  1406 + * @description
  1407 + * id
  1408 + * @format int64
  1409 + */
  1410 + id?: number;
  1411 + /**
  1412 + * @description
  1413 + * IdIn
  1414 + */
  1415 + idIn?: Array<number>;
  1416 + /**
  1417 + * @description
  1418 + * 关联发票id
  1419 + */
  1420 + invoiceId?: string;
  1421 + /**
  1422 + * @description
  1423 + * 发票号码
  1424 + */
  1425 + invoiceNumber?: string;
  1426 + /**
  1427 + * @description
  1428 + * 发票号码
  1429 + */
  1430 + invoiceNumberLike?: string;
  1431 + /**
  1432 + * @description
  1433 + * 开票时间
  1434 + * @format date-time
  1435 + */
  1436 + invoicingTimeGe?: string;
  1437 + /**
  1438 + * @description
  1439 + * 开票时间
  1440 + * @format date-time
  1441 + */
  1442 + invoicingTimeLe?: string;
  1443 + /**
  1444 + * @description
  1445 + * 开票类型
  1446 + */
  1447 + invoicingType?: string;
  1448 + /**
  1449 + * @description
  1450 + * 是否加急
  1451 + */
  1452 + isUrgent?: boolean;
  1453 + /**
  1454 + * @description
  1455 + * 订单号
  1456 + * @format int64
  1457 + */
  1458 + mainOrderId?: number;
  1459 + /**
  1460 + * @description
  1461 + * 主订单idIn
  1462 + */
  1463 + mainOrderIdIn?: Array<number>;
  1464 + /**
  1465 + * @description
  1466 + * 订单号
  1467 + */
  1468 + mainOrderIdLike?: string;
  1469 + /**
  1470 + * @description
  1471 + * 是否需要构建发票明细
  1472 + */
  1473 + needBuildDetails?: boolean;
  1474 + /**
  1475 + * @description
  1476 + * 是否需要构建发票明细
  1477 + */
  1478 + needBuildSubOrders?: boolean;
  1479 + /** @format int32 */
  1480 + pageSize?: number;
  1481 + /**
  1482 + * @description
  1483 + * 买方名称
  1484 + */
  1485 + partyANameLike?: string;
  1486 + /**
  1487 + * @description
  1488 + * 买方电话号码
  1489 + */
  1490 + partyAPhoneNumberLike?: string;
  1491 + /**
  1492 + * @description
  1493 + * 买方税号
  1494 + */
  1495 + partyATaxid?: string;
  1496 + /**
  1497 + * @description
  1498 + * 买方税号
  1499 + */
  1500 + partyATaxidLike?: string;
  1501 + partyB?: string;
  1502 + /**
  1503 + * @description
  1504 + * 卖方名称
  1505 + */
  1506 + partyBName?: string;
  1507 + /**
  1508 + * @description
  1509 + * 销售代表
  1510 + */
  1511 + salesCode?: string;
  1512 + /**
  1513 + * @description
  1514 + * 销售代表
  1515 + */
  1516 + salesCodeLike?: string;
  1517 + /** @format int32 */
  1518 + start?: number;
  1519 + /**
  1520 + * @description
  1521 + * 发票状态
  1522 + */
  1523 + status?: string;
  1524 + /**
  1525 + * @description
  1526 + * 状态非空
  1527 + */
  1528 + statusIn?: Array<string>;
  1529 + /**
  1530 + * @description
  1531 + * 状态非空
  1532 + */
  1533 + statusIsNotNull?: boolean;
  1534 + /**
  1535 + * @description
  1536 + * 状态为空
  1537 + */
  1538 + statusIsNull?: boolean;
  1539 + /**
  1540 + * @description
  1541 + * 子订单
  1542 + * @format int64
  1543 + */
  1544 + subOrderId?: number;
  1545 + /**
  1546 + * @description
  1547 + * 子订单idIn
  1548 + */
  1549 + subOrderIdIn?: Array<number>;
  1550 + /**
  1551 + * @description
  1552 + * 子订单
  1553 + */
  1554 + subOrderIdLike?: string;
  1555 + /** @format int32 */
  1556 + total?: number;
  1557 + /**
  1558 + * @description
  1559 + * 开票类型
  1560 + */
  1561 + type?: string;
  1562 + /**
  1563 + * @description
  1564 + * 用户id
  1565 + */
  1566 + uid?: string;
  1567 +}
  1568 +
  1569 +export interface Item {
  1570 + billDate?: string;
  1571 + billNo?: string;
  1572 + entryList?: Array<Entry>;
  1573 + id?: string;
  1574 + remark?: string;
1055 1575 }
1056 1576  
1057 1577 export interface ItemSaItem {
... ... @@ -1061,6 +1581,14 @@ export interface ItemSaItem {
1061 1581  
1062 1582 export interface MainOrderqueryRequest {
1063 1583 afterInvoicingStatusIsNull?: boolean;
  1584 + /** @format date */
  1585 + createDateGe?: string;
  1586 + /** @format date */
  1587 + createDateLe?: string;
  1588 + /** @format date-time */
  1589 + createTimeGe?: string;
  1590 + /** @format date-time */
  1591 + createTimeLe?: string;
1064 1592 orderStatusNotIn?: Array<string>;
1065 1593 /** @format int32 */
1066 1594 pageNumber?: number;
... ... @@ -1202,14 +1730,10 @@ export interface MeasureUnitListResRow {
1202 1730 export interface MessageQueryDTO {
1203 1731 /** @format int32 */
1204 1732 current?: number;
1205   - /** @format int32 */
1206   - end?: number;
1207 1733 isReaded?: string;
1208 1734 /** @format int32 */
1209 1735 pageSize?: number;
1210 1736 /** @format int32 */
1211   - start?: number;
1212   - /** @format int32 */
1213 1737 total?: number;
1214 1738 username?: string;
1215 1739 }
... ... @@ -1245,8 +1769,6 @@ export interface OrderAuditLogQueryVO {
1245 1769 applyId?: number;
1246 1770 /** @format int32 */
1247 1771 current?: number;
1248   - /** @format int32 */
1249   - end?: number;
1250 1772 /** @format int64 */
1251 1773 id?: number;
1252 1774 ids?: Array<number>;
... ... @@ -1256,8 +1778,6 @@ export interface OrderAuditLogQueryVO {
1256 1778 /** @format int32 */
1257 1779 pageSize?: number;
1258 1780 /** @format int32 */
1259   - start?: number;
1260   - /** @format int32 */
1261 1781 total?: number;
1262 1782 }
1263 1783  
... ... @@ -1292,8 +1812,6 @@ export interface OrderBaseInfoQueryVO {
1292 1812 customerCode?: string;
1293 1813 customerPo?: string;
1294 1814 customerStyle?: string;
1295   - /** @format int32 */
1296   - end?: number;
1297 1815 /** @format int64 */
1298 1816 id?: number;
1299 1817 ids?: Array<number>;
... ... @@ -1315,8 +1833,6 @@ export interface OrderBaseInfoQueryVO {
1315 1833 productionDepartmentConsignTime?: string;
1316 1834 projectNo?: string;
1317 1835 /** @format int32 */
1318   - start?: number;
1319   - /** @format int32 */
1320 1836 total?: number;
1321 1837 }
1322 1838  
... ... @@ -1377,8 +1893,6 @@ export interface OrderFieldLockApplyQueryVO {
1377 1893 auditUserId?: number;
1378 1894 /** @format int32 */
1379 1895 current?: number;
1380   - /** @format int32 */
1381   - end?: number;
1382 1896 fields?: string;
1383 1897 /** @format int64 */
1384 1898 id?: number;
... ... @@ -1388,8 +1902,6 @@ export interface OrderFieldLockApplyQueryVO {
1388 1902 /** @format int32 */
1389 1903 pageSize?: number;
1390 1904 /** @format int32 */
1391   - start?: number;
1392   - /** @format int32 */
1393 1905 status?: number;
1394 1906 statusList?: Array<number>;
1395 1907 /** @format int32 */
... ... @@ -1438,8 +1950,6 @@ export interface OrderInspectionStageVO {
1438 1950 export interface OrderOptLogQueryVO {
1439 1951 /** @format int32 */
1440 1952 current?: number;
1441   - /** @format int32 */
1442   - end?: number;
1443 1953 /** @format int64 */
1444 1954 id?: number;
1445 1955 ids?: Array<number>;
... ... @@ -1448,8 +1958,6 @@ export interface OrderOptLogQueryVO {
1448 1958 /** @format int32 */
1449 1959 pageSize?: number;
1450 1960 /** @format int32 */
1451   - start?: number;
1452   - /** @format int32 */
1453 1961 total?: number;
1454 1962 }
1455 1963  
... ... @@ -1499,6 +2007,12 @@ export interface OrderProfitAnalysisVo {
1499 2007 orderIds?: Array<number>;
1500 2008 }
1501 2009  
  2010 +export interface OrderProvinceVo {
  2011 + /** @format int32 */
  2012 + pid?: number;
  2013 + province?: string;
  2014 +}
  2015 +
1502 2016 export interface OrderStageFileDo {
1503 2017 file?: File;
1504 2018 }
... ... @@ -1645,6 +2159,20 @@ export interface OrderUpdateVO {
1645 2159 trackStageInfo?: OrderTrackStageVO;
1646 2160 }
1647 2161  
  2162 +export interface OrderUserVo {
  2163 + /** @format int32 */
  2164 + uid?: number;
  2165 + userName?: string;
  2166 +}
  2167 +
  2168 +export interface OrderZoNingProvinceUserDo {
  2169 + /** @format int32 */
  2170 + id?: number;
  2171 + orderProvinceVoList?: Array<OrderProvinceVo>;
  2172 + orderUserVoList?: Array<OrderUserVo>;
  2173 + zoning?: string;
  2174 +}
  2175 +
1648 2176 export interface ProcureConvertProcureDto {
1649 2177 /**
1650 2178 * @description
... ... @@ -1735,8 +2263,6 @@ export interface QueryBankStatementDto {
1735 2263 collectionDatetimeEnd?: string;
1736 2264 /** @format int32 */
1737 2265 current?: number;
1738   - /** @format int32 */
1739   - end?: number;
1740 2266 /** @format int64 */
1741 2267 id?: number;
1742 2268 /** @format int32 */
... ... @@ -1758,8 +2284,6 @@ export interface QueryBankStatementDto {
1758 2284 remark?: string;
1759 2285 remarkNote?: string;
1760 2286 serialNumber?: string;
1761   - /** @format int32 */
1762   - start?: number;
1763 2287 status?: string;
1764 2288 /** @format int32 */
1765 2289 total?: number;
... ... @@ -1805,367 +2329,240 @@ export interface QueryInvoiceDetailDto {
1805 2329 invoiceId?: number;
1806 2330 }
1807 2331  
1808   -export interface QueryMainOrderDto {
1809   - /**
1810   - * @description
1811   - * 收货人姓名
1812   - */
1813   - customerName?: string;
1814   -}
1815   -
1816   -export interface QueryReportFormsDto {
1817   - /**
1818   - * @description
1819   - * 是否包含实验设备事业部
1820   - */
1821   - includeExperimentalEquipment?: boolean;
1822   - /**
1823   - * @description
1824   - * 最大金额
1825   - * @example
1826   - * 2343
1827   - */
1828   - maxAccount?: number;
1829   - /**
1830   - * @description
1831   - * 所属部门
1832   - */
1833   - productBelongBusiness?: string;
1834   - /**
1835   - * @description
1836   - * 销售代表
1837   - */
1838   - salesCode?: string;
1839   - /**
1840   - * @description
1841   - * 统计方式
1842   - */
1843   - statisticsMethod?: string;
1844   -}
1845   -
1846   -export interface ReissueInvoiceDto {
1847   - /** @format int64 */
1848   - invoiceId?: number;
1849   - notes?: string;
1850   -}
1851   -
1852   -export interface ResearchGroupAccountAddRequest {
1853   - /**
1854   - * @description
1855   - * 关联的账号id
1856   - * @format int64
1857   - */
1858   - accountId?: number;
1859   - /**
1860   - * @description
1861   - * 关联的账号名称
1862   - */
1863   - accountName?: string;
1864   - /**
1865   - * @description
1866   - * 关联的账号手机号
1867   - */
1868   - accountPhone?: string;
1869   - /**
1870   - * @description
1871   - * 课题组id
1872   - * @format int64
1873   - */
1874   - groupId?: number;
1875   -}
1876   -
1877   -export interface ResearchGroupAccountEditRequest {
1878   - /**
1879   - * @description
1880   - * 关联的账号id
1881   - * @format int64
1882   - */
1883   - accountId?: number;
1884   - /**
1885   - * @description
1886   - * 关联的账号名称
1887   - */
1888   - accountName?: string;
1889   - /**
1890   - * @description
1891   - * 关联的账号手机号
1892   - */
1893   - accountPhone?: string;
1894   - /**
1895   - * @description
1896   - * 课题组id
1897   - * @format int64
1898   - */
1899   - groupId?: number;
1900   - /**
1901   - * @description
1902   - * 主键id
1903   - * @format int64
1904   - */
1905   - id?: number;
1906   -}
1907   -
1908   -export interface ResearchGroupAddRequest {
1909   - accounts?: Array<ResearchGroupAccountAddRequest>;
1910   - /**
1911   - * @description
1912   - * 课题组名称
1913   - */
1914   - group?: string;
1915   - /**
1916   - * @description
1917   - * 课题组负责人
1918   - */
1919   - leader?: string;
1920   - members?: Array<ResearchGroupMemberAddRequest>;
  2332 +export interface QueryInvoiceProjectDto {
  2333 + /** @format int32 */
  2334 + current?: number;
  2335 + /** @format int32 */
  2336 + end?: number;
  2337 + nameLike?: string;
  2338 + /** @format int32 */
  2339 + pageSize?: number;
  2340 + /** @format int32 */
  2341 + start?: number;
  2342 + /** @format int32 */
  2343 + total?: number;
1921 2344 }
1922 2345  
1923   -export interface ResearchGroupDeleteRequest {
  2346 +export interface QueryInvoiceRecordDto {
1924 2347 /**
1925 2348 * @description
1926   - * 主键id
  2349 + * 联系人
1927 2350 */
1928   - ids?: Array<number>;
1929   -}
1930   -
1931   -export interface ResearchGroupDetailRequest {
  2351 + contactsLike?: string;
  2352 + /** @format date-time */
  2353 + createTimeGe?: string;
  2354 + /** @format date-time */
  2355 + createTimeLe?: string;
  2356 + /** @format int32 */
  2357 + current?: number;
  2358 + /** @format int32 */
  2359 + end?: number;
1932 2360 /**
1933 2361 * @description
1934   - * 主键id
  2362 + * id
1935 2363 * @format int64
1936 2364 */
1937 2365 id?: number;
1938   -}
1939   -
1940   -export interface ResearchGroupEditRequest {
1941 2366 /**
1942 2367 * @description
1943   - * 课题组预存账号
  2368 + * IdIn
1944 2369 */
1945   - accounts?: Array<ResearchGroupAccountEditRequest>;
  2370 + idIn?: Array<number>;
1946 2371 /**
1947 2372 * @description
1948   - * 课题组名称
  2373 + * 关联发票id
1949 2374 */
1950   - group?: string;
  2375 + invoiceId?: string;
1951 2376 /**
1952 2377 * @description
1953   - * 主键id
1954   - * @format int64
  2378 + * 发票号码
1955 2379 */
1956   - id?: number;
  2380 + invoiceNumber?: string;
1957 2381 /**
1958 2382 * @description
1959   - * 课题组负责人
  2383 + * 发票号码
1960 2384 */
1961   - leader?: string;
  2385 + invoiceNumberLike?: string;
1962 2386 /**
1963 2387 * @description
1964   - * 课题组成员集合
  2388 + * 开票时间
  2389 + * @format date-time
1965 2390 */
1966   - members?: Array<ResearchGroupMemberEditRequest>;
1967   -}
1968   -
1969   -export interface ResearchGroupListRequest {
  2391 + invoicingTimeGe?: string;
1970 2392 /**
1971 2393 * @description
1972   - * 预存账号手机号
  2394 + * 开票时间
  2395 + * @format date-time
1973 2396 */
1974   - accountPhone?: string;
1975   - /** @format int32 */
1976   - current?: number;
1977   - /** @format int32 */
1978   - end?: number;
  2397 + invoicingTimeLe?: string;
1979 2398 /**
1980 2399 * @description
1981   - * 课题组名称
  2400 + * 开票类型
1982 2401 */
1983   - groupName?: string;
  2402 + invoicingType?: string;
1984 2403 /**
1985 2404 * @description
1986   - * 课题组负责人
  2405 + * 是否加急
1987 2406 */
1988   - leaderName?: string;
  2407 + isUrgent?: boolean;
1989 2408 /**
1990 2409 * @description
1991   - * 课题组成员名称
  2410 + * 订单号
  2411 + * @format int64
1992 2412 */
1993   - memberName?: string;
  2413 + mainOrderId?: number;
1994 2414 /**
1995 2415 * @description
1996   - * 课题组成员手机号
  2416 + * 主订单idIn
1997 2417 */
1998   - memberPhone?: string;
1999   - /** @format int32 */
2000   - pageSize?: number;
2001   - /** @format int32 */
2002   - start?: number;
2003   - /** @format int32 */
2004   - total?: number;
2005   -}
2006   -
2007   -export interface ResearchGroupMemberAddRequest {
  2418 + mainOrderIdIn?: Array<number>;
2008 2419 /**
2009 2420 * @description
2010   - * 课题组ID
2011   - * @format int64
  2421 + * 订单号
2012 2422 */
2013   - groupId?: number;
  2423 + mainOrderIdLike?: string;
2014 2424 /**
2015 2425 * @description
2016   - * 成员名称
  2426 + * 是否需要构建发票明细
2017 2427 */
2018   - memberName?: string;
  2428 + needBuildDetails?: boolean;
2019 2429 /**
2020 2430 * @description
2021   - * 成员手机号
  2431 + * 是否需要构建发票明细
2022 2432 */
2023   - memberPhone?: string;
2024   -}
2025   -
2026   -export interface ResearchGroupMemberEditRequest {
  2433 + needBuildSubOrders?: boolean;
  2434 + /** @format int32 */
  2435 + pageSize?: number;
2027 2436 /**
2028 2437 * @description
2029   - * 课题组ID
2030   - * @format int64
  2438 + * 买方名称
2031 2439 */
2032   - groupId?: number;
  2440 + partyANameLike?: string;
2033 2441 /**
2034 2442 * @description
2035   - * 主键id
2036   - * @format int64
  2443 + * 买方电话号码
2037 2444 */
2038   - id?: number;
  2445 + partyAPhoneNumberLike?: string;
2039 2446 /**
2040 2447 * @description
2041   - * 成员名称
  2448 + * 买方税号
2042 2449 */
2043   - memberName?: string;
  2450 + partyATaxid?: string;
2044 2451 /**
2045 2452 * @description
2046   - * 成员手机号
  2453 + * 买方税号
2047 2454 */
2048   - memberPhone?: string;
2049   -}
2050   -
2051   -export interface ResearchGroupMemberRequestAddRequest {
  2455 + partyATaxidLike?: string;
  2456 + partyB?: string;
2052 2457 /**
2053 2458 * @description
2054   - * 课题组ID
2055   - * @format int64
  2459 + * 卖方名称
2056 2460 */
2057   - groupId?: number;
  2461 + partyBName?: string;
2058 2462 /**
2059 2463 * @description
2060   - * 课题组名称
  2464 + * 销售代表
2061 2465 */
2062   - groupName?: string;
2063   - members?: Array<ResearchGroupMemberAddRequest>;
  2466 + salesCode?: string;
2064 2467 /**
2065 2468 * @description
2066   - * 申请备注
  2469 + * 销售代表
2067 2470 */
2068   - requestNotes?: string;
2069   -}
2070   -
2071   -export interface ResearchGroupMemberRequestDeleteRequest {
  2471 + salesCodeLike?: string;
  2472 + /** @format int32 */
  2473 + start?: number;
2072 2474 /**
2073 2475 * @description
2074   - * 主键id
  2476 + * 发票状态
2075 2477 */
2076   - ids?: Array<number>;
2077   -}
2078   -
2079   -export interface ResearchGroupMemberRequestDetailRequest {
  2478 + status?: string;
2080 2479 /**
2081 2480 * @description
2082   - * 主键id
2083   - * @format int64
  2481 + * 状态非空
2084 2482 */
2085   - id?: number;
2086   -}
2087   -
2088   -export interface ResearchGroupMemberRequestEditRequest {
  2483 + statusIn?: Array<string>;
2089 2484 /**
2090 2485 * @description
2091   - * 课题组ID
2092   - * @format int64
  2486 + * 状态非空
2093 2487 */
2094   - groupId?: number;
  2488 + statusIsNotNull?: boolean;
2095 2489 /**
2096 2490 * @description
2097   - * 课题组名称
  2491 + * 状态为空
2098 2492 */
2099   - groupName?: string;
  2493 + statusIsNull?: boolean;
2100 2494 /**
2101 2495 * @description
2102   - * 主键id
  2496 + * 子订单
2103 2497 * @format int64
2104 2498 */
2105   - id?: number;
  2499 + subOrderId?: number;
2106 2500 /**
2107 2501 * @description
2108   - * 成员名称
  2502 + * 子订单idIn
2109 2503 */
2110   - memberName?: string;
  2504 + subOrderIdIn?: Array<number>;
2111 2505 /**
2112 2506 * @description
2113   - * 成员手机号
  2507 + * 子订单
2114 2508 */
2115   - memberPhone?: string;
  2509 + subOrderIdLike?: string;
  2510 + /** @format int32 */
  2511 + total?: number;
2116 2512 /**
2117 2513 * @description
2118   - * 申请备注
  2514 + * 开票类型
2119 2515 */
2120   - requestNotes?: string;
2121   -}
2122   -
2123   -export interface ResearchGroupMemberRequestsRequest {
  2516 + type?: string;
2124 2517 /**
2125 2518 * @description
2126   - * 审核备注
  2519 + * 用户id
2127 2520 */
2128   - auditNotes?: string;
  2521 + uid?: string;
  2522 +}
  2523 +
  2524 +export interface QueryMainOrderDto {
2129 2525 /**
2130 2526 * @description
2131   - * 审核状态
  2527 + * 收货人姓名
2132 2528 */
2133   - auditStatus?: string;
  2529 + customerName?: string;
  2530 +}
  2531 +
  2532 +export interface QueryReportFormsDto {
2134 2533 /**
2135 2534 * @description
2136   - * 创建人
  2535 + * 是否包含实验设备事业部
2137 2536 */
2138   - createByName?: string;
2139   - /** @format int32 */
2140   - current?: number;
2141   - /** @format int32 */
2142   - end?: number;
  2537 + includeExperimentalEquipment?: boolean;
2143 2538 /**
2144 2539 * @description
2145   - * 课题组名称
  2540 + * 最大金额
  2541 + * @example
  2542 + * 2343
2146 2543 */
2147   - groupName?: string;
  2544 + maxAccount?: number;
2148 2545 /**
2149 2546 * @description
2150   - * 成员名称
  2547 + * 所属部门
2151 2548 */
2152   - memberName?: string;
  2549 + productBelongBusiness?: string;
2153 2550 /**
2154 2551 * @description
2155   - * 成员手机号
  2552 + * 销售代表
2156 2553 */
2157   - memberPhone?: string;
2158   - /** @format int32 */
2159   - pageSize?: number;
  2554 + salesCode?: string;
2160 2555 /**
2161 2556 * @description
2162   - * 申请备注
  2557 + * 统计方式
2163 2558 */
2164   - requestNotes?: string;
2165   - /** @format int32 */
2166   - start?: number;
2167   - /** @format int32 */
2168   - total?: number;
  2559 + statisticsMethod?: string;
  2560 +}
  2561 +
  2562 +export interface ReissueInvoiceDto {
  2563 + /** @format int64 */
  2564 + invoiceId?: number;
  2565 + notes?: string;
2169 2566 }
2170 2567  
2171 2568 export interface ResetPwdVO {
... ... @@ -2207,14 +2604,134 @@ export interface ShippingWarehouseChangeDto {
2207 2604 shippingWarehouse?: string;
2208 2605 }
2209 2606  
  2607 +export interface SubOrder {
  2608 + afterInvoicingStatus?: string;
  2609 + /** @format date-time */
  2610 + afterInvoicingStatusUpdateTime?: string;
  2611 + afterSalesAnnex?: string;
  2612 + afterSalesNotes?: string;
  2613 + afterSalesPlan?: string;
  2614 + annex?: string;
  2615 + applyInvoicingAnnex?: string;
  2616 + applyInvoicingNotes?: string;
  2617 + /** @format date-time */
  2618 + applyTime?: string;
  2619 + /** @format int32 */
  2620 + attrId?: number;
  2621 + checkNotes?: string;
  2622 + /** @format date-time */
  2623 + collectMoneyTime?: string;
  2624 + confirmDeliverNotes?: string;
  2625 + confirmReissueNotes?: string;
  2626 + createByName?: string;
  2627 + /** @format date-time */
  2628 + createTime?: string;
  2629 + /** @format date-time */
  2630 + deadline?: string;
  2631 + ext?: string;
  2632 + extendField?: string;
  2633 + /** @format date-time */
  2634 + financialReceiptIssuanceTime?: string;
  2635 + fullPaymentStatus?: string;
  2636 + /** @format double */
  2637 + goodsVolume?: number;
  2638 + /** @format double */
  2639 + goodsWeight?: number;
  2640 + /** @format int64 */
  2641 + id?: number;
  2642 + image?: string;
  2643 + invoiceApplyUsername?: string;
  2644 + invoiceInformation?: string;
  2645 + /** @format int64 */
  2646 + invoiceRecordId?: number;
  2647 + invoicingCheckAnnex?: string;
  2648 + invoicingNotes?: string;
  2649 + invoicingStatus?: string;
  2650 + /** @format date-time */
  2651 + invoicingTime?: string;
  2652 + invoicingUrgentCause?: string;
  2653 + isUrgent?: boolean;
  2654 + kingdeeErrorMessage?: string;
  2655 + logicDelete?: boolean;
  2656 + logisticsMethod?: string;
  2657 + logisticsNotes?: string;
  2658 + /** @format int64 */
  2659 + mainOrderAmountProportion?: number;
  2660 + /** @format int64 */
  2661 + mainOrderId?: number;
  2662 + materialId?: string;
  2663 + modified?: boolean;
  2664 + modifiedAuditNotes?: string;
  2665 + modifiedAuditStatus?: string;
  2666 + modifiedOptFlag?: string;
  2667 + nextOrderStatus?: string;
  2668 + notes?: string;
  2669 + orderStatus?: string;
  2670 + orderStatusBeforeModify?: string;
  2671 + /** @format date-time */
  2672 + orderStatusUpdateTime?: string;
  2673 + /** @format int32 */
  2674 + packageNumber?: number;
  2675 + parameters?: string;
  2676 + paymentChannel?: string;
  2677 + paymentMethod?: string;
  2678 + paymentReceiptAnnex?: string;
  2679 + paymentReceiptNotes?: string;
  2680 + paymentReceiptStatus?: string;
  2681 + paymentStatus?: string;
  2682 + paymentTransactionId?: string;
  2683 + postAuditNotes?: string;
  2684 + postAuditStatus?: string;
  2685 + /** @format date-time */
  2686 + postAuditStatusUpdateTime?: string;
  2687 + preAfterInvoicingStatus?: string;
  2688 + procureConvertNotes?: string;
  2689 + procureNotes?: string;
  2690 + /** @format date-time */
  2691 + procureOrderDatetime?: string;
  2692 + procureOrderStatus?: string;
  2693 + productBelongBusiness?: string;
  2694 + productCode?: string;
  2695 + /** @format int32 */
  2696 + productId?: number;
  2697 + productName?: string;
  2698 + /** @format int64 */
  2699 + productPrice?: number;
  2700 + /** @format date-time */
  2701 + productionEndTime?: string;
  2702 + /** @format date-time */
  2703 + productionStartTime?: string;
  2704 + productionTimePushStatus?: string;
  2705 + /** @format int32 */
  2706 + quantity?: number;
  2707 + receivingCompany?: string;
  2708 + reissueNotes?: string;
  2709 + serialNumber?: string;
  2710 + shippingWarehouse?: string;
  2711 + /** @format int64 */
  2712 + subOrderPayment?: number;
  2713 + supplierName?: string;
  2714 + supplierNotes?: string;
  2715 + /** @format int64 */
  2716 + totalPayment?: number;
  2717 + /** @format int32 */
  2718 + uid?: number;
  2719 + unit?: string;
  2720 + unitId?: string;
  2721 + updateByName?: string;
  2722 + /** @format date-time */
  2723 + updateTime?: string;
  2724 + urgentInvoiceAuditNotes?: string;
  2725 + /** @format int32 */
  2726 + version?: number;
  2727 +}
  2728 +
2210 2729 export interface SysLogQueryVO {
2211 2730 address?: string;
2212 2731 browser?: string;
2213 2732 /** @format int32 */
2214 2733 current?: number;
2215 2734 description?: string;
2216   - /** @format int32 */
2217   - end?: number;
2218 2735 exceptionDetail?: string;
2219 2736 /** @format int64 */
2220 2737 id?: number;
... ... @@ -2225,8 +2742,6 @@ export interface SysLogQueryVO {
2225 2742 pageSize?: number;
2226 2743 params?: string;
2227 2744 requestIp?: string;
2228   - /** @format int32 */
2229   - start?: number;
2230 2745 /** @format int64 */
2231 2746 time?: number;
2232 2747 /** @format int32 */
... ... @@ -2390,12 +2905,8 @@ export interface UserCenterInfoRequest {
2390 2905 /** @format int32 */
2391 2906 current?: number;
2392 2907 /** @format int32 */
2393   - end?: number;
2394   - /** @format int32 */
2395 2908 pageSize?: number;
2396 2909 /** @format int32 */
2397   - start?: number;
2398   - /** @format int32 */
2399 2910 total?: number;
2400 2911 /**
2401 2912 * @description
... ... @@ -2415,8 +2926,6 @@ export interface UserDetailRequest {
2415 2926 /** @format int32 */
2416 2927 current?: number;
2417 2928 /** @format int32 */
2418   - end?: number;
2419   - /** @format int32 */
2420 2929 pageSize?: number;
2421 2930 /**
2422 2931 * @description
... ... @@ -2424,8 +2933,6 @@ export interface UserDetailRequest {
2424 2933 */
2425 2934 phone?: string;
2426 2935 /** @format int32 */
2427   - start?: number;
2428   - /** @format int32 */
2429 2936 total?: number;
2430 2937 /**
2431 2938 * @description
... ... @@ -2442,8 +2949,6 @@ export interface UserListRequest {
2442 2949 * 创建日期开始时间
2443 2950 */
2444 2951 dateLimit?: string;
2445   - /** @format int32 */
2446   - end?: number;
2447 2952 /**
2448 2953 * @description
2449 2954 * 单位
... ... @@ -2468,23 +2973,10 @@ export interface UserListRequest {
2468 2973 phone?: string;
2469 2974 /**
2470 2975 * @description
2471   - * phones
2472   - */
2473   - phones?: Array<string>;
2474   - /**
2475   - * @description
2476   - * 内部订单系统课题组id
2477   - * @format int64
2478   - */
2479   - researchGroupId?: number;
2480   - /**
2481   - * @description
2482 2976 * salesCode
2483 2977 */
2484 2978 salesCode?: string;
2485 2979 /** @format int32 */
2486   - start?: number;
2487   - /** @format int32 */
2488 2980 total?: number;
2489 2981 /**
2490 2982 * @description
... ... @@ -2494,23 +2986,11 @@ export interface UserListRequest {
2494 2986 uid?: number;
2495 2987 /**
2496 2988 * @description
2497   - * ids
2498   - */
2499   - uids?: Array<number>;
2500   - /**
2501   - * @description
2502 2989 * 用户名
2503 2990 */
2504 2991 username?: string;
2505 2992 }
2506 2993  
2507   -export interface UserNowMoneyCheckRequest {
2508   - phone?: string;
2509   - subPrice?: number;
2510   - /** @format int64 */
2511   - uid?: number;
2512   -}
2513   -
2514 2994 export interface View {
2515 2995 contentType?: string;
2516 2996 }
... ... @@ -2559,6 +3039,44 @@ export interface TsgFile {
2559 3039 writable?: boolean;
2560 3040 }
2561 3041  
  3042 +export interface InvoiceDetail {
  3043 + /** @format int64 */
  3044 + id?: number;
  3045 + /**
  3046 + * @description
  3047 + * 发票id
  3048 + * @format int64
  3049 + */
  3050 + invoiceRecordId?: number;
  3051 + /**
  3052 + * @description
  3053 + * 单价
  3054 + * @format double
  3055 + */
  3056 + price?: number;
  3057 + projectName?: string;
  3058 + /** @format double */
  3059 + quantity?: number;
  3060 + /**
  3061 + * @description
  3062 + * 型号
  3063 + */
  3064 + specification?: string;
  3065 + /** @format int64 */
  3066 + subOrderId?: number;
  3067 + /** @format double */
  3068 + taxPrice?: number;
  3069 + /** @format double */
  3070 + taxRate?: number;
  3071 + /**
  3072 + * @description
  3073 + * 总价
  3074 + * @format double
  3075 + */
  3076 + totalPrice?: number;
  3077 + unit?: string;
  3078 +}
  3079 +
2562 3080 export interface SalesRechargePrepaymentAuditRequest {
2563 3081 /**
2564 3082 * @description
... ... @@ -2575,11 +3093,6 @@ export interface SalesRechargePrepaymentAuditRequest {
2575 3093 * 是否通过
2576 3094 */
2577 3095 pass?: boolean;
2578   - /**
2579   - * @description
2580   - * 手机号
2581   - */
2582   - phone?: string;
2583 3096 }
2584 3097  
2585 3098 export interface SalesRechargePrepaymentCreateRequest {
... ... @@ -2685,8 +3198,6 @@ export interface SalesRechargePrepaymentRequest {
2685 3198 * @format int32
2686 3199 */
2687 3200 enableFlag?: number;
2688   - /** @format int32 */
2689   - end?: number;
2690 3201 /**
2691 3202 * @description
2692 3203 * id
... ... @@ -2731,8 +3242,6 @@ export interface SalesRechargePrepaymentRequest {
2731 3242 * 销售代表
2732 3243 */
2733 3244 salesCode?: string;
2734   - /** @format int32 */
2735   - start?: number;
2736 3245 /**
2737 3246 * @description
2738 3247 * 状态
... ... @@ -2911,38 +3420,6 @@ export interface TsgURL {
2911 3420 userInfo?: string;
2912 3421 }
2913 3422  
2914   -/**
2915   - * @description
2916   - * 保存用户地址请求对象
2917   - */
2918   -export interface UserAddressSaveRequest {
2919   - /**
2920   - * @description
2921   - * 联系电话
2922   - */
2923   - customerContactNumber: string;
2924   - /**
2925   - * @description
2926   - * 客户姓名
2927   - */
2928   - customerName: string;
2929   - /**
2930   - * @description
2931   - * 收货地址
2932   - */
2933   - customerShippingAddress?: string;
2934   - /**
2935   - * @description
2936   - * 客户单位
2937   - */
2938   - institution?: string;
2939   - /**
2940   - * @description
2941   - * 课题组老师
2942   - */
2943   - institutionContactName?: string;
2944   -}
2945   -
2946 3423 export interface UploadPaymentReceiptDTO {
2947 3424 /**
2948 3425 * @description
... ...