Commit b559cda33d6f98a8a322240b0a5906dedfa06939

Authored by 凌世锦
1 parent 4e743bb5

feat: update省市区

Too many changes to show.

To preserve performance only 7 of 8 files are displayed.

src/pages/Order/components/FinancialDrawer.tsx
1 -// import { PlusOutlined } from '@ant-design/icons';  
2 import { RESPONSE_CODE } from '@/constants/enum'; 1 import { RESPONSE_CODE } from '@/constants/enum';
3 import { 2 import {
4 postServiceOrderEditOrder, 3 postServiceOrderEditOrder,
src/pages/Order/components/FinancialEditDrawer.tsx
1 -// import { PlusOutlined } from '@ant-design/icons';  
2 import { RESPONSE_CODE } from '@/constants/enum'; 1 import { RESPONSE_CODE } from '@/constants/enum';
3 import { postServiceOrderNoNeedInvoicingEdit } from '@/services'; 2 import { postServiceOrderNoNeedInvoicingEdit } from '@/services';
4 import { enumToSelect } from '@/utils'; 3 import { enumToSelect } from '@/utils';
src/pages/Order/components/FinancialMergeDrawer.tsx
1 -// import { PlusOutlined } from '@ant-design/icons';  
2 import { RESPONSE_CODE } from '@/constants/enum'; 1 import { RESPONSE_CODE } from '@/constants/enum';
3 import { enumToSelect } from '@/utils'; 2 import { enumToSelect } from '@/utils';
4 import { 3 import {
src/pages/Order/components/OrderDrawer copy.tsx
@@ -647,6 +647,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -647,6 +647,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
647 const res = await postKingdeeRepCustomer({ 647 const res = await postKingdeeRepCustomer({
648 data: { search: keywords }, 648 data: { search: keywords },
649 }); 649 });
  650 + console.log(res);
  651 +
650 let options = res?.rows?.map((c: any) => { 652 let options = res?.rows?.map((c: any) => {
651 return { 653 return {
652 ...c, 654 ...c,
src/pages/Order/components/OrderDrawer.tsx
@@ -3,8 +3,10 @@ import { @@ -3,8 +3,10 @@ import {
3 postCanrdApiUserAddressList, 3 postCanrdApiUserAddressList,
4 postCanrdApiUserDetail, 4 postCanrdApiUserDetail,
5 postCanrdApiUserNowMoneyCheck, 5 postCanrdApiUserNowMoneyCheck,
6 - postDistrictSelectBelongByName, 6 + postDistrictAddOrderAndProvince,
7 postDistrictSelectByLevel, 7 postDistrictSelectByLevel,
  8 + postDistrictSelectByNameAndLevel,
  9 + postDistrictSelOrderProvince,
8 postKingdeeRepCustomerDetail, 10 postKingdeeRepCustomerDetail,
9 postKingdeeRepMaterial, 11 postKingdeeRepMaterial,
10 postKingdeeRepMaterialUnit, 12 postKingdeeRepMaterialUnit,
@@ -17,15 +19,15 @@ import { @@ -17,15 +19,15 @@ import {
17 postServiceOrderUpdateOrder, 19 postServiceOrderUpdateOrder,
18 } from '@/services'; 20 } from '@/services';
19 import { 21 import {
  22 + enumToSelect,
20 FloatAdd, 23 FloatAdd,
21 FloatMul, 24 FloatMul,
22 - enumToSelect,  
23 getAliYunOSSFileNameFromUrl, 25 getAliYunOSSFileNameFromUrl,
24 getUserInfo, 26 getUserInfo,
25 } from '@/utils'; 27 } from '@/utils';
26 -import { getDefaultString } from '@/utils/StringUtil';  
27 import { getTeacherCustomFieldNumber } from '@/utils/kingdee'; 28 import { getTeacherCustomFieldNumber } from '@/utils/kingdee';
28 import { getSalesCodeOptions } from '@/utils/order'; 29 import { getSalesCodeOptions } from '@/utils/order';
  30 +import { getDefaultString } from '@/utils/StringUtil';
29 import { 31 import {
30 DrawerForm, 32 DrawerForm,
31 FormListActionType, 33 FormListActionType,
@@ -38,7 +40,7 @@ import { @@ -38,7 +40,7 @@ import {
38 ProFormTextArea, 40 ProFormTextArea,
39 ProFormUploadDragger, 41 ProFormUploadDragger,
40 } from '@ant-design/pro-components'; 42 } from '@ant-design/pro-components';
41 -import { Button, Form, Modal, message } from 'antd'; 43 +import { Button, Form, message, Modal } from 'antd';
42 import { cloneDeep } from 'lodash'; 44 import { cloneDeep } from 'lodash';
43 import { useEffect, useRef, useState } from 'react'; 45 import { useEffect, useRef, useState } from 'react';
44 import { 46 import {
@@ -879,6 +881,17 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -879,6 +881,17 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
879 //新增 881 //新增
880 if (optType('add') || optType('copy')) { 882 if (optType('add') || optType('copy')) {
881 res = await postServiceOrderAddOrder({ data: values }); 883 res = await postServiceOrderAddOrder({ data: values });
  884 + if (res && res.data.length === 2) {
  885 + const orderMainProDo = {
  886 + oId: res.data[0],
  887 + province: province,
  888 + city: city,
  889 + district: district,
  890 + };
  891 + await postDistrictAddOrderAndProvince({
  892 + data: orderMainProDo,
  893 + });
  894 + }
882 } 895 }
883 //修改或者申请售后或者申请修改 896 //修改或者申请售后或者申请修改
884 if ( 897 if (
@@ -1115,9 +1128,24 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -1115,9 +1128,24 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1115 key: c.id, 1128 key: c.id,
1116 }; 1129 };
1117 }); 1130 });
1118 - console.log(form.getFieldsValue());  
1119 - console.log(form.getFieldValue('customerName')); 1131 + console.log(form.getFieldValue('customerShippingAddress'));
  1132 + console.log(form.getFieldValue('id'));
  1133 + if (form.getFieldValue('id') !== undefined) {
  1134 + const resp = await postDistrictSelOrderProvince({
  1135 + data: form.getFieldValue('id'),
  1136 + });
  1137 + console.log();
  1138 +
  1139 + setProvince(resp.data.province);
  1140 + form.setFieldValue('province', resp.data.province);
  1141 + setCity(resp.data.city);
  1142 + form.setFieldValue('city', resp.data.city);
  1143 + setDistrict(resp.data.district);
  1144 + form.setFieldValue('district', resp.data.district);
  1145 + console.log(form.getFieldsValue());
  1146 + }
1120 //判断如果是在修改或者复制,那么第一次请求的时候,默认生成当前收货人信息的option 1147 //判断如果是在修改或者复制,那么第一次请求的时候,默认生成当前收货人信息的option
  1148 +
1121 let realName = form.getFieldValue('customerName'); 1149 let realName = form.getFieldValue('customerName');
1122 let detail = form.getFieldValue('customerShippingAddress'); 1150 let detail = form.getFieldValue('customerShippingAddress');
1123 let institution = form.getFieldValue('institution'); 1151 let institution = form.getFieldValue('institution');
@@ -1195,11 +1223,14 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -1195,11 +1223,14 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1195 key="province" 1223 key="province"
1196 width={100} 1224 width={100}
1197 label="省" 1225 label="省"
  1226 + allowClear={false}
1198 fieldProps={{ 1227 fieldProps={{
1199 labelInValue: true, 1228 labelInValue: true,
1200 }} 1229 }}
1201 onChange={(value) => { 1230 onChange={(value) => {
1202 - setProvince(value?.value); 1231 + if (value !== undefined || value !== null) {
  1232 + setProvince(value?.value);
  1233 + }
1203 }} 1234 }}
1204 placeholder="请选择" 1235 placeholder="请选择"
1205 rules={[ 1236 rules={[
@@ -1224,13 +1255,16 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -1224,13 +1255,16 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1224 name="city" 1255 name="city"
1225 width={100} 1256 width={100}
1226 label="市" 1257 label="市"
  1258 + allowClear={false}
1227 disabled={province === ''} 1259 disabled={province === ''}
1228 fieldProps={{ 1260 fieldProps={{
1229 labelInValue: true, 1261 labelInValue: true,
1230 }} 1262 }}
1231 placeholder="请选择" 1263 placeholder="请选择"
1232 onChange={(value) => { 1264 onChange={(value) => {
1233 - setCity(value?.value); 1265 + if (value !== undefined || value !== null) {
  1266 + setCity(value?.value);
  1267 + }
1234 }} 1268 }}
1235 rules={[ 1269 rules={[
1236 { 1270 {
@@ -1241,8 +1275,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -1241,8 +1275,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1241 request={async () => { 1275 request={async () => {
1242 if (province !== '') { 1276 if (province !== '') {
1243 let cityOptions = []; 1277 let cityOptions = [];
1244 - let res = await postDistrictSelectBelongByName({  
1245 - data: province, 1278 + let res = await postDistrictSelectByNameAndLevel({
  1279 + data: { district: province, level: 1 },
1246 }); 1280 });
1247 if (res && res.data) { 1281 if (res && res.data) {
1248 cityOptions = res.data.map((item) => ({ 1282 cityOptions = res.data.map((item) => ({
@@ -1260,8 +1294,11 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -1260,8 +1294,11 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1260 name="district" 1294 name="district"
1261 width={100} 1295 width={100}
1262 label="区" 1296 label="区"
  1297 + allowClear={false}
1263 onChange={(value) => { 1298 onChange={(value) => {
1264 - setDistrict(value?.value); 1299 + if (value !== undefined || value !== null) {
  1300 + setDistrict(value?.value);
  1301 + }
1265 }} 1302 }}
1266 disabled={city === ''} 1303 disabled={city === ''}
1267 fieldProps={{ 1304 fieldProps={{
@@ -1275,9 +1312,13 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -1275,9 +1312,13 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1275 }, 1312 },
1276 ]} 1313 ]}
1277 request={async () => { 1314 request={async () => {
  1315 + console.log(form.getFieldsValue());
  1316 +
1278 if (city !== '') { 1317 if (city !== '') {
1279 let districtOptions = []; 1318 let districtOptions = [];
1280 - let res = await postDistrictSelectBelongByName({ data: city }); 1319 + let res = await postDistrictSelectByNameAndLevel({
  1320 + data: { district: city, level: 2 },
  1321 + });
1281 if (res && res.data) { 1322 if (res && res.data) {
1282 districtOptions = res.data.map((item) => ({ 1323 districtOptions = res.data.map((item) => ({
1283 value: item.district, 1324 value: item.district,
@@ -1686,6 +1727,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => { @@ -1686,6 +1727,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1686 const res = await postKingdeeRepMaterial({ 1727 const res = await postKingdeeRepMaterial({
1687 data: { search: keywords }, 1728 data: { search: keywords },
1688 }); 1729 });
  1730 + console.log(res.customerShippingAddress);
  1731 +
1689 let options = res?.rows?.map((p: any) => { 1732 let options = res?.rows?.map((p: any) => {
1690 return { 1733 return {
1691 ...p, 1734 ...p,
src/pages/ResearchGroup/index.tsx
@@ -485,9 +485,9 @@ const PrepaidPage = () => { @@ -485,9 +485,9 @@ const PrepaidPage = () => {
485 defaultValue: { 485 defaultValue: {
486 option: { fixed: 'right', disable: true }, 486 option: { fixed: 'right', disable: true },
487 }, 487 },
488 - onChange(value) {  
489 - console.log('value: ', value);  
490 - }, 488 + // onChange(value) {
  489 + // console.log('value: ', value);
  490 + // },
491 }} 491 }}
492 rowKey="id" 492 rowKey="id"
493 search={{ 493 search={{
src/services/definition.ts
@@ -86,6 +86,8 @@ export interface AdminAuthUserVO { @@ -86,6 +86,8 @@ export interface AdminAuthUserVO {
86 export interface AdminDeptQueryVO { 86 export interface AdminDeptQueryVO {
87 /** @format int32 */ 87 /** @format int32 */
88 current?: number; 88 current?: number;
  89 + /** @format int32 */
  90 + end?: number;
89 /** @format int64 */ 91 /** @format int64 */
90 id?: number; 92 id?: number;
91 ids?: Array<number>; 93 ids?: Array<number>;
@@ -95,6 +97,8 @@ export interface AdminDeptQueryVO { @@ -95,6 +97,8 @@ export interface AdminDeptQueryVO {
95 /** @format int64 */ 97 /** @format int64 */
96 pid?: number; 98 pid?: number;
97 /** @format int32 */ 99 /** @format int32 */
  100 + start?: number;
  101 + /** @format int32 */
98 total?: number; 102 total?: number;
99 } 103 }
100 104
@@ -109,6 +113,8 @@ export interface AdminDeptVO { @@ -109,6 +113,8 @@ export interface AdminDeptVO {
109 export interface AdminJobQueryVO { 113 export interface AdminJobQueryVO {
110 /** @format int32 */ 114 /** @format int32 */
111 current?: number; 115 current?: number;
  116 + /** @format int32 */
  117 + end?: number;
112 /** @format int64 */ 118 /** @format int64 */
113 id?: number; 119 id?: number;
114 ids?: Array<number>; 120 ids?: Array<number>;
@@ -118,6 +124,8 @@ export interface AdminJobQueryVO { @@ -118,6 +124,8 @@ export interface AdminJobQueryVO {
118 /** @format int32 */ 124 /** @format int32 */
119 sort?: number; 125 sort?: number;
120 /** @format int32 */ 126 /** @format int32 */
  127 + start?: number;
  128 + /** @format int32 */
121 total?: number; 129 total?: number;
122 } 130 }
123 131
@@ -136,6 +144,8 @@ export interface AdminMenuQueryVO { @@ -136,6 +144,8 @@ export interface AdminMenuQueryVO {
136 /** @format int32 */ 144 /** @format int32 */
137 current?: number; 145 current?: number;
138 /** @format int32 */ 146 /** @format int32 */
  147 + end?: number;
  148 + /** @format int32 */
139 hidden?: number; 149 hidden?: number;
140 icon?: string; 150 icon?: string;
141 /** @format int64 */ 151 /** @format int64 */
@@ -151,6 +161,8 @@ export interface AdminMenuQueryVO { @@ -151,6 +161,8 @@ export interface AdminMenuQueryVO {
151 /** @format int64 */ 161 /** @format int64 */
152 pid?: number; 162 pid?: number;
153 /** @format int32 */ 163 /** @format int32 */
  164 + start?: number;
  165 + /** @format int32 */
154 total?: number; 166 total?: number;
155 /** @format int32 */ 167 /** @format int32 */
156 type?: number; 168 type?: number;
@@ -181,6 +193,8 @@ export interface AdminRoleQueryVO { @@ -181,6 +193,8 @@ export interface AdminRoleQueryVO {
181 /** @format int32 */ 193 /** @format int32 */
182 current?: number; 194 current?: number;
183 dataScope?: string; 195 dataScope?: string;
  196 + /** @format int32 */
  197 + end?: number;
184 /** @format int64 */ 198 /** @format int64 */
185 id?: number; 199 id?: number;
186 ids?: Array<number>; 200 ids?: Array<number>;
@@ -192,6 +206,8 @@ export interface AdminRoleQueryVO { @@ -192,6 +206,8 @@ export interface AdminRoleQueryVO {
192 permission?: string; 206 permission?: string;
193 remark?: string; 207 remark?: string;
194 /** @format int32 */ 208 /** @format int32 */
  209 + start?: number;
  210 + /** @format int32 */
195 total?: number; 211 total?: number;
196 } 212 }
197 213
@@ -209,22 +225,30 @@ export interface AdminUserLoginByPhoneVO { @@ -209,22 +225,30 @@ export interface AdminUserLoginByPhoneVO {
209 /** @format int32 */ 225 /** @format int32 */
210 current?: number; 226 current?: number;
211 /** @format int32 */ 227 /** @format int32 */
  228 + end?: number;
  229 + /** @format int32 */
212 pageSize?: number; 230 pageSize?: number;
213 phone?: string; 231 phone?: string;
214 smsCaptchaCode?: string; 232 smsCaptchaCode?: string;
215 /** @format int32 */ 233 /** @format int32 */
  234 + start?: number;
  235 + /** @format int32 */
216 total?: number; 236 total?: number;
217 } 237 }
218 238
219 export interface AdminUserLoginByPwdVO { 239 export interface AdminUserLoginByPwdVO {
220 /** @format int32 */ 240 /** @format int32 */
221 current?: number; 241 current?: number;
  242 + /** @format int32 */
  243 + end?: number;
222 imgCaptchaCode?: string; 244 imgCaptchaCode?: string;
223 imgCaptchaUuid?: string; 245 imgCaptchaUuid?: string;
224 /** @format int32 */ 246 /** @format int32 */
225 pageSize?: number; 247 pageSize?: number;
226 password?: string; 248 password?: string;
227 /** @format int32 */ 249 /** @format int32 */
  250 + start?: number;
  251 + /** @format int32 */
228 total?: number; 252 total?: number;
229 userName?: string; 253 userName?: string;
230 } 254 }
@@ -234,11 +258,15 @@ export interface AdminUserModifyPwdVO { @@ -234,11 +258,15 @@ export interface AdminUserModifyPwdVO {
234 /** @format int32 */ 258 /** @format int32 */
235 current?: number; 259 current?: number;
236 /** @format int32 */ 260 /** @format int32 */
  261 + end?: number;
  262 + /** @format int32 */
237 pageSize?: number; 263 pageSize?: number;
238 password?: string; 264 password?: string;
239 phone?: string; 265 phone?: string;
240 smsCaptchaCode?: string; 266 smsCaptchaCode?: string;
241 /** @format int32 */ 267 /** @format int32 */
  268 + start?: number;
  269 + /** @format int32 */
242 total?: number; 270 total?: number;
243 } 271 }
244 272
@@ -246,8 +274,12 @@ export interface AdminUserPasswordRecoverEmailVO { @@ -246,8 +274,12 @@ export interface AdminUserPasswordRecoverEmailVO {
246 /** @format int32 */ 274 /** @format int32 */
247 current?: number; 275 current?: number;
248 /** @format int32 */ 276 /** @format int32 */
  277 + end?: number;
  278 + /** @format int32 */
249 pageSize?: number; 279 pageSize?: number;
250 /** @format int32 */ 280 /** @format int32 */
  281 + start?: number;
  282 + /** @format int32 */
251 total?: number; 283 total?: number;
252 userName?: string; 284 userName?: string;
253 } 285 }
@@ -256,6 +288,8 @@ export interface AdminUserQueryVO { @@ -256,6 +288,8 @@ export interface AdminUserQueryVO {
256 /** @format int32 */ 288 /** @format int32 */
257 current?: number; 289 current?: number;
258 email?: string; 290 email?: string;
  291 + /** @format int32 */
  292 + end?: number;
259 /** @format int64 */ 293 /** @format int64 */
260 id?: number; 294 id?: number;
261 ids?: Array<number>; 295 ids?: Array<number>;
@@ -266,6 +300,8 @@ export interface AdminUserQueryVO { @@ -266,6 +300,8 @@ export interface AdminUserQueryVO {
266 phone?: string; 300 phone?: string;
267 sex?: string; 301 sex?: string;
268 /** @format int32 */ 302 /** @format int32 */
  303 + start?: number;
  304 + /** @format int32 */
269 total?: number; 305 total?: number;
270 userName?: string; 306 userName?: string;
271 workerType?: string; 307 workerType?: string;
@@ -276,6 +312,8 @@ export interface AdminUserRegisterVO { @@ -276,6 +312,8 @@ export interface AdminUserRegisterVO {
276 /** @format int32 */ 312 /** @format int32 */
277 current?: number; 313 current?: number;
278 email?: string; 314 email?: string;
  315 + /** @format int32 */
  316 + end?: number;
279 isAgreeAgreement?: boolean; 317 isAgreeAgreement?: boolean;
280 /** @format int32 */ 318 /** @format int32 */
281 pageSize?: number; 319 pageSize?: number;
@@ -285,6 +323,8 @@ export interface AdminUserRegisterVO { @@ -285,6 +323,8 @@ export interface AdminUserRegisterVO {
285 safeQuestion?: string; 323 safeQuestion?: string;
286 smsCaptchaCode?: string; 324 smsCaptchaCode?: string;
287 /** @format int32 */ 325 /** @format int32 */
  326 + start?: number;
  327 + /** @format int32 */
288 total?: number; 328 total?: number;
289 userName?: string; 329 userName?: string;
290 } 330 }
@@ -480,8 +520,12 @@ export interface ApiOrderCustomersRequest { @@ -480,8 +520,12 @@ export interface ApiOrderCustomersRequest {
480 /** @format int32 */ 520 /** @format int32 */
481 current?: number; 521 current?: number;
482 /** @format int32 */ 522 /** @format int32 */
  523 + end?: number;
  524 + /** @format int32 */
483 pageSize?: number; 525 pageSize?: number;
484 /** @format int32 */ 526 /** @format int32 */
  527 + start?: number;
  528 + /** @format int32 */
485 total?: number; 529 total?: number;
486 } 530 }
487 531
@@ -552,11 +596,15 @@ export interface AuditDto { @@ -552,11 +596,15 @@ export interface AuditDto {
552 export interface AuditVO { 596 export interface AuditVO {
553 /** @format int32 */ 597 /** @format int32 */
554 current?: number; 598 current?: number;
  599 + /** @format int32 */
  600 + end?: number;
555 /** @format int64 */ 601 /** @format int64 */
556 id?: number; 602 id?: number;
557 /** @format int32 */ 603 /** @format int32 */
558 pageSize?: number; 604 pageSize?: number;
559 /** @format int32 */ 605 /** @format int32 */
  606 + start?: number;
  607 + /** @format int32 */
560 status?: number; 608 status?: number;
561 /** @format int32 */ 609 /** @format int32 */
562 total?: number; 610 total?: number;
@@ -626,16 +674,32 @@ export interface CancelSendOrderDto { @@ -626,16 +674,32 @@ export interface CancelSendOrderDto {
626 export interface CaptchaMessageVO { 674 export interface CaptchaMessageVO {
627 /** @format int32 */ 675 /** @format int32 */
628 current?: number; 676 current?: number;
  677 + /** @format int32 */
  678 + end?: number;
629 imgCaptchaCode?: string; 679 imgCaptchaCode?: string;
630 imgCaptchaUuid?: string; 680 imgCaptchaUuid?: string;
631 /** @format int32 */ 681 /** @format int32 */
632 pageSize?: number; 682 pageSize?: number;
633 phone?: string; 683 phone?: string;
634 /** @format int32 */ 684 /** @format int32 */
  685 + start?: number;
  686 + /** @format int32 */
635 total?: number; 687 total?: number;
636 type?: string; 688 type?: string;
637 } 689 }
638 690
  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 +
639 export interface Contactperson { 703 export interface Contactperson {
640 birthday?: string; 704 birthday?: string;
641 contactAddress?: string; 705 contactAddress?: string;
@@ -823,6 +887,8 @@ export interface DictionaryQueryVO { @@ -823,6 +887,8 @@ export interface DictionaryQueryVO {
823 dictCode?: string; 887 dictCode?: string;
824 dictName?: string; 888 dictName?: string;
825 dictValue?: string; 889 dictValue?: string;
  890 + /** @format int32 */
  891 + end?: number;
826 /** @format int64 */ 892 /** @format int64 */
827 id?: number; 893 id?: number;
828 ids?: Array<number>; 894 ids?: Array<number>;
@@ -832,6 +898,8 @@ export interface DictionaryQueryVO { @@ -832,6 +898,8 @@ export interface DictionaryQueryVO {
832 /** @format int32 */ 898 /** @format int32 */
833 sort?: number; 899 sort?: number;
834 /** @format int32 */ 900 /** @format int32 */
  901 + start?: number;
  902 + /** @format int32 */
835 total?: number; 903 total?: number;
836 } 904 }
837 905
@@ -853,6 +921,12 @@ export interface DistrictDo { @@ -853,6 +921,12 @@ export interface DistrictDo {
853 pid?: number; 921 pid?: number;
854 } 922 }
855 923
  924 +export interface DistrictSearchDo {
  925 + district?: string;
  926 + /** @format int32 */
  927 + level?: number;
  928 +}
  929 +
856 export interface Entry { 930 export interface Entry {
857 bankAccount?: string; 931 bankAccount?: string;
858 bankName?: string; 932 bankName?: string;
@@ -1141,10 +1215,14 @@ export interface MeasureUnitListResRow { @@ -1141,10 +1215,14 @@ export interface MeasureUnitListResRow {
1141 export interface MessageQueryDTO { 1215 export interface MessageQueryDTO {
1142 /** @format int32 */ 1216 /** @format int32 */
1143 current?: number; 1217 current?: number;
  1218 + /** @format int32 */
  1219 + end?: number;
1144 isReaded?: string; 1220 isReaded?: string;
1145 /** @format int32 */ 1221 /** @format int32 */
1146 pageSize?: number; 1222 pageSize?: number;
1147 /** @format int32 */ 1223 /** @format int32 */
  1224 + start?: number;
  1225 + /** @format int32 */
1148 total?: number; 1226 total?: number;
1149 username?: string; 1227 username?: string;
1150 } 1228 }
@@ -1180,6 +1258,8 @@ export interface OrderAuditLogQueryVO { @@ -1180,6 +1258,8 @@ export interface OrderAuditLogQueryVO {
1180 applyId?: number; 1258 applyId?: number;
1181 /** @format int32 */ 1259 /** @format int32 */
1182 current?: number; 1260 current?: number;
  1261 + /** @format int32 */
  1262 + end?: number;
1183 /** @format int64 */ 1263 /** @format int64 */
1184 id?: number; 1264 id?: number;
1185 ids?: Array<number>; 1265 ids?: Array<number>;
@@ -1189,6 +1269,8 @@ export interface OrderAuditLogQueryVO { @@ -1189,6 +1269,8 @@ export interface OrderAuditLogQueryVO {
1189 /** @format int32 */ 1269 /** @format int32 */
1190 pageSize?: number; 1270 pageSize?: number;
1191 /** @format int32 */ 1271 /** @format int32 */
  1272 + start?: number;
  1273 + /** @format int32 */
1192 total?: number; 1274 total?: number;
1193 } 1275 }
1194 1276
@@ -1223,6 +1305,8 @@ export interface OrderBaseInfoQueryVO { @@ -1223,6 +1305,8 @@ export interface OrderBaseInfoQueryVO {
1223 customerCode?: string; 1305 customerCode?: string;
1224 customerPo?: string; 1306 customerPo?: string;
1225 customerStyle?: string; 1307 customerStyle?: string;
  1308 + /** @format int32 */
  1309 + end?: number;
1226 /** @format int64 */ 1310 /** @format int64 */
1227 id?: number; 1311 id?: number;
1228 ids?: Array<number>; 1312 ids?: Array<number>;
@@ -1244,6 +1328,8 @@ export interface OrderBaseInfoQueryVO { @@ -1244,6 +1328,8 @@ export interface OrderBaseInfoQueryVO {
1244 productionDepartmentConsignTime?: string; 1328 productionDepartmentConsignTime?: string;
1245 projectNo?: string; 1329 projectNo?: string;
1246 /** @format int32 */ 1330 /** @format int32 */
  1331 + start?: number;
  1332 + /** @format int32 */
1247 total?: number; 1333 total?: number;
1248 } 1334 }
1249 1335
@@ -1304,6 +1390,8 @@ export interface OrderFieldLockApplyQueryVO { @@ -1304,6 +1390,8 @@ export interface OrderFieldLockApplyQueryVO {
1304 auditUserId?: number; 1390 auditUserId?: number;
1305 /** @format int32 */ 1391 /** @format int32 */
1306 current?: number; 1392 current?: number;
  1393 + /** @format int32 */
  1394 + end?: number;
1307 fields?: string; 1395 fields?: string;
1308 /** @format int64 */ 1396 /** @format int64 */
1309 id?: number; 1397 id?: number;
@@ -1313,6 +1401,8 @@ export interface OrderFieldLockApplyQueryVO { @@ -1313,6 +1401,8 @@ export interface OrderFieldLockApplyQueryVO {
1313 /** @format int32 */ 1401 /** @format int32 */
1314 pageSize?: number; 1402 pageSize?: number;
1315 /** @format int32 */ 1403 /** @format int32 */
  1404 + start?: number;
  1405 + /** @format int32 */
1316 status?: number; 1406 status?: number;
1317 statusList?: Array<number>; 1407 statusList?: Array<number>;
1318 /** @format int32 */ 1408 /** @format int32 */
@@ -1358,9 +1448,19 @@ export interface OrderInspectionStageVO { @@ -1358,9 +1448,19 @@ export interface OrderInspectionStageVO {
1358 value3?: string; 1448 value3?: string;
1359 } 1449 }
1360 1450
  1451 +export interface OrderMainProDo {
  1452 + city?: string;
  1453 + district?: string;
  1454 + /** @format int64 */
  1455 + oid?: number;
  1456 + province?: string;
  1457 +}
  1458 +
1361 export interface OrderOptLogQueryVO { 1459 export interface OrderOptLogQueryVO {
1362 /** @format int32 */ 1460 /** @format int32 */
1363 current?: number; 1461 current?: number;
  1462 + /** @format int32 */
  1463 + end?: number;
1364 /** @format int64 */ 1464 /** @format int64 */
1365 id?: number; 1465 id?: number;
1366 ids?: Array<number>; 1466 ids?: Array<number>;
@@ -1369,6 +1469,8 @@ export interface OrderOptLogQueryVO { @@ -1369,6 +1469,8 @@ export interface OrderOptLogQueryVO {
1369 /** @format int32 */ 1469 /** @format int32 */
1370 pageSize?: number; 1470 pageSize?: number;
1371 /** @format int32 */ 1471 /** @format int32 */
  1472 + start?: number;
  1473 + /** @format int32 */
1372 total?: number; 1474 total?: number;
1373 } 1475 }
1374 1476
@@ -1674,6 +1776,8 @@ export interface QueryBankStatementDto { @@ -1674,6 +1776,8 @@ export interface QueryBankStatementDto {
1674 collectionDatetimeEnd?: string; 1776 collectionDatetimeEnd?: string;
1675 /** @format int32 */ 1777 /** @format int32 */
1676 current?: number; 1778 current?: number;
  1779 + /** @format int32 */
  1780 + end?: number;
1677 /** @format int64 */ 1781 /** @format int64 */
1678 id?: number; 1782 id?: number;
1679 /** @format int32 */ 1783 /** @format int32 */
@@ -1695,6 +1799,8 @@ export interface QueryBankStatementDto { @@ -1695,6 +1799,8 @@ export interface QueryBankStatementDto {
1695 remark?: string; 1799 remark?: string;
1696 remarkNote?: string; 1800 remarkNote?: string;
1697 serialNumber?: string; 1801 serialNumber?: string;
  1802 + /** @format int32 */
  1803 + start?: number;
1698 status?: string; 1804 status?: string;
1699 /** @format int32 */ 1805 /** @format int32 */
1700 total?: number; 1806 total?: number;
@@ -1784,6 +1890,325 @@ export interface ReissueInvoiceDto { @@ -1784,6 +1890,325 @@ export interface ReissueInvoiceDto {
1784 notes?: string; 1890 notes?: string;
1785 } 1891 }
1786 1892
  1893 +export interface ResearchGroupAccountAddRequest {
  1894 + /**
  1895 + * @description
  1896 + * 关联的账号id
  1897 + * @format int64
  1898 + */
  1899 + accountId?: number;
  1900 + /**
  1901 + * @description
  1902 + * 关联的账号名称
  1903 + */
  1904 + accountName?: string;
  1905 + /**
  1906 + * @description
  1907 + * 关联的账号手机号
  1908 + */
  1909 + accountPhone?: string;
  1910 + /**
  1911 + * @description
  1912 + * 课题组id
  1913 + * @format int64
  1914 + */
  1915 + groupId?: number;
  1916 +}
  1917 +
  1918 +export interface ResearchGroupAccountEditRequest {
  1919 + /**
  1920 + * @description
  1921 + * 关联的账号id
  1922 + * @format int64
  1923 + */
  1924 + accountId?: number;
  1925 + /**
  1926 + * @description
  1927 + * 关联的账号名称
  1928 + */
  1929 + accountName?: string;
  1930 + /**
  1931 + * @description
  1932 + * 关联的账号手机号
  1933 + */
  1934 + accountPhone?: string;
  1935 + /**
  1936 + * @description
  1937 + * 课题组id
  1938 + * @format int64
  1939 + */
  1940 + groupId?: number;
  1941 + /**
  1942 + * @description
  1943 + * 主键id
  1944 + * @format int64
  1945 + */
  1946 + id?: number;
  1947 +}
  1948 +
  1949 +export interface ResearchGroupAddRequest {
  1950 + accounts?: Array<ResearchGroupAccountAddRequest>;
  1951 + /**
  1952 + * @description
  1953 + * 课题组名称
  1954 + */
  1955 + group?: string;
  1956 + /**
  1957 + * @description
  1958 + * 课题组负责人
  1959 + */
  1960 + leader?: string;
  1961 + members?: Array<ResearchGroupMemberAddRequest>;
  1962 +}
  1963 +
  1964 +export interface ResearchGroupDeleteRequest {
  1965 + /**
  1966 + * @description
  1967 + * 主键id
  1968 + */
  1969 + ids?: Array<number>;
  1970 +}
  1971 +
  1972 +export interface ResearchGroupDetailRequest {
  1973 + /**
  1974 + * @description
  1975 + * 主键id
  1976 + * @format int64
  1977 + */
  1978 + id?: number;
  1979 +}
  1980 +
  1981 +export interface ResearchGroupEditRequest {
  1982 + /**
  1983 + * @description
  1984 + * 课题组预存账号
  1985 + */
  1986 + accounts?: Array<ResearchGroupAccountEditRequest>;
  1987 + /**
  1988 + * @description
  1989 + * 课题组名称
  1990 + */
  1991 + group?: string;
  1992 + /**
  1993 + * @description
  1994 + * 主键id
  1995 + * @format int64
  1996 + */
  1997 + id?: number;
  1998 + /**
  1999 + * @description
  2000 + * 课题组负责人
  2001 + */
  2002 + leader?: string;
  2003 + /**
  2004 + * @description
  2005 + * 课题组成员集合
  2006 + */
  2007 + members?: Array<ResearchGroupMemberEditRequest>;
  2008 +}
  2009 +
  2010 +export interface ResearchGroupListRequest {
  2011 + /**
  2012 + * @description
  2013 + * 预存账号手机号
  2014 + */
  2015 + accountPhone?: string;
  2016 + /** @format int32 */
  2017 + current?: number;
  2018 + /** @format int32 */
  2019 + end?: number;
  2020 + /**
  2021 + * @description
  2022 + * 课题组名称
  2023 + */
  2024 + groupName?: string;
  2025 + /**
  2026 + * @description
  2027 + * 课题组负责人
  2028 + */
  2029 + leaderName?: string;
  2030 + /**
  2031 + * @description
  2032 + * 课题组成员名称
  2033 + */
  2034 + memberName?: string;
  2035 + /**
  2036 + * @description
  2037 + * 课题组成员手机号
  2038 + */
  2039 + memberPhone?: string;
  2040 + /** @format int32 */
  2041 + pageSize?: number;
  2042 + /** @format int32 */
  2043 + start?: number;
  2044 + /** @format int32 */
  2045 + total?: number;
  2046 +}
  2047 +
  2048 +export interface ResearchGroupMemberAddRequest {
  2049 + /**
  2050 + * @description
  2051 + * 课题组ID
  2052 + * @format int64
  2053 + */
  2054 + groupId?: number;
  2055 + /**
  2056 + * @description
  2057 + * 成员名称
  2058 + */
  2059 + memberName?: string;
  2060 + /**
  2061 + * @description
  2062 + * 成员手机号
  2063 + */
  2064 + memberPhone?: string;
  2065 +}
  2066 +
  2067 +export interface ResearchGroupMemberEditRequest {
  2068 + /**
  2069 + * @description
  2070 + * 课题组ID
  2071 + * @format int64
  2072 + */
  2073 + groupId?: number;
  2074 + /**
  2075 + * @description
  2076 + * 主键id
  2077 + * @format int64
  2078 + */
  2079 + id?: number;
  2080 + /**
  2081 + * @description
  2082 + * 成员名称
  2083 + */
  2084 + memberName?: string;
  2085 + /**
  2086 + * @description
  2087 + * 成员手机号
  2088 + */
  2089 + memberPhone?: string;
  2090 +}
  2091 +
  2092 +export interface ResearchGroupMemberRequestAddRequest {
  2093 + /**
  2094 + * @description
  2095 + * 课题组ID
  2096 + * @format int64
  2097 + */
  2098 + groupId?: number;
  2099 + /**
  2100 + * @description
  2101 + * 课题组名称
  2102 + */
  2103 + groupName?: string;
  2104 + members?: Array<ResearchGroupMemberAddRequest>;
  2105 + /**
  2106 + * @description
  2107 + * 申请备注
  2108 + */
  2109 + requestNotes?: string;
  2110 +}
  2111 +
  2112 +export interface ResearchGroupMemberRequestDeleteRequest {
  2113 + /**
  2114 + * @description
  2115 + * 主键id
  2116 + */
  2117 + ids?: Array<number>;
  2118 +}
  2119 +
  2120 +export interface ResearchGroupMemberRequestDetailRequest {
  2121 + /**
  2122 + * @description
  2123 + * 主键id
  2124 + * @format int64
  2125 + */
  2126 + id?: number;
  2127 +}
  2128 +
  2129 +export interface ResearchGroupMemberRequestEditRequest {
  2130 + /**
  2131 + * @description
  2132 + * 课题组ID
  2133 + * @format int64
  2134 + */
  2135 + groupId?: number;
  2136 + /**
  2137 + * @description
  2138 + * 课题组名称
  2139 + */
  2140 + groupName?: string;
  2141 + /**
  2142 + * @description
  2143 + * 主键id
  2144 + * @format int64
  2145 + */
  2146 + id?: number;
  2147 + /**
  2148 + * @description
  2149 + * 成员名称
  2150 + */
  2151 + memberName?: string;
  2152 + /**
  2153 + * @description
  2154 + * 成员手机号
  2155 + */
  2156 + memberPhone?: string;
  2157 + /**
  2158 + * @description
  2159 + * 申请备注
  2160 + */
  2161 + requestNotes?: string;
  2162 +}
  2163 +
  2164 +export interface ResearchGroupMemberRequestsRequest {
  2165 + /**
  2166 + * @description
  2167 + * 审核备注
  2168 + */
  2169 + auditNotes?: string;
  2170 + /**
  2171 + * @description
  2172 + * 审核状态
  2173 + */
  2174 + auditStatus?: string;
  2175 + /**
  2176 + * @description
  2177 + * 创建人
  2178 + */
  2179 + createByName?: string;
  2180 + /** @format int32 */
  2181 + current?: number;
  2182 + /** @format int32 */
  2183 + end?: number;
  2184 + /**
  2185 + * @description
  2186 + * 课题组名称
  2187 + */
  2188 + groupName?: string;
  2189 + /**
  2190 + * @description
  2191 + * 成员名称
  2192 + */
  2193 + memberName?: string;
  2194 + /**
  2195 + * @description
  2196 + * 成员手机号
  2197 + */
  2198 + memberPhone?: string;
  2199 + /** @format int32 */
  2200 + pageSize?: number;
  2201 + /**
  2202 + * @description
  2203 + * 申请备注
  2204 + */
  2205 + requestNotes?: string;
  2206 + /** @format int32 */
  2207 + start?: number;
  2208 + /** @format int32 */
  2209 + total?: number;
  2210 +}
  2211 +
1787 export interface ResetPwdVO { 2212 export interface ResetPwdVO {
1788 /** @format int64 */ 2213 /** @format int64 */
1789 userId?: number; 2214 userId?: number;
@@ -1829,6 +2254,8 @@ export interface SysLogQueryVO { @@ -1829,6 +2254,8 @@ export interface SysLogQueryVO {
1829 /** @format int32 */ 2254 /** @format int32 */
1830 current?: number; 2255 current?: number;
1831 description?: string; 2256 description?: string;
  2257 + /** @format int32 */
  2258 + end?: number;
1832 exceptionDetail?: string; 2259 exceptionDetail?: string;
1833 /** @format int64 */ 2260 /** @format int64 */
1834 id?: number; 2261 id?: number;
@@ -1839,6 +2266,8 @@ export interface SysLogQueryVO { @@ -1839,6 +2266,8 @@ export interface SysLogQueryVO {
1839 pageSize?: number; 2266 pageSize?: number;
1840 params?: string; 2267 params?: string;
1841 requestIp?: string; 2268 requestIp?: string;
  2269 + /** @format int32 */
  2270 + start?: number;
1842 /** @format int64 */ 2271 /** @format int64 */
1843 time?: number; 2272 time?: number;
1844 /** @format int32 */ 2273 /** @format int32 */
@@ -2002,8 +2431,12 @@ export interface UserCenterInfoRequest { @@ -2002,8 +2431,12 @@ export interface UserCenterInfoRequest {
2002 /** @format int32 */ 2431 /** @format int32 */
2003 current?: number; 2432 current?: number;
2004 /** @format int32 */ 2433 /** @format int32 */
  2434 + end?: number;
  2435 + /** @format int32 */
2005 pageSize?: number; 2436 pageSize?: number;
2006 /** @format int32 */ 2437 /** @format int32 */
  2438 + start?: number;
  2439 + /** @format int32 */
2007 total?: number; 2440 total?: number;
2008 /** 2441 /**
2009 * @description 2442 * @description
@@ -2023,6 +2456,8 @@ export interface UserDetailRequest { @@ -2023,6 +2456,8 @@ export interface UserDetailRequest {
2023 /** @format int32 */ 2456 /** @format int32 */
2024 current?: number; 2457 current?: number;
2025 /** @format int32 */ 2458 /** @format int32 */
  2459 + end?: number;
  2460 + /** @format int32 */
2026 pageSize?: number; 2461 pageSize?: number;
2027 /** 2462 /**
2028 * @description 2463 * @description
@@ -2030,6 +2465,8 @@ export interface UserDetailRequest { @@ -2030,6 +2465,8 @@ export interface UserDetailRequest {
2030 */ 2465 */
2031 phone?: string; 2466 phone?: string;
2032 /** @format int32 */ 2467 /** @format int32 */
  2468 + start?: number;
  2469 + /** @format int32 */
2033 total?: number; 2470 total?: number;
2034 /** 2471 /**
2035 * @description 2472 * @description
@@ -2046,6 +2483,8 @@ export interface UserListRequest { @@ -2046,6 +2483,8 @@ export interface UserListRequest {
2046 * 创建日期开始时间 2483 * 创建日期开始时间
2047 */ 2484 */
2048 dateLimit?: string; 2485 dateLimit?: string;
  2486 + /** @format int32 */
  2487 + end?: number;
2049 /** 2488 /**
2050 * @description 2489 * @description
2051 * 单位 2490 * 单位
@@ -2070,10 +2509,23 @@ export interface UserListRequest { @@ -2070,10 +2509,23 @@ export interface UserListRequest {
2070 phone?: string; 2509 phone?: string;
2071 /** 2510 /**
2072 * @description 2511 * @description
  2512 + * phones
  2513 + */
  2514 + phones?: Array<string>;
  2515 + /**
  2516 + * @description
  2517 + * 内部订单系统课题组id
  2518 + * @format int64
  2519 + */
  2520 + researchGroupId?: number;
  2521 + /**
  2522 + * @description
2073 * salesCode 2523 * salesCode
2074 */ 2524 */
2075 salesCode?: string; 2525 salesCode?: string;
2076 /** @format int32 */ 2526 /** @format int32 */
  2527 + start?: number;
  2528 + /** @format int32 */
2077 total?: number; 2529 total?: number;
2078 /** 2530 /**
2079 * @description 2531 * @description
@@ -2083,11 +2535,23 @@ export interface UserListRequest { @@ -2083,11 +2535,23 @@ export interface UserListRequest {
2083 uid?: number; 2535 uid?: number;
2084 /** 2536 /**
2085 * @description 2537 * @description
  2538 + * ids
  2539 + */
  2540 + uids?: Array<number>;
  2541 + /**
  2542 + * @description
2086 * 用户名 2543 * 用户名
2087 */ 2544 */
2088 username?: string; 2545 username?: string;
2089 } 2546 }
2090 2547
  2548 +export interface UserNowMoneyCheckRequest {
  2549 + phone?: string;
  2550 + subPrice?: number;
  2551 + /** @format int64 */
  2552 + uid?: number;
  2553 +}
  2554 +
2091 export interface View { 2555 export interface View {
2092 contentType?: string; 2556 contentType?: string;
2093 } 2557 }
@@ -2152,6 +2616,11 @@ export interface SalesRechargePrepaymentAuditRequest { @@ -2152,6 +2616,11 @@ export interface SalesRechargePrepaymentAuditRequest {
2152 * 是否通过 2616 * 是否通过
2153 */ 2617 */
2154 pass?: boolean; 2618 pass?: boolean;
  2619 + /**
  2620 + * @description
  2621 + * 手机号
  2622 + */
  2623 + phone?: string;
2155 } 2624 }
2156 2625
2157 export interface SalesRechargePrepaymentCreateRequest { 2626 export interface SalesRechargePrepaymentCreateRequest {
@@ -2257,6 +2726,8 @@ export interface SalesRechargePrepaymentRequest { @@ -2257,6 +2726,8 @@ export interface SalesRechargePrepaymentRequest {
2257 * @format int32 2726 * @format int32
2258 */ 2727 */
2259 enableFlag?: number; 2728 enableFlag?: number;
  2729 + /** @format int32 */
  2730 + end?: number;
2260 /** 2731 /**
2261 * @description 2732 * @description
2262 * id 2733 * id
@@ -2301,6 +2772,8 @@ export interface SalesRechargePrepaymentRequest { @@ -2301,6 +2772,8 @@ export interface SalesRechargePrepaymentRequest {
2301 * 销售代表 2772 * 销售代表
2302 */ 2773 */
2303 salesCode?: string; 2774 salesCode?: string;
  2775 + /** @format int32 */
  2776 + start?: number;
2304 /** 2777 /**
2305 * @description 2778 * @description
2306 * 状态 2779 * 状态
@@ -2479,6 +2952,38 @@ export interface TsgURL { @@ -2479,6 +2952,38 @@ export interface TsgURL {
2479 userInfo?: string; 2952 userInfo?: string;
2480 } 2953 }
2481 2954
  2955 +/**
  2956 + * @description
  2957 + * 保存用户地址请求对象
  2958 + */
  2959 +export interface UserAddressSaveRequest {
  2960 + /**
  2961 + * @description
  2962 + * 联系电话
  2963 + */
  2964 + customerContactNumber: string;
  2965 + /**
  2966 + * @description
  2967 + * 客户姓名
  2968 + */
  2969 + customerName: string;
  2970 + /**
  2971 + * @description
  2972 + * 收货地址
  2973 + */
  2974 + customerShippingAddress?: string;
  2975 + /**
  2976 + * @description
  2977 + * 客户单位
  2978 + */
  2979 + institution?: string;
  2980 + /**
  2981 + * @description
  2982 + * 课题组老师
  2983 + */
  2984 + institutionContactName?: string;
  2985 +}
  2986 +
2482 export interface UploadPaymentReceiptDTO { 2987 export interface UploadPaymentReceiptDTO {
2483 /** 2988 /**
2484 * @description 2989 * @description