canrd-main / canrd-erp-front · Commits

Commit 3d3025136b6fc389705a87141d9a65b84a7fe318

Authored by zhongnanhuang
1 parent 3157c84e

feat: update 订单编辑页面表单限制调整

Inline Side-by-side
Showing 7 changed files with 350 additions and 19 deletions
src/pages/Order/components/CheckModal.tsx
  View file @3d30251
... ... @@ -401,6 +401,9 @@ export default ({
401 401 if (checkType(CHECK_TYPE.CONFIRM_REISSUE)) {
402 402 type = 'confirm_reissue';
403 403 }
  404 + if (checkType(CHECK_TYPE.CREDIT_AUDIT)) {
  405 + type = 'credit_audit';
  406 + }
404 407 return type;
405 408 }
406 409  
... ...
src/pages/Order/components/OrderDrawer.tsx
  View file @3d30251
... ... @@ -2,6 +2,7 @@ import { RESPONSE_CODE } from '@/constants/enum';
2 2 import {
3 3 postCanrdApiUserAddressList,
4 4 postCanrdApiUserDetail,
  5 + postCanrdApiUserNowMoneyCheck,
5 6 postKingdeeRepCustomerDetail,
6 7 postKingdeeRepMaterial,
7 8 postKingdeeRepMaterialUnit,
... ... @@ -617,6 +618,56 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
617 618 }
618 619  
619 620 /**
  621 + * 检查用户额度
  622 + * @param option
  623 + */
  624 + const checkAccountMoney = async (uid: any, subPrice: any) => {
  625 + let res = await postCanrdApiUserNowMoneyCheck({
  626 + data: { uid: uid, subPrice: subPrice },
  627 + });
  628 + if (res && res.result === RESPONSE_CODE.SUCCESS && res.data) {
  629 + let data = res.data;
  630 + let isCredit = data.isCredit;
  631 + if (isCredit) {
  632 + return true;
  633 + }
  634 +
  635 + message.error(
  636 + '用户余额不足，当前预减的金额为：' +
  637 + data.subPrice +
  638 + '，当前账号余额为：' +
  639 + data.nowMoney +
  640 + '，当前账号可赊账额度为：' +
  641 + data.creditLimit,
  642 + );
  643 + return false;
  644 + }
  645 +
  646 + return false;
  647 + };
  648 +
  649 + /**
  650 + * 总金额改变触发事件
  651 + * 如果是预存单，需要检查余额
  652 + * @param value
  653 + */
  654 + const totalPaymentChange = (value: any) => {
  655 + let paymentMethod = form.getFieldValue('paymentMethod');
  656 + let prepaidUid = form.getFieldValue('prepaidUid');
  657 + if (
  658 + value &&
  659 + paymentMethod &&
  660 + paymentMethod === 'WITHHOLDING_ADVANCE_DEPOSIT' &&
  661 + prepaidUid
  662 + ) {
  663 + let valid = checkAccountMoney(prepaidUid, value);
  664 + if (!valid) {
  665 + form.setFieldValue('prepaidUid', undefined);
  666 + }
  667 + }
  668 + };
  669 +
  670 + /**
620 671 * 检查客户是否可以编辑
621 672 * @returns
622 673 */
... ... @@ -689,6 +740,19 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
689 740 }
690 741 }
691 742  
  743 + const validateContactNumber = (_: any, value: any) => {
  744 + console.log(value);
  745 + const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
  746 + const phoneRegex = /^\d{1,11}$/;
  747 +
  748 + if (emailRegex.test(value) || phoneRegex.test(value)) {
  749 + return Promise.resolve();
  750 + }
  751 + return Promise.reject(
  752 + new Error('联系方式必须是邮箱或手机号格式（不能包含空格等特殊符号）'),
  753 + );
  754 + };
  755 +
692 756 /**
693 757 * 刪除草稿数据
694 758 */
... ... @@ -1092,7 +1156,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1092 1156 loadAccountOptions(v.target.value);
1093 1157 },
1094 1158 }}
1095   - rules={[{ required: true, message: '联系方式必填' }]}
  1159 + rules={[
  1160 + { required: true, message: '联系方式必填' },
  1161 + { validator: validateContactNumber },
  1162 + ]}
1096 1163 />
1097 1164 <ProFormText
1098 1165 width="lg"
... ... @@ -1126,18 +1193,18 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
1126 1193 label="支付总额（￥）"
1127 1194 rules={[
1128 1195 { required: true, message: '支付总额必填' },
1129   - // {
1130   - // validator: (_, value) => {
1131   - // if (value <= 0) {
1132   - // return Promise.reject(
1133   - // new Error(
1134   - // '支付总额必须大于0 （扣预存的订单现在也必须填写实际金额）',
1135   - // ),
1136   - // );
1137   - // }
1138   - // return Promise.resolve();
1139   - // },
1140   - // },
  1196 + {
  1197 + validator: (_, value) => {
  1198 + if (value <= 0) {
  1199 + return Promise.reject(
  1200 + new Error(
  1201 + '支付总额必须大于0 （扣预存的订单现在也必须填写实际金额）',
  1202 + ),
  1203 + );
  1204 + }
  1205 + return Promise.resolve();
  1206 + },
  1207 + },
1141 1208 ]}
1142 1209 tooltip="点击计算，合计所有子订单金额"
1143 1210 fieldProps={{
... ... @@ -1151,6 +1218,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
1151 1218 计算
1152 1219 </Button>
1153 1220 ),
  1221 + onChange: (value: any) => {
  1222 + totalPaymentChange(value);
  1223 + },
1154 1224 }}
1155 1225 disabled={optType('after-sales-check')}
1156 1226 />
... ... @@ -1186,8 +1256,15 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
1186 1256 hidden={paymentMethod !== 'WITHHOLDING_ADVANCE_DEPOSIT'}
1187 1257 showSearch
1188 1258 label="预存账号"
1189   - onChange={(option: any) => {
1190   - form.setFieldValue('prepaidAmount', option?.nowMoney);
  1259 + onChange={(value: any) => {
  1260 + //检查用户额度
  1261 + let valid = checkAccountMoney(
  1262 + value,
  1263 + form.getFieldValue('totalPayment'),
  1264 + );
  1265 + if (!valid) {
  1266 + form.setFieldValue('prepaidUid', undefined);
  1267 + }
1191 1268 }}
1192 1269 placeholder="请选择预存账号"
1193 1270 rules={[
... ...
src/pages/Order/constant.ts
  View file @3d30251
... ... @@ -108,6 +108,7 @@ export const CHECK_TYPE = {
108 108 PAYMENT_RECEIPTS_AUDIT: 'PAYMENT_RECEIPTS_AUDIT',
109 109 CONFIRM_REISSUE: 'CONFIRM_REISSUE',
110 110 PREPAID_AUDIT: 'PREPAID_AUDIT',
  111 + CREDIT_AUDIT: 'CREDIT_AUDIT',
111 112 };
112 113  
113 114 /**
... ... @@ -192,6 +193,7 @@ export const ORDER_STATUS_OPTIONS = {
192 193 AFTER_SALES_FAILURE: '售后失败',
193 194 NO_NEED_SEND: '无需发货',
194 195 PROCURE_CONVERT_WAREHOUSE_KEEPER: '采购转仓库',
  196 + CREDIT_CONFIRM: '赊账待审核',
195 197 };
196 198  
197 199 export const MODIFIED_AUDIT_STATUS_OPTIONS = {
... ... @@ -227,8 +229,10 @@ export const AFTER_INVOICING_STATUS = {
227 229 NOT_YET_INVOICED: '尚未开票',
228 230 APPLY_FOR_INVOICING: '申请开票',
229 231 URGENT_INVOICE_AUDITING: '加急待审核',
  232 + URGENT_INVOICE_AUDIT_NOTPASS: '加急审核失败',
230 233 PARTIAL_INVOICING: '部分开票',
231 234 COMPLETE_INVOICING: '完全开票',
  235 + REISSUE: '重新开票',
232 236 };
233 237  
234 238 export const TAGS_COLOR = new Map<string, string>([
... ... @@ -274,6 +278,9 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
274 278 ['AUDIT_NOTPASS', 'error'],
275 279 ['WAIT_CONFIRM_DELIVER_AFTER_INVOICE', 'processing'],
276 280 ['SALES_CONFIRM', 'warning'],
  281 + ['URGENT_INVOICE_AUDIT_NOTPASS', 'red'],
  282 + ['REISSUE', 'processing'],
  283 + ['CREDIT_CONFIRM', 'warning'],
277 284 ]);
278 285 export const SALES_CODE_OPTIONS = [
279 286 { label: 'D-Linda', value: 'D-Linda' },
... ... @@ -402,6 +409,7 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([
402 409 ['OUTSIDE_SYSTEM_PUSH', '外部系统推送了本订单'],
403 410 ['cancelSendOrder', '取消发货'],
404 411 ['salesConfirm', '商城订单销售确认'],
  412 + ['credit_audit', '赊账审核'],
405 413 ]);
406 414  
407 415 export const MAIN_ORDER_COLUMNS = [
... ...
src/pages/Order/index.tsx
  View file @3d30251
... ... @@ -1314,6 +1314,23 @@ const OrderPage = () =&gt; {
1314 1314 ''
1315 1315 )}
1316 1316  
  1317 + {optRecord.subPath?.includes('creditAudit') ? (
  1318 + <Button
  1319 + className="p-0"
  1320 + type="link"
  1321 + onClick={() => {
  1322 + setCurrentMainId(record.id);
  1323 + setCurretnOptSubId(optRecord.id);
  1324 + setCheckVisible(true);
  1325 + setOrderCheckType(CHECK_TYPE.CREDIT_AUDIT);
  1326 + }}
  1327 + >
  1328 + 赊账审核
  1329 + </Button>
  1330 + ) : (
  1331 + ''
  1332 + )}
  1333 +
1317 1334 {optRecord.subPath?.includes('auditPaymentReceipt') ? (
1318 1335 <Button
1319 1336 className="p-0"
... ... @@ -2847,6 +2864,38 @@ const OrderPage = () =&gt; {
2847 2864 ''
2848 2865 )}
2849 2866  
  2867 + {record.mainPath?.includes('creditAudit') ? (
  2868 + <Button
  2869 + className="p-0"
  2870 + type="link"
  2871 + onClick={() => {
  2872 + let selectedSubOrders = subOrderSelectedMap.get(
  2873 + record.id,
  2874 + );
  2875 + setSelectedRows(selectedSubOrders);
  2876 + if (selectedSubOrders === undefined) {
  2877 + selectedSubOrders = record.subOrderInformationLists;
  2878 + }
  2879 + for (let i = 0; i < selectedSubOrders.length; i++) {
  2880 + if (
  2881 + selectedSubOrders[i].orderStatus !==
  2882 + 'CREDIT_CONFIRM'
  2883 + ) {
  2884 + message.error('请选择[赊账待审核]的子订单进行审核');
  2885 + return;
  2886 + }
  2887 + }
  2888 + createOptObject(null, record.id);
  2889 + setCheckVisible(true);
  2890 + setOrderCheckType(CHECK_TYPE.CREDIT_AUDIT);
  2891 + }}
  2892 + >
  2893 + 赊账审核
  2894 + </Button>
  2895 + ) : (
  2896 + ''
  2897 + )}
  2898 +
2850 2899 {record.mainPath?.includes('editProductionTime') ? (
2851 2900 <Button
2852 2901 className="p-0"
... ... @@ -3151,10 +3200,11 @@ const OrderPage = () =&gt; {
3151 3200 if (
3152 3201 orderStatus !== 'UNAUDITED' &&
3153 3202 orderStatus !== 'AUDIT_FAILED' &&
3154   - orderStatus !== 'LEADER_PROCESS'
  3203 + orderStatus !== 'LEADER_PROCESS' &&
  3204 + orderStatus !== 'SALES_CONFIRM'
3155 3205 ) {
3156 3206 message.error(
3157   - '请选择未审核或者审核失败的订单进行编辑',
  3207 + '请选择【未审核、审核失败、销售待确认】的订单进行编辑',
3158 3208 );
3159 3209 return;
3160 3210 }
... ...
src/pages/ResearchGroup/components/ResearchGroupMemberRequestAddModal.tsx
  View file @3d30251
... ... @@ -291,8 +291,8 @@ export default ({ setVisible, requestId, onClose }) =&gt; {
291 291 }}
292 292 debounceTime={1000}
293 293 request={async (value, {}) => {
294   - const keywords = value.keyWords;
295   - let body = { keywords: keywords, pageSize: 20 };
  294 + const groupName = value.keyWords;
  295 + let body = { groupName: groupName, pageSize: 20 };
296 296  
297 297 const res = await postResearchGroupsList({
298 298 data: body,
... ...
src/services/definition.ts
  View file @3d30251
... ... @@ -86,6 +86,8 @@ export interface AdminAuthUserVO {
86 86 export interface AdminDeptQueryVO {
87 87 /** @format int32 */
88 88 current?: number;
  89 + /** @format int32 */
  90 + end?: number;
89 91 /** @format int64 */
90 92 id?: number;
91 93 ids?: Array<number>;
... ... @@ -95,6 +97,8 @@ export interface AdminDeptQueryVO {
95 97 /** @format int64 */
96 98 pid?: number;
97 99 /** @format int32 */
  100 + start?: number;
  101 + /** @format int32 */
98 102 total?: number;
99 103 }
100 104  
... ... @@ -109,6 +113,8 @@ export interface AdminDeptVO {
109 113 export interface AdminJobQueryVO {
110 114 /** @format int32 */
111 115 current?: number;
  116 + /** @format int32 */
  117 + end?: number;
112 118 /** @format int64 */
113 119 id?: number;
114 120 ids?: Array<number>;
... ... @@ -118,6 +124,8 @@ export interface AdminJobQueryVO {
118 124 /** @format int32 */
119 125 sort?: number;
120 126 /** @format int32 */
  127 + start?: number;
  128 + /** @format int32 */
121 129 total?: number;
122 130 }
123 131  
... ... @@ -136,6 +144,8 @@ export interface AdminMenuQueryVO {
136 144 /** @format int32 */
137 145 current?: number;
138 146 /** @format int32 */
  147 + end?: number;
  148 + /** @format int32 */
139 149 hidden?: number;
140 150 icon?: string;
141 151 /** @format int64 */
... ... @@ -151,6 +161,8 @@ export interface AdminMenuQueryVO {
151 161 /** @format int64 */
152 162 pid?: number;
153 163 /** @format int32 */
  164 + start?: number;
  165 + /** @format int32 */
154 166 total?: number;
155 167 /** @format int32 */
156 168 type?: number;
... ... @@ -181,6 +193,8 @@ export interface AdminRoleQueryVO {
181 193 /** @format int32 */
182 194 current?: number;
183 195 dataScope?: string;
  196 + /** @format int32 */
  197 + end?: number;
184 198 /** @format int64 */
185 199 id?: number;
186 200 ids?: Array<number>;
... ... @@ -192,6 +206,8 @@ export interface AdminRoleQueryVO {
192 206 permission?: string;
193 207 remark?: string;
194 208 /** @format int32 */
  209 + start?: number;
  210 + /** @format int32 */
195 211 total?: number;
196 212 }
197 213  
... ... @@ -209,22 +225,30 @@ export interface AdminUserLoginByPhoneVO {
209 225 /** @format int32 */
210 226 current?: number;
211 227 /** @format int32 */
  228 + end?: number;
  229 + /** @format int32 */
212 230 pageSize?: number;
213 231 phone?: string;
214 232 smsCaptchaCode?: string;
215 233 /** @format int32 */
  234 + start?: number;
  235 + /** @format int32 */
216 236 total?: number;
217 237 }
218 238  
219 239 export interface AdminUserLoginByPwdVO {
220 240 /** @format int32 */
221 241 current?: number;
  242 + /** @format int32 */
  243 + end?: number;
222 244 imgCaptchaCode?: string;
223 245 imgCaptchaUuid?: string;
224 246 /** @format int32 */
225 247 pageSize?: number;
226 248 password?: string;
227 249 /** @format int32 */
  250 + start?: number;
  251 + /** @format int32 */
228 252 total?: number;
229 253 userName?: string;
230 254 }
... ... @@ -234,11 +258,15 @@ export interface AdminUserModifyPwdVO {
234 258 /** @format int32 */
235 259 current?: number;
236 260 /** @format int32 */
  261 + end?: number;
  262 + /** @format int32 */
237 263 pageSize?: number;
238 264 password?: string;
239 265 phone?: string;
240 266 smsCaptchaCode?: string;
241 267 /** @format int32 */
  268 + start?: number;
  269 + /** @format int32 */
242 270 total?: number;
243 271 }
244 272  
... ... @@ -246,8 +274,12 @@ export interface AdminUserPasswordRecoverEmailVO {
246 274 /** @format int32 */
247 275 current?: number;
248 276 /** @format int32 */
  277 + end?: number;
  278 + /** @format int32 */
249 279 pageSize?: number;
250 280 /** @format int32 */
  281 + start?: number;
  282 + /** @format int32 */
251 283 total?: number;
252 284 userName?: string;
253 285 }
... ... @@ -256,6 +288,8 @@ export interface AdminUserQueryVO {
256 288 /** @format int32 */
257 289 current?: number;
258 290 email?: string;
  291 + /** @format int32 */
  292 + end?: number;
259 293 /** @format int64 */
260 294 id?: number;
261 295 ids?: Array<number>;
... ... @@ -266,6 +300,8 @@ export interface AdminUserQueryVO {
266 300 phone?: string;
267 301 sex?: string;
268 302 /** @format int32 */
  303 + start?: number;
  304 + /** @format int32 */
269 305 total?: number;
270 306 userName?: string;
271 307 workerType?: string;
... ... @@ -276,6 +312,8 @@ export interface AdminUserRegisterVO {
276 312 /** @format int32 */
277 313 current?: number;
278 314 email?: string;
  315 + /** @format int32 */
  316 + end?: number;
279 317 isAgreeAgreement?: boolean;
280 318 /** @format int32 */
281 319 pageSize?: number;
... ... @@ -285,6 +323,8 @@ export interface AdminUserRegisterVO {
285 323 safeQuestion?: string;
286 324 smsCaptchaCode?: string;
287 325 /** @format int32 */
  326 + start?: number;
  327 + /** @format int32 */
288 328 total?: number;
289 329 userName?: string;
290 330 }
... ... @@ -480,8 +520,12 @@ export interface ApiOrderCustomersRequest {
480 520 /** @format int32 */
481 521 current?: number;
482 522 /** @format int32 */
  523 + end?: number;
  524 + /** @format int32 */
483 525 pageSize?: number;
484 526 /** @format int32 */
  527 + start?: number;
  528 + /** @format int32 */
485 529 total?: number;
486 530 }
487 531  
... ... @@ -552,11 +596,15 @@ export interface AuditDto {
552 596 export interface AuditVO {
553 597 /** @format int32 */
554 598 current?: number;
  599 + /** @format int32 */
  600 + end?: number;
555 601 /** @format int64 */
556 602 id?: number;
557 603 /** @format int32 */
558 604 pageSize?: number;
559 605 /** @format int32 */
  606 + start?: number;
  607 + /** @format int32 */
560 608 status?: number;
561 609 /** @format int32 */
562 610 total?: number;
... ... @@ -626,12 +674,16 @@ export interface CancelSendOrderDto {
626 674 export interface CaptchaMessageVO {
627 675 /** @format int32 */
628 676 current?: number;
  677 + /** @format int32 */
  678 + end?: number;
629 679 imgCaptchaCode?: string;
630 680 imgCaptchaUuid?: string;
631 681 /** @format int32 */
632 682 pageSize?: number;
633 683 phone?: string;
634 684 /** @format int32 */
  685 + start?: number;
  686 + /** @format int32 */
635 687 total?: number;
636 688 type?: string;
637 689 }
... ... @@ -835,6 +887,8 @@ export interface DictionaryQueryVO {
835 887 dictCode?: string;
836 888 dictName?: string;
837 889 dictValue?: string;
  890 + /** @format int32 */
  891 + end?: number;
838 892 /** @format int64 */
839 893 id?: number;
840 894 ids?: Array<number>;
... ... @@ -844,6 +898,8 @@ export interface DictionaryQueryVO {
844 898 /** @format int32 */
845 899 sort?: number;
846 900 /** @format int32 */
  901 + start?: number;
  902 + /** @format int32 */
847 903 total?: number;
848 904 }
849 905  
... ... @@ -1144,10 +1200,14 @@ export interface MeasureUnitListResRow {
1144 1200 export interface MessageQueryDTO {
1145 1201 /** @format int32 */
1146 1202 current?: number;
  1203 + /** @format int32 */
  1204 + end?: number;
1147 1205 isReaded?: string;
1148 1206 /** @format int32 */
1149 1207 pageSize?: number;
1150 1208 /** @format int32 */
  1209 + start?: number;
  1210 + /** @format int32 */
1151 1211 total?: number;
1152 1212 username?: string;
1153 1213 }
... ... @@ -1183,6 +1243,8 @@ export interface OrderAuditLogQueryVO {
1183 1243 applyId?: number;
1184 1244 /** @format int32 */
1185 1245 current?: number;
  1246 + /** @format int32 */
  1247 + end?: number;
1186 1248 /** @format int64 */
1187 1249 id?: number;
1188 1250 ids?: Array<number>;
... ... @@ -1192,6 +1254,8 @@ export interface OrderAuditLogQueryVO {
1192 1254 /** @format int32 */
1193 1255 pageSize?: number;
1194 1256 /** @format int32 */
  1257 + start?: number;
  1258 + /** @format int32 */
1195 1259 total?: number;
1196 1260 }
1197 1261  
... ... @@ -1226,6 +1290,8 @@ export interface OrderBaseInfoQueryVO {
1226 1290 customerCode?: string;
1227 1291 customerPo?: string;
1228 1292 customerStyle?: string;
  1293 + /** @format int32 */
  1294 + end?: number;
1229 1295 /** @format int64 */
1230 1296 id?: number;
1231 1297 ids?: Array<number>;
... ... @@ -1247,6 +1313,8 @@ export interface OrderBaseInfoQueryVO {
1247 1313 productionDepartmentConsignTime?: string;
1248 1314 projectNo?: string;
1249 1315 /** @format int32 */
  1316 + start?: number;
  1317 + /** @format int32 */
1250 1318 total?: number;
1251 1319 }
1252 1320  
... ... @@ -1307,6 +1375,8 @@ export interface OrderFieldLockApplyQueryVO {
1307 1375 auditUserId?: number;
1308 1376 /** @format int32 */
1309 1377 current?: number;
  1378 + /** @format int32 */
  1379 + end?: number;
1310 1380 fields?: string;
1311 1381 /** @format int64 */
1312 1382 id?: number;
... ... @@ -1316,6 +1386,8 @@ export interface OrderFieldLockApplyQueryVO {
1316 1386 /** @format int32 */
1317 1387 pageSize?: number;
1318 1388 /** @format int32 */
  1389 + start?: number;
  1390 + /** @format int32 */
1319 1391 status?: number;
1320 1392 statusList?: Array<number>;
1321 1393 /** @format int32 */
... ... @@ -1364,6 +1436,8 @@ export interface OrderInspectionStageVO {
1364 1436 export interface OrderOptLogQueryVO {
1365 1437 /** @format int32 */
1366 1438 current?: number;
  1439 + /** @format int32 */
  1440 + end?: number;
1367 1441 /** @format int64 */
1368 1442 id?: number;
1369 1443 ids?: Array<number>;
... ... @@ -1372,6 +1446,8 @@ export interface OrderOptLogQueryVO {
1372 1446 /** @format int32 */
1373 1447 pageSize?: number;
1374 1448 /** @format int32 */
  1449 + start?: number;
  1450 + /** @format int32 */
1375 1451 total?: number;
1376 1452 }
1377 1453  
... ... @@ -1570,6 +1646,8 @@ export interface QueryBankStatementDto {
1570 1646 collectionDatetimeEnd?: string;
1571 1647 /** @format int32 */
1572 1648 current?: number;
  1649 + /** @format int32 */
  1650 + end?: number;
1573 1651 /** @format int64 */
1574 1652 id?: number;
1575 1653 /** @format int32 */
... ... @@ -1591,6 +1669,8 @@ export interface QueryBankStatementDto {
1591 1669 remark?: string;
1592 1670 remarkNote?: string;
1593 1671 serialNumber?: string;
  1672 + /** @format int32 */
  1673 + start?: number;
1594 1674 status?: string;
1595 1675 /** @format int32 */
1596 1676 total?: number;
... ... @@ -1805,6 +1885,8 @@ export interface ResearchGroupListRequest {
1805 1885 accountPhone?: string;
1806 1886 /** @format int32 */
1807 1887 current?: number;
  1888 + /** @format int32 */
  1889 + end?: number;
1808 1890 /**
1809 1891 * @description
1810 1892 * 课题组名称
... ... @@ -1828,6 +1910,8 @@ export interface ResearchGroupListRequest {
1828 1910 /** @format int32 */
1829 1911 pageSize?: number;
1830 1912 /** @format int32 */
  1913 + start?: number;
  1914 + /** @format int32 */
1831 1915 total?: number;
1832 1916 }
1833 1917  
... ... @@ -1965,6 +2049,8 @@ export interface ResearchGroupMemberRequestsRequest {
1965 2049 createByName?: string;
1966 2050 /** @format int32 */
1967 2051 current?: number;
  2052 + /** @format int32 */
  2053 + end?: number;
1968 2054 /**
1969 2055 * @description
1970 2056 * 课题组名称
... ... @@ -1988,6 +2074,8 @@ export interface ResearchGroupMemberRequestsRequest {
1988 2074 */
1989 2075 requestNotes?: string;
1990 2076 /** @format int32 */
  2077 + start?: number;
  2078 + /** @format int32 */
1991 2079 total?: number;
1992 2080 }
1993 2081  
... ... @@ -2025,6 +2113,8 @@ export interface SysLogQueryVO {
2025 2113 /** @format int32 */
2026 2114 current?: number;
2027 2115 description?: string;
  2116 + /** @format int32 */
  2117 + end?: number;
2028 2118 exceptionDetail?: string;
2029 2119 /** @format int64 */
2030 2120 id?: number;
... ... @@ -2035,6 +2125,8 @@ export interface SysLogQueryVO {
2035 2125 pageSize?: number;
2036 2126 params?: string;
2037 2127 requestIp?: string;
  2128 + /** @format int32 */
  2129 + start?: number;
2038 2130 /** @format int64 */
2039 2131 time?: number;
2040 2132 /** @format int32 */
... ... @@ -2175,8 +2267,12 @@ export interface UserCenterInfoRequest {
2175 2267 /** @format int32 */
2176 2268 current?: number;
2177 2269 /** @format int32 */
  2270 + end?: number;
  2271 + /** @format int32 */
2178 2272 pageSize?: number;
2179 2273 /** @format int32 */
  2274 + start?: number;
  2275 + /** @format int32 */
2180 2276 total?: number;
2181 2277 /**
2182 2278 * @description
... ... @@ -2196,6 +2292,8 @@ export interface UserDetailRequest {
2196 2292 /** @format int32 */
2197 2293 current?: number;
2198 2294 /** @format int32 */
  2295 + end?: number;
  2296 + /** @format int32 */
2199 2297 pageSize?: number;
2200 2298 /**
2201 2299 * @description
... ... @@ -2203,6 +2301,8 @@ export interface UserDetailRequest {
2203 2301 */
2204 2302 phone?: string;
2205 2303 /** @format int32 */
  2304 + start?: number;
  2305 + /** @format int32 */
2206 2306 total?: number;
2207 2307 /**
2208 2308 * @description
... ... @@ -2219,6 +2319,8 @@ export interface UserListRequest {
2219 2319 * 创建日期开始时间
2220 2320 */
2221 2321 dateLimit?: string;
  2322 + /** @format int32 */
  2323 + end?: number;
2222 2324 /**
2223 2325 * @description
2224 2326 * 单位
... ... @@ -2248,10 +2350,18 @@ export interface UserListRequest {
2248 2350 phones?: Array<string>;
2249 2351 /**
2250 2352 * @description
  2353 + * 内部订单系统课题组id
  2354 + * @format int64
  2355 + */
  2356 + researchGroupId?: number;
  2357 + /**
  2358 + * @description
2251 2359 * salesCode
2252 2360 */
2253 2361 salesCode?: string;
2254 2362 /** @format int32 */
  2363 + start?: number;
  2364 + /** @format int32 */
2255 2365 total?: number;
2256 2366 /**
2257 2367 * @description
... ... @@ -2271,6 +2381,13 @@ export interface UserListRequest {
2271 2381 username?: string;
2272 2382 }
2273 2383  
  2384 +export interface UserNowMoneyCheckRequest {
  2385 + phone?: string;
  2386 + subPrice?: number;
  2387 + /** @format int64 */
  2388 + uid?: number;
  2389 +}
  2390 +
2274 2391 export interface View {
2275 2392 contentType?: string;
2276 2393 }
... ... @@ -2419,6 +2536,8 @@ export interface SalesRechargePrepaymentRequest {
2419 2536 * @format int32
2420 2537 */
2421 2538 enableFlag?: number;
  2539 + /** @format int32 */
  2540 + end?: number;
2422 2541 /**
2423 2542 * @description
2424 2543 * id
... ... @@ -2463,6 +2582,8 @@ export interface SalesRechargePrepaymentRequest {
2463 2582 * 销售代表
2464 2583 */
2465 2584 salesCode?: string;
  2585 + /** @format int32 */
  2586 + start?: number;
2466 2587 /**
2467 2588 * @description
2468 2589 * 状态
... ...
src/services/request.ts
  View file @3d30251
... ... @@ -110,6 +110,7 @@ import type {
110 110 UserCenterInfoRequest,
111 111 UserDetailRequest,
112 112 UserListRequest,
  113 + UserNowMoneyCheckRequest,
113 114 } from './definition';
114 115  
115 116 /** @description request parameter type for postApiLocalStorageUpload */
... ... @@ -1615,6 +1616,77 @@ export const postCanrdApiUserList = /* #__PURE__ */ (() =&gt; {
1615 1616 return request;
1616 1617 })();
1617 1618  
  1619 +/** @description request parameter type for postCanrdApiUserNowMoneyCheck */
  1620 +export interface PostCanrdApiUserNowMoneyCheckOption {
  1621 + /**
  1622 + * @description
  1623 + * request
  1624 + */
  1625 + body: {
  1626 + /**
  1627 + @description
  1628 + request */
  1629 + request: UserNowMoneyCheckRequest;
  1630 + };
  1631 +}
  1632 +
  1633 +/** @description response type for postCanrdApiUserNowMoneyCheck */
  1634 +export interface PostCanrdApiUserNowMoneyCheckResponse {
  1635 + /**
  1636 + * @description
  1637 + * OK
  1638 + */
  1639 + 200: ServerResult;
  1640 + /**
  1641 + * @description
  1642 + * Created
  1643 + */
  1644 + 201: any;
  1645 + /**
  1646 + * @description
  1647 + * Unauthorized
  1648 + */
  1649 + 401: any;
  1650 + /**
  1651 + * @description
  1652 + * Forbidden
  1653 + */
  1654 + 403: any;
  1655 + /**
  1656 + * @description
  1657 + * Not Found
  1658 + */
  1659 + 404: any;
  1660 +}
  1661 +
  1662 +export type PostCanrdApiUserNowMoneyCheckResponseSuccess =
  1663 + PostCanrdApiUserNowMoneyCheckResponse[200];
  1664 +/**
  1665 + * @description
  1666 + * 检查用户额度
  1667 + * @tags canrd-mobile-api-controller
  1668 + * @produces *
  1669 + * @consumes application/json
  1670 + */
  1671 +export const postCanrdApiUserNowMoneyCheck = /* #__PURE__ */ (() => {
  1672 + const method = 'post';
  1673 + const url = '/canrd/api/user/nowMoney/check';
  1674 + function request(
  1675 + option: PostCanrdApiUserNowMoneyCheckOption,
  1676 + ): Promise<PostCanrdApiUserNowMoneyCheckResponseSuccess> {
  1677 + return requester(request.url, {
  1678 + method: request.method,
  1679 + ...option,
  1680 + }) as unknown as Promise<PostCanrdApiUserNowMoneyCheckResponseSuccess>;
  1681 + }
  1682 +
  1683 + /** http method */
  1684 + request.method = method;
  1685 + /** request url */
  1686 + request.url = url;
  1687 + return request;
  1688 +})();
  1689 +
1618 1690 /** @description request parameter type for postCommonAudit */
1619 1691 export interface PostCommonAuditOption {
1620 1692 /**
... ...