3a51a1cd by 张猛

团体支付考点

1 parent dbdf4c4c
...@@ -9,12 +9,14 @@ export function active(data) { ...@@ -9,12 +9,14 @@ export function active(data) {
9 params: data 9 params: data
10 }) 10 })
11 } 11 }
12
12 export function getBlack() { 13 export function getBlack() {
13 return request({ 14 return request({
14 url: '/member/info/check', 15 url: '/member/info/check',
15 method: 'get' 16 method: 'get'
16 }) 17 })
17 } 18 }
19
18 export function commitPaymentVoucherYJ(data) { 20 export function commitPaymentVoucherYJ(data) {
19 return request({ 21 return request({
20 url: '/person/paymentDocYj/commitPaymentVoucher', 22 url: '/person/paymentDocYj/commitPaymentVoucher',
...@@ -30,6 +32,7 @@ export function editMyMemberCertifiedInfo(data) { ...@@ -30,6 +32,7 @@ export function editMyMemberCertifiedInfo(data) {
30 params: data 32 params: data
31 }) 33 })
32 } 34 }
35
33 export function addMergeToRange(params) { 36 export function addMergeToRange(params) {
34 return request({ 37 return request({
35 url: `/person/infoMerge/addMergeToRange/${params.perIds}?perId=${params.perIds}&rangeIdStr=${params.rangeIdStr}`, 38 url: `/person/infoMerge/addMergeToRange/${params.perIds}?perId=${params.perIds}&rangeIdStr=${params.rangeIdStr}`,
...@@ -37,6 +40,7 @@ export function addMergeToRange(params) { ...@@ -37,6 +40,7 @@ export function addMergeToRange(params) {
37 params: params 40 params: params
38 }) 41 })
39 } 42 }
43
40 export function mergerVipAudit(params) { 44 export function mergerVipAudit(params) {
41 console.log(params) 45 console.log(params)
42 return request({ 46 return request({
...@@ -45,6 +49,7 @@ export function mergerVipAudit(params) { ...@@ -45,6 +49,7 @@ export function mergerVipAudit(params) {
45 params: params 49 params: params
46 }) 50 })
47 } 51 }
52
48 export function infoMergeRangeList(params) { 53 export function infoMergeRangeList(params) {
49 return request({ 54 return request({
50 url: `/person/infoMergeRange/list`, 55 url: `/person/infoMergeRange/list`,
...@@ -52,12 +57,14 @@ export function infoMergeRangeList(params) { ...@@ -52,12 +57,14 @@ export function infoMergeRangeList(params) {
52 params: params 57 params: params
53 }) 58 })
54 } 59 }
60
55 export function infoMergeMod(id) { 61 export function infoMergeMod(id) {
56 return request({ 62 return request({
57 url: `/person/infoMerge/${id}`, 63 url: `/person/infoMerge/${id}`,
58 method: 'delete' 64 method: 'delete'
59 }) 65 })
60 } 66 }
67
61 export function commitMergeVip(ids) { 68 export function commitMergeVip(ids) {
62 return request({ 69 return request({
63 url: `/person/infoMergeRange/commit/${ids}`, 70 url: `/person/infoMergeRange/commit/${ids}`,
...@@ -79,6 +86,7 @@ export function infoMergeList(params) { ...@@ -79,6 +86,7 @@ export function infoMergeList(params) {
79 params: params 86 params: params
80 }) 87 })
81 } 88 }
89
82 export function editMergeByOldIdc(params) { 90 export function editMergeByOldIdc(params) {
83 return request({ 91 return request({
84 url: `/person/infoMerge/editMergeByOldIdc/${params.mergeId}?mergeId=${params.mergeId}&idcCode=${params.idcCode}`, 92 url: `/person/infoMerge/editMergeByOldIdc/${params.mergeId}?mergeId=${params.mergeId}&idcCode=${params.idcCode}`,
...@@ -86,6 +94,7 @@ export function editMergeByOldIdc(params) { ...@@ -86,6 +94,7 @@ export function editMergeByOldIdc(params) {
86 params: params 94 params: params
87 }) 95 })
88 } 96 }
97
89 export function editMergeByFile(params) { 98 export function editMergeByFile(params) {
90 return request({ 99 return request({
91 url: `/person/infoMerge/editMergeByFile/${params.mergeId}?mergeId=${params.mergeId}&fileUrl=${encodeURIComponent(params.fileUrl)}`, 100 url: `/person/infoMerge/editMergeByFile/${params.mergeId}?mergeId=${params.mergeId}&fileUrl=${encodeURIComponent(params.fileUrl)}`,
...@@ -93,6 +102,7 @@ export function editMergeByFile(params) { ...@@ -93,6 +102,7 @@ export function editMergeByFile(params) {
93 params: params 102 params: params
94 }) 103 })
95 } 104 }
105
96 // 通知公告 106 // 通知公告
97 export function notice(query) { 107 export function notice(query) {
98 return request({ 108 return request({
...@@ -101,6 +111,7 @@ export function notice(query) { ...@@ -101,6 +111,7 @@ export function notice(query) {
101 params: query 111 params: query
102 }) 112 })
103 } 113 }
114
104 export function getNewsById(noteId) { 115 export function getNewsById(noteId) {
105 return request({ 116 return request({
106 url: `/system/note/${noteId}`, 117 url: `/system/note/${noteId}`,
...@@ -116,6 +127,7 @@ export function certifiedDeptTree(params) { ...@@ -116,6 +127,7 @@ export function certifiedDeptTree(params) {
116 params: params 127 params: params
117 }) 128 })
118 } 129 }
130
119 // 查询部门下拉树结构 131 // 查询部门下拉树结构
120 export function deptTreeSelect(params) { 132 export function deptTreeSelect(params) {
121 return request({ 133 return request({
...@@ -127,6 +139,7 @@ export function deptTreeSelect(params) { ...@@ -127,6 +139,7 @@ export function deptTreeSelect(params) {
127 return res 139 return res
128 }) 140 })
129 } 141 }
142
130 // 注册选择协会树 143 // 注册选择协会树
131 export function certifiedDeptTreeRegister(params) { 144 export function certifiedDeptTreeRegister(params) {
132 return request({ 145 return request({
...@@ -135,6 +148,7 @@ export function certifiedDeptTreeRegister(params) { ...@@ -135,6 +148,7 @@ export function certifiedDeptTreeRegister(params) {
135 params 148 params
136 }) 149 })
137 } 150 }
151
138 const setIdToString = (list) => { 152 const setIdToString = (list) => {
139 for (var l of list) { 153 for (var l of list) {
140 l.id += '' 154 l.id += ''
...@@ -161,6 +175,7 @@ export function updateUserProfile(data) { ...@@ -161,6 +175,7 @@ export function updateUserProfile(data) {
161 params: data 175 params: data
162 }) 176 })
163 } 177 }
178
164 export function createMyMember(data) { 179 export function createMyMember(data) {
165 return request({ 180 return request({
166 url: '/member/info/createMyMember', 181 url: '/member/info/createMyMember',
...@@ -168,6 +183,7 @@ export function createMyMember(data) { ...@@ -168,6 +183,7 @@ export function createMyMember(data) {
168 params: data 183 params: data
169 }) 184 })
170 } 185 }
186
171 export function updateUserPwd(data) { 187 export function updateUserPwd(data) {
172 return request({ 188 return request({
173 url: `/system/user/profile/updatePwd?oldPassword=${encodeURIComponent(data.oldPassword)}&newPassword=${encodeURIComponent(data.newPassword)}`, 189 url: `/system/user/profile/updatePwd?oldPassword=${encodeURIComponent(data.oldPassword)}&newPassword=${encodeURIComponent(data.newPassword)}`,
...@@ -175,6 +191,7 @@ export function updateUserPwd(data) { ...@@ -175,6 +191,7 @@ export function updateUserPwd(data) {
175 params: data 191 params: data
176 }) 192 })
177 } 193 }
194
178 export function getMessage(params) { 195 export function getMessage(params) {
179 return request({ 196 return request({
180 url: '/common/home/getMessage', 197 url: '/common/home/getMessage',
...@@ -198,6 +215,7 @@ export function regionsList(params) { ...@@ -198,6 +215,7 @@ export function regionsList(params) {
198 params 215 params
199 }) 216 })
200 } 217 }
218
201 // 添加会员自动录入 上传图片 219 // 添加会员自动录入 上传图片
202 export function carUrl(data, type) { 220 export function carUrl(data, type) {
203 return uni.uploadFile({ 221 return uni.uploadFile({
...@@ -227,6 +245,7 @@ export function addPersonToMyDept(data) { ...@@ -227,6 +245,7 @@ export function addPersonToMyDept(data) {
227 params: data 245 params: data
228 }) 246 })
229 } 247 }
248
230 export function insertSinglePay(data) { 249 export function insertSinglePay(data) {
231 return request({ 250 return request({
232 url: '/person/paymentNew/insertSinglePay', 251 url: '/person/paymentNew/insertSinglePay',
...@@ -234,6 +253,7 @@ export function insertSinglePay(data) { ...@@ -234,6 +253,7 @@ export function insertSinglePay(data) {
234 params: data 253 params: data
235 }) 254 })
236 } 255 }
256
237 // 提交人工审核 257 // 提交人工审核
238 export function addPersonCommit(data) { 258 export function addPersonCommit(data) {
239 return request({ 259 return request({
...@@ -249,6 +269,7 @@ export function getZtxFeeConfig() { ...@@ -249,6 +269,7 @@ export function getZtxFeeConfig() {
249 method: 'get' 269 method: 'get'
250 }) 270 })
251 } 271 }
272
252 // 图片上传 273 // 图片上传
253 export function uploadImg(e) { 274 export function uploadImg(e) {
254 const tempFilePaths = e.tempFilePaths; 275 const tempFilePaths = e.tempFilePaths;
...@@ -270,6 +291,7 @@ export function uploadImg(e) { ...@@ -270,6 +291,7 @@ export function uploadImg(e) {
270 uni.hideLoading(); 291 uni.hideLoading();
271 }); 292 });
272 } 293 }
294
273 // corp 295 // corp
274 export function uploadImgCorp(tempFilePath) { 296 export function uploadImgCorp(tempFilePath) {
275 const imgUrl = tempFilePath 297 const imgUrl = tempFilePath
...@@ -290,6 +312,7 @@ export function uploadImgCorp(tempFilePath) { ...@@ -290,6 +312,7 @@ export function uploadImgCorp(tempFilePath) {
290 uni.hideLoading(); 312 uni.hideLoading();
291 }); 313 });
292 } 314 }
315
293 //only for addVip photoUp 316 //only for addVip photoUp
294 export function uploadImgCorpPhoto(tempFilePath) { 317 export function uploadImgCorpPhoto(tempFilePath) {
295 const imgUrl = tempFilePath 318 const imgUrl = tempFilePath
...@@ -317,6 +340,7 @@ export function getInfo(perId) { ...@@ -317,6 +340,7 @@ export function getInfo(perId) {
317 method: 'get' 340 method: 'get'
318 }) 341 })
319 } 342 }
343
320 // 查询个人会员信息列表 344 // 查询个人会员信息列表
321 export function selectPageList(query) { 345 export function selectPageList(query) {
322 return request({ 346 return request({
...@@ -333,6 +357,7 @@ export function delInfo(perId) { ...@@ -333,6 +357,7 @@ export function delInfo(perId) {
333 method: 'POST' 357 method: 'POST'
334 }) 358 })
335 } 359 }
360
336 // 查询个人个人会员缴费列表 361 // 查询个人个人会员缴费列表
337 // export function getPaymentList(query) { 362 // export function getPaymentList(query) {
338 // return request({ 363 // return request({
...@@ -348,6 +373,7 @@ export function getPaymentList(query) { ...@@ -348,6 +373,7 @@ export function getPaymentList(query) {
348 params: query 373 params: query
349 }) 374 })
350 } 375 }
376
351 // 查询添加个人个人会员缴费列表 377 // 查询添加个人个人会员缴费列表
352 export function addSelectPageList(query) { 378 export function addSelectPageList(query) {
353 return request({ 379 return request({
...@@ -371,6 +397,7 @@ export function fillAuditLog(ids) { ...@@ -371,6 +397,7 @@ export function fillAuditLog(ids) {
371 method: 'get' 397 method: 'get'
372 }) 398 })
373 } 399 }
400
374 // 审核列表 401 // 审核列表
375 export function getVerifyList(params) { 402 export function getVerifyList(params) {
376 return request({ 403 return request({
...@@ -379,6 +406,7 @@ export function getVerifyList(params) { ...@@ -379,6 +406,7 @@ export function getVerifyList(params) {
379 params: params 406 params: params
380 }) 407 })
381 } 408 }
409
382 // 审核 410 // 审核
383 export function audit(data) { 411 export function audit(data) {
384 return request({ 412 return request({
...@@ -387,6 +415,7 @@ export function audit(data) { ...@@ -387,6 +415,7 @@ export function audit(data) {
387 params: data 415 params: data
388 }) 416 })
389 } 417 }
418
390 // 审核详情 419 // 审核详情
391 export function getHistoryByRelateId(rId) { 420 export function getHistoryByRelateId(rId) {
392 return request({ 421 return request({
...@@ -394,6 +423,7 @@ export function getHistoryByRelateId(rId) { ...@@ -394,6 +423,7 @@ export function getHistoryByRelateId(rId) {
394 method: 'get', 423 method: 'get',
395 }) 424 })
396 } 425 }
426
397 // 查询单位会员信息列表 427 // 查询单位会员信息列表
398 export function getGroupVipList(query) { 428 export function getGroupVipList(query) {
399 return request({ 429 return request({
...@@ -402,6 +432,7 @@ export function getGroupVipList(query) { ...@@ -402,6 +432,7 @@ export function getGroupVipList(query) {
402 params: query 432 params: query
403 }) 433 })
404 } 434 }
435
405 // 查询单位会员 全部会员数,有效会员数 436 // 查询单位会员 全部会员数,有效会员数
406 export function getMemberCountInfo(query) { 437 export function getMemberCountInfo(query) {
407 return request({ 438 return request({
...@@ -433,6 +464,7 @@ export function getFeeBillDetail(payId) { ...@@ -433,6 +464,7 @@ export function getFeeBillDetail(payId) {
433 method: 'get' 464 method: 'get'
434 }) 465 })
435 } 466 }
467
436 // 获取自己团队成员信息 468 // 获取自己团队成员信息
437 export function getMyOwnMemberInfo() { 469 export function getMyOwnMemberInfo() {
438 return request({ 470 return request({
...@@ -440,6 +472,7 @@ export function getMyOwnMemberInfo() { ...@@ -440,6 +472,7 @@ export function getMyOwnMemberInfo() {
440 method: 'get' 472 method: 'get'
441 }) 473 })
442 } 474 }
475
443 // 会员调入 476 // 会员调入
444 export function getMobilizelist(params) { 477 export function getMobilizelist(params) {
445 return request({ 478 return request({
...@@ -448,6 +481,7 @@ export function getMobilizelist(params) { ...@@ -448,6 +481,7 @@ export function getMobilizelist(params) {
448 params 481 params
449 }) 482 })
450 } 483 }
484
451 // 调动会员成员 485 // 调动会员成员
452 export function getTransferList(data) { 486 export function getTransferList(data) {
453 return request({ 487 return request({
...@@ -456,6 +490,7 @@ export function getTransferList(data) { ...@@ -456,6 +490,7 @@ export function getTransferList(data) {
456 params: data 490 params: data
457 }) 491 })
458 } 492 }
493
459 // 查询单位会员信息列表 494 // 查询单位会员信息列表
460 export function getGroupList(params) { 495 export function getGroupList(params) {
461 return request({ 496 return request({
...@@ -464,6 +499,7 @@ export function getGroupList(params) { ...@@ -464,6 +499,7 @@ export function getGroupList(params) {
464 params: params 499 params: params
465 }) 500 })
466 } 501 }
502
467 // 查询 503 // 查询
468 export function pickUp(data) { 504 export function pickUp(data) {
469 return request({ 505 return request({
...@@ -472,6 +508,7 @@ export function pickUp(data) { ...@@ -472,6 +508,7 @@ export function pickUp(data) {
472 params: data 508 params: data
473 }) 509 })
474 } 510 }
511
475 // 添加调入会员 512 // 添加调入会员
476 export function addTransferToRange(data) { 513 export function addTransferToRange(data) {
477 return request({ 514 return request({
...@@ -480,18 +517,21 @@ export function addTransferToRange(data) { ...@@ -480,18 +517,21 @@ export function addTransferToRange(data) {
480 params: data 517 params: data
481 }) 518 })
482 } 519 }
520
483 export function deltransferRange(rids) { 521 export function deltransferRange(rids) {
484 return request({ 522 return request({
485 url: `/person/transfer/${rids}`, 523 url: `/person/transfer/${rids}`,
486 method: 'delete' 524 method: 'delete'
487 }) 525 })
488 } 526 }
527
489 export function commit(rangeIds) { 528 export function commit(rangeIds) {
490 return request({ 529 return request({
491 url: `/person/transferRange/commit/${rangeIds}`, 530 url: `/person/transferRange/commit/${rangeIds}`,
492 method: 'post' 531 method: 'post'
493 }) 532 })
494 } 533 }
534
495 // 调动审批 535 // 调动审批
496 export function mobilizeAudit(data) { 536 export function mobilizeAudit(data) {
497 return request({ 537 return request({
...@@ -500,6 +540,7 @@ export function mobilizeAudit(data) { ...@@ -500,6 +540,7 @@ export function mobilizeAudit(data) {
500 params: data 540 params: data
501 }) 541 })
502 } 542 }
543
503 export function delMobilize(rids) { 544 export function delMobilize(rids) {
504 return request({ 545 return request({
505 url: `/person/transferRange/${rids}`, 546 url: `/person/transferRange/${rids}`,
...@@ -528,6 +569,7 @@ export function uploadFile(e) { ...@@ -528,6 +569,7 @@ export function uploadFile(e) {
528 uni.hideLoading(); 569 uni.hideLoading();
529 }); 570 });
530 } 571 }
572
531 // muit 573 // muit
532 export function uploadFileList(path) { 574 export function uploadFileList(path) {
533 uni.showLoading({ 575 uni.showLoading({
...@@ -547,6 +589,7 @@ export function uploadFileList(path) { ...@@ -547,6 +589,7 @@ export function uploadFileList(path) {
547 uni.hideLoading(); 589 uni.hideLoading();
548 }); 590 });
549 } 591 }
592
550 // 查询考级信息列表 593 // 查询考级信息列表
551 export function getLevelList(query) { 594 export function getLevelList(query) {
552 return request({ 595 return request({
...@@ -555,6 +598,7 @@ export function getLevelList(query) { ...@@ -555,6 +598,7 @@ export function getLevelList(query) {
555 params: query 598 params: query
556 }) 599 })
557 } 600 }
601
558 // 查询考级信息详细 602 // 查询考级信息详细
559 export function getLevelApplyInfo(examId) { 603 export function getLevelApplyInfo(examId) {
560 return request({ 604 return request({
...@@ -598,6 +642,7 @@ export function getCoachList(params) { ...@@ -598,6 +642,7 @@ export function getCoachList(params) {
598 params: params 642 params: params
599 }) 643 })
600 } 644 }
645
601 // 修改考级信息 646 // 修改考级信息
602 export function updateLevelInfo(data) { 647 export function updateLevelInfo(data) {
603 return request({ 648 return request({
...@@ -606,6 +651,7 @@ export function updateLevelInfo(data) { ...@@ -606,6 +651,7 @@ export function updateLevelInfo(data) {
606 params: data 651 params: data
607 }) 652 })
608 } 653 }
654
609 // 新增考级信息 655 // 新增考级信息
610 export function addLevelInfo(data) { 656 export function addLevelInfo(data) {
611 return request({ 657 return request({
...@@ -646,6 +692,7 @@ export function getVerityList(params) { ...@@ -646,6 +692,7 @@ export function getVerityList(params) {
646 params: params 692 params: params
647 }) 693 })
648 } 694 }
695
649 export function getPerVerityList(params) { 696 export function getPerVerityList(params) {
650 return request({ 697 return request({
651 url: '/person/paymentRange/verifyList', 698 url: '/person/paymentRange/verifyList',
...@@ -739,6 +786,7 @@ export function groupCommitPaymentVoucher(data) { ...@@ -739,6 +786,7 @@ export function groupCommitPaymentVoucher(data) {
739 params: data 786 params: data
740 }) 787 })
741 } 788 }
789
742 export function submitPayment(data) { 790 export function submitPayment(data) {
743 return request({ 791 return request({
744 url: '/exam/payment', 792 url: '/exam/payment',
...@@ -761,6 +809,7 @@ export function personalCommit(id) { ...@@ -761,6 +809,7 @@ export function personalCommit(id) {
761 params: id 809 params: id
762 }) 810 })
763 } 811 }
812
764 export function getNewCountByRangeId(rangeId) { 813 export function getNewCountByRangeId(rangeId) {
765 return request({ 814 return request({
766 url: `/person/paymentNew/getNewCountByRangeId/${rangeId}`, 815 url: `/person/paymentNew/getNewCountByRangeId/${rangeId}`,
...@@ -774,6 +823,7 @@ export function delPayment(payIds) { ...@@ -774,6 +823,7 @@ export function delPayment(payIds) {
774 method: 'DELETE' 823 method: 'DELETE'
775 }) 824 })
776 } 825 }
826
777 export function paymentDel(payIds) { 827 export function paymentDel(payIds) {
778 return request({ 828 return request({
779 url: `/person/paymentRangeNew/${payIds}`, 829 url: `/person/paymentRangeNew/${payIds}`,
...@@ -844,6 +894,7 @@ export function getMergePaymentInfo(mergeId) { ...@@ -844,6 +894,7 @@ export function getMergePaymentInfo(mergeId) {
844 } 894 }
845 }) 895 })
846 } 896 }
897
847 // 一键下发 898 // 一键下发
848 export function submitCert(data) { 899 export function submitCert(data) {
849 return request({ 900 return request({
...@@ -852,6 +903,7 @@ export function submitCert(data) { ...@@ -852,6 +903,7 @@ export function submitCert(data) {
852 params: data 903 params: data
853 }) 904 })
854 } 905 }
906
855 export function submitCert2(data) { 907 export function submitCert2(data) {
856 return request({ 908 return request({
857 url: `/exam/payment/submitCerts/updateCerts`, 909 url: `/exam/payment/submitCerts/updateCerts`,
...@@ -859,6 +911,7 @@ export function submitCert2(data) { ...@@ -859,6 +911,7 @@ export function submitCert2(data) {
859 params: data 911 params: data
860 }) 912 })
861 } 913 }
914
862 export function getCertsLList(query) { 915 export function getCertsLList(query) {
863 return request({ 916 return request({
864 url: '/exam/payment/certsList', 917 url: '/exam/payment/certsList',
...@@ -908,12 +961,14 @@ export function getMySonList(data) { ...@@ -908,12 +961,14 @@ export function getMySonList(data) {
908 params: data 961 params: data
909 }) 962 })
910 } 963 }
964
911 export function getGroupMemberInfoById(memId) { 965 export function getGroupMemberInfoById(memId) {
912 return request({ 966 return request({
913 url: '/member/info/' + memId, 967 url: '/member/info/' + memId,
914 method: 'get' 968 method: 'get'
915 }) 969 })
916 } 970 }
971
917 export function addGroupPaymentGroup(data) { 972 export function addGroupPaymentGroup(data) {
918 return request({ 973 return request({
919 url: `/member/certifiedRange/addRangeMulti/${data.memIds}/${data.rangeId}`, 974 url: `/member/certifiedRange/addRangeMulti/${data.memIds}/${data.rangeId}`,
...@@ -937,6 +992,7 @@ export function withDraw(data) { ...@@ -937,6 +992,7 @@ export function withDraw(data) {
937 params: data 992 params: data
938 }) 993 })
939 } 994 }
995
940 export function groupWithDraw(data) { 996 export function groupWithDraw(data) {
941 return request({ 997 return request({
942 url: `/member/paymentRange/withDraw`, 998 url: `/member/paymentRange/withDraw`,
...@@ -944,6 +1000,7 @@ export function groupWithDraw(data) { ...@@ -944,6 +1000,7 @@ export function groupWithDraw(data) {
944 params: data 1000 params: data
945 }) 1001 })
946 } 1002 }
1003
947 export function certifiedwithDraw(data) { 1004 export function certifiedwithDraw(data) {
948 return request({ 1005 return request({
949 url: `/member/certified/withDraw`, 1006 url: `/member/certified/withDraw`,
...@@ -951,6 +1008,7 @@ export function certifiedwithDraw(data) { ...@@ -951,6 +1008,7 @@ export function certifiedwithDraw(data) {
951 params: data 1008 params: data
952 }) 1009 })
953 } 1010 }
1011
954 // 省合并缴费通知单 1012 // 省合并缴费通知单
955 export function mergePayMentApi(data) { 1013 export function mergePayMentApi(data) {
956 return request({ 1014 return request({
...@@ -975,6 +1033,7 @@ export function doMergeFlowsPer(data) { ...@@ -975,6 +1033,7 @@ export function doMergeFlowsPer(data) {
975 params: data 1033 params: data
976 }) 1034 })
977 } 1035 }
1036
978 // 省缴费单拆分 1037 // 省缴费单拆分
979 export function unMerge(recordId) { 1038 export function unMerge(recordId) {
980 return request({ 1039 return request({
...@@ -982,6 +1041,7 @@ export function unMerge(recordId) { ...@@ -982,6 +1041,7 @@ export function unMerge(recordId) {
982 method: 'post' 1041 method: 'post'
983 }) 1042 })
984 } 1043 }
1044
985 export function certifiedunMerge(recordId) { 1045 export function certifiedunMerge(recordId) {
986 return request({ 1046 return request({
987 url: `/member/certified/unMerge/${recordId}`, 1047 url: `/member/certified/unMerge/${recordId}`,
...@@ -995,6 +1055,7 @@ export function dellevelPerson(examId) { ...@@ -995,6 +1055,7 @@ export function dellevelPerson(examId) {
995 method: 'delete' 1055 method: 'delete'
996 }) 1056 })
997 } 1057 }
1058
998 export function getExamPersonNum(data) { 1059 export function getExamPersonNum(data) {
999 return request({ 1060 return request({
1000 url: `/exam/person/getExamPersonNum`, 1061 url: `/exam/person/getExamPersonNum`,
...@@ -1002,6 +1063,7 @@ export function getExamPersonNum(data) { ...@@ -1002,6 +1063,7 @@ export function getExamPersonNum(data) {
1002 params: data 1063 params: data
1003 }) 1064 })
1004 } 1065 }
1066
1005 export function doVerityBack(data) { 1067 export function doVerityBack(data) {
1006 return request({ 1068 return request({
1007 url: `/exam/info/verity/back`, 1069 url: `/exam/info/verity/back`,
...@@ -1009,24 +1071,28 @@ export function doVerityBack(data) { ...@@ -1009,24 +1071,28 @@ export function doVerityBack(data) {
1009 params: data 1071 params: data
1010 }) 1072 })
1011 } 1073 }
1074
1012 export function delRange(ids) { 1075 export function delRange(ids) {
1013 return request({ 1076 return request({
1014 url: `/member/certifiedRange/${ids}`, 1077 url: `/member/certifiedRange/${ids}`,
1015 method: 'delete' 1078 method: 'delete'
1016 }) 1079 })
1017 } 1080 }
1081
1018 export function delLevel(examId) { 1082 export function delLevel(examId) {
1019 return request({ 1083 return request({
1020 url: '/exam/info/' + examId, 1084 url: '/exam/info/' + examId,
1021 method: 'delete' 1085 method: 'delete'
1022 }) 1086 })
1023 } 1087 }
1088
1024 export function cancelMerge(id) { 1089 export function cancelMerge(id) {
1025 return request({ 1090 return request({
1026 url: '/exam/info/cancelMerge/' + id, 1091 url: '/exam/info/cancelMerge/' + id,
1027 method: 'post' 1092 method: 'post'
1028 }) 1093 })
1029 } 1094 }
1095
1030 export function getInfoModRange(params) { 1096 export function getInfoModRange(params) {
1031 return request({ 1097 return request({
1032 url: `/person/infoModRange/list`, 1098 url: `/person/infoModRange/list`,
...@@ -1034,6 +1100,7 @@ export function getInfoModRange(params) { ...@@ -1034,6 +1100,7 @@ export function getInfoModRange(params) {
1034 params: params 1100 params: params
1035 }) 1101 })
1036 } 1102 }
1103
1037 export function addInfoModeList(data) { 1104 export function addInfoModeList(data) {
1038 return request({ 1105 return request({
1039 url: `/person/infoMod/list`, 1106 url: `/person/infoMod/list`,
...@@ -1041,36 +1108,42 @@ export function addInfoModeList(data) { ...@@ -1041,36 +1108,42 @@ export function addInfoModeList(data) {
1041 params: data 1108 params: data
1042 }) 1109 })
1043 } 1110 }
1111
1044 export function infoMod(ids) { 1112 export function infoMod(ids) {
1045 return request({ 1113 return request({
1046 url: `/person/infoMod/${ids}`, 1114 url: `/person/infoMod/${ids}`,
1047 method: 'delete' 1115 method: 'delete'
1048 }) 1116 })
1049 } 1117 }
1118
1050 export function commitPersonalChange(ids) { 1119 export function commitPersonalChange(ids) {
1051 return request({ 1120 return request({
1052 url: `/person/infoModRange/commit/${ids}`, 1121 url: `/person/infoModRange/commit/${ids}`,
1053 method: 'post' 1122 method: 'post'
1054 }) 1123 })
1055 } 1124 }
1125
1056 export function delPersonalChange(ids) { 1126 export function delPersonalChange(ids) {
1057 return request({ 1127 return request({
1058 url: `/person/infoModRange/${ids}`, 1128 url: `/person/infoModRange/${ids}`,
1059 method: 'delete' 1129 method: 'delete'
1060 }) 1130 })
1061 } 1131 }
1132
1062 export function addInfoModeToRange(data) { 1133 export function addInfoModeToRange(data) {
1063 return request({ 1134 return request({
1064 url: `/person/infoMod/addInfoModeToRange/${data.perIds}?rangeIdStr=${data.rangeIdStr}`, 1135 url: `/person/infoMod/addInfoModeToRange/${data.perIds}?rangeIdStr=${data.rangeIdStr}`,
1065 method: 'post' 1136 method: 'post'
1066 }) 1137 })
1067 } 1138 }
1139
1068 export function addGroupInfoModeToRange(data) { 1140 export function addGroupInfoModeToRange(data) {
1069 return request({ 1141 return request({
1070 url: `/member/infoMod/addInfoModeToRange/${data.memId}?rangeIdStr=${data.rangeIdStr}`, 1142 url: `/member/infoMod/addInfoModeToRange/${data.memId}?rangeIdStr=${data.rangeIdStr}`,
1071 method: 'post' 1143 method: 'post'
1072 }) 1144 })
1073 } 1145 }
1146
1074 export function personChangeEditMod(data) { 1147 export function personChangeEditMod(data) {
1075 return request({ 1148 return request({
1076 url: `/person/infoMod/editMod`, 1149 url: `/person/infoMod/editMod`,
...@@ -1078,6 +1151,7 @@ export function personChangeEditMod(data) { ...@@ -1078,6 +1151,7 @@ export function personChangeEditMod(data) {
1078 params: data 1151 params: data
1079 }) 1152 })
1080 } 1153 }
1154
1081 export function groupChangeEditMod(data) { 1155 export function groupChangeEditMod(data) {
1082 return request({ 1156 return request({
1083 url: `/member/infoMod/editMod`, 1157 url: `/member/infoMod/editMod`,
...@@ -1085,30 +1159,35 @@ export function groupChangeEditMod(data) { ...@@ -1085,30 +1159,35 @@ export function groupChangeEditMod(data) {
1085 params: data 1159 params: data
1086 }) 1160 })
1087 } 1161 }
1162
1088 export function personChangeWithDraw(ids) { 1163 export function personChangeWithDraw(ids) {
1089 return request({ 1164 return request({
1090 url: `/person/infoModRange/withDraw/${ids}`, 1165 url: `/person/infoModRange/withDraw/${ids}`,
1091 method: 'post' 1166 method: 'post'
1092 }) 1167 })
1093 } 1168 }
1169
1094 export function personChangeAudit(data) { 1170 export function personChangeAudit(data) {
1095 return request({ 1171 return request({
1096 url: `/person/infoModRange/audit/${data.ids}?flag=${data.flag}&reason=${data.reason}`, 1172 url: `/person/infoModRange/audit/${data.ids}?flag=${data.flag}&reason=${data.reason}`,
1097 method: 'post' 1173 method: 'post'
1098 }) 1174 })
1099 } 1175 }
1176
1100 export function groupChangeAudit(data) { 1177 export function groupChangeAudit(data) {
1101 return request({ 1178 return request({
1102 url: `/member/infoModRange/audit/${data.ids}?flag=${data.flag}&reason=${data.reason}`, 1179 url: `/member/infoModRange/audit/${data.ids}?flag=${data.flag}&reason=${data.reason}`,
1103 method: 'post' 1180 method: 'post'
1104 }) 1181 })
1105 } 1182 }
1183
1106 export function pickUpByPersonInfo(form) { 1184 export function pickUpByPersonInfo(form) {
1107 return request({ 1185 return request({
1108 url: `/person/technology/getPersonTecDetailsByIdc/${form.idcType}/${form.idcCode}`, 1186 url: `/person/technology/getPersonTecDetailsByIdc/${form.idcType}/${form.idcCode}`,
1109 method: 'get' 1187 method: 'get'
1110 }) 1188 })
1111 } 1189 }
1190
1112 export function getLevelChangeAddList(params) { 1191 export function getLevelChangeAddList(params) {
1113 return request({ 1192 return request({
1114 url: `/person/levelMod/list`, 1193 url: `/person/levelMod/list`,
...@@ -1116,6 +1195,7 @@ export function getLevelChangeAddList(params) { ...@@ -1116,6 +1195,7 @@ export function getLevelChangeAddList(params) {
1116 params: params 1195 params: params
1117 }) 1196 })
1118 } 1197 }
1198
1119 export function getChangelevelList(params) { 1199 export function getChangelevelList(params) {
1120 return request({ 1200 return request({
1121 url: `/person/levelModRange/list`, 1201 url: `/person/levelModRange/list`,
...@@ -1123,6 +1203,7 @@ export function getChangelevelList(params) { ...@@ -1123,6 +1203,7 @@ export function getChangelevelList(params) {
1123 params: params 1203 params: params
1124 }) 1204 })
1125 } 1205 }
1206
1126 export function addLevelList(data) { 1207 export function addLevelList(data) {
1127 return request({ 1208 return request({
1128 url: `/person/levelMod/addLevelModToRange`, 1209 url: `/person/levelMod/addLevelModToRange`,
...@@ -1130,60 +1211,70 @@ export function addLevelList(data) { ...@@ -1130,60 +1211,70 @@ export function addLevelList(data) {
1130 params: data 1211 params: data
1131 }) 1212 })
1132 } 1213 }
1214
1133 export function addLevelModToRange(data) { 1215 export function addLevelModToRange(data) {
1134 return request({ 1216 return request({
1135 url: `/person/levelMod/editModInfo/${data.modId}?reason=${data.reason}&modId=${data.modId}`, 1217 url: `/person/levelMod/editModInfo/${data.modId}?reason=${data.reason}&modId=${data.modId}`,
1136 method: 'post' 1218 method: 'post'
1137 }) 1219 })
1138 } 1220 }
1221
1139 export function addLevelModToRangeFile(data) { 1222 export function addLevelModToRangeFile(data) {
1140 return request({ 1223 return request({
1141 url: `/person/levelMod/editModInfo/${data.modId}?modId=${data.modId}&fileUrl=${encodeURIComponent(data.fileUrl)}`, 1224 url: `/person/levelMod/editModInfo/${data.modId}?modId=${data.modId}&fileUrl=${encodeURIComponent(data.fileUrl)}`,
1142 method: 'post' 1225 method: 'post'
1143 }) 1226 })
1144 } 1227 }
1228
1145 export function levelModRangeDelete(ids) { 1229 export function levelModRangeDelete(ids) {
1146 return request({ 1230 return request({
1147 url: `/person/levelModRange/${ids}`, 1231 url: `/person/levelModRange/${ids}`,
1148 method: 'delete' 1232 method: 'delete'
1149 }) 1233 })
1150 } 1234 }
1235
1151 export function commitLevelChange(ids) { 1236 export function commitLevelChange(ids) {
1152 return request({ 1237 return request({
1153 url: `/person/levelModRange/commit/${ids}`, 1238 url: `/person/levelModRange/commit/${ids}`,
1154 method: 'post' 1239 method: 'post'
1155 }) 1240 })
1156 } 1241 }
1242
1157 export function editNewJi(data) { 1243 export function editNewJi(data) {
1158 return request({ 1244 return request({
1159 url: `/person/levelMod/editNewJi/${data.modId}?newJi=${data.NewJi}`, 1245 url: `/person/levelMod/editNewJi/${data.modId}?newJi=${data.NewJi}`,
1160 method: 'post' 1246 method: 'post'
1161 }) 1247 })
1162 } 1248 }
1249
1163 export function delLevelChangePer(data) { 1250 export function delLevelChangePer(data) {
1164 return request({ 1251 return request({
1165 url: `/person/levelMod/${data}`, 1252 url: `/person/levelMod/${data}`,
1166 method: 'delete' 1253 method: 'delete'
1167 }) 1254 })
1168 } 1255 }
1256
1169 export function levelModCommit(ids) { 1257 export function levelModCommit(ids) {
1170 return request({ 1258 return request({
1171 url: `/person/levelModRange/commit/${ids}`, 1259 url: `/person/levelModRange/commit/${ids}`,
1172 method: 'post' 1260 method: 'post'
1173 }) 1261 })
1174 } 1262 }
1263
1175 export function changeLevelAudit(data) { 1264 export function changeLevelAudit(data) {
1176 return request({ 1265 return request({
1177 url: `/person/levelModRange/audit/${data.ids}?flag=${data.flag}&reason=${data.reason}`, 1266 url: `/person/levelModRange/audit/${data.ids}?flag=${data.flag}&reason=${data.reason}`,
1178 method: 'post' 1267 method: 'post'
1179 }) 1268 })
1180 } 1269 }
1270
1181 export function changeLevelWithDraw(data) { 1271 export function changeLevelWithDraw(data) {
1182 return request({ 1272 return request({
1183 url: `/person/levelModRange/withDraw/${data}`, 1273 url: `/person/levelModRange/withDraw/${data}`,
1184 method: 'post' 1274 method: 'post'
1185 }) 1275 })
1186 } 1276 }
1277
1187 export function getMemberInfoModRange(data) { 1278 export function getMemberInfoModRange(data) {
1188 return request({ 1279 return request({
1189 url: `/member/infoModRange/list`, 1280 url: `/member/infoModRange/list`,
...@@ -1191,18 +1282,21 @@ export function getMemberInfoModRange(data) { ...@@ -1191,18 +1282,21 @@ export function getMemberInfoModRange(data) {
1191 params: data 1282 params: data
1192 }) 1283 })
1193 } 1284 }
1285
1194 export function commitGroupChange(ids) { 1286 export function commitGroupChange(ids) {
1195 return request({ 1287 return request({
1196 url: `/member/infoModRange/commit/${ids}`, 1288 url: `/member/infoModRange/commit/${ids}`,
1197 method: 'post' 1289 method: 'post'
1198 }) 1290 })
1199 } 1291 }
1292
1200 export function delGroupChange(ids) { 1293 export function delGroupChange(ids) {
1201 return request({ 1294 return request({
1202 url: `/member/infoModRange/${ids}`, 1295 url: `/member/infoModRange/${ids}`,
1203 method: 'delete' 1296 method: 'delete'
1204 }) 1297 })
1205 } 1298 }
1299
1206 export function getChangeGroupByRangeId(data) { 1300 export function getChangeGroupByRangeId(data) {
1207 return request({ 1301 return request({
1208 url: `/member/infoMod/list`, 1302 url: `/member/infoMod/list`,
...@@ -1210,12 +1304,14 @@ export function getChangeGroupByRangeId(data) { ...@@ -1210,12 +1304,14 @@ export function getChangeGroupByRangeId(data) {
1210 params: data 1304 params: data
1211 }) 1305 })
1212 } 1306 }
1307
1213 export function groupInfoMod(ids) { 1308 export function groupInfoMod(ids) {
1214 return request({ 1309 return request({
1215 url: `/member/infoMod/${ids}`, 1310 url: `/member/infoMod/${ids}`,
1216 method: 'delete' 1311 method: 'delete'
1217 }) 1312 })
1218 } 1313 }
1314
1219 export function extractInfoFromChinaIdCard(data) { 1315 export function extractInfoFromChinaIdCard(data) {
1220 return request({ 1316 return request({
1221 url: '/person/info/extractInfo', 1317 url: '/person/info/extractInfo',
...@@ -1223,6 +1319,7 @@ export function extractInfoFromChinaIdCard(data) { ...@@ -1223,6 +1319,7 @@ export function extractInfoFromChinaIdCard(data) {
1223 params: data 1319 params: data
1224 }) 1320 })
1225 } 1321 }
1322
1226 export function getRemindCount(params) { 1323 export function getRemindCount(params) {
1227 return request({ 1324 return request({
1228 url: '/system/remindCount/getCounts', 1325 url: '/system/remindCount/getCounts',
...@@ -1230,6 +1327,7 @@ export function getRemindCount(params) { ...@@ -1230,6 +1327,7 @@ export function getRemindCount(params) {
1230 params: params 1327 params: params
1231 }) 1328 })
1232 } 1329 }
1330
1233 export function jiDropDownBox(params) { 1331 export function jiDropDownBox(params) {
1234 return request({ 1332 return request({
1235 url: '/person/technology/jiDropDownBox', 1333 url: '/person/technology/jiDropDownBox',
...@@ -1244,12 +1342,14 @@ export function getUserProfile() { ...@@ -1244,12 +1342,14 @@ export function getUserProfile() {
1244 method: 'get' 1342 method: 'get'
1245 }) 1343 })
1246 } 1344 }
1345
1247 export function getMyCertStage() { 1346 export function getMyCertStage() {
1248 return request({ 1347 return request({
1249 url: `/member/certified/getMyCertStage`, 1348 url: `/member/certified/getMyCertStage`,
1250 method: 'get' 1349 method: 'get'
1251 }) 1350 })
1252 } 1351 }
1352
1253 // 月结列表 1353 // 月结列表
1254 export function mentDocList(data) { 1354 export function mentDocList(data) {
1255 return request({ 1355 return request({
...@@ -1258,12 +1358,14 @@ export function mentDocList(data) { ...@@ -1258,12 +1358,14 @@ export function mentDocList(data) {
1258 params: data 1358 params: data
1259 }) 1359 })
1260 } 1360 }
1361
1261 export function wdBack(yjIds) { 1362 export function wdBack(yjIds) {
1262 return request({ 1363 return request({
1263 url: `/person/paymentDocYj/wd/${yjIds}`, 1364 url: `/person/paymentDocYj/wd/${yjIds}`,
1264 method: 'get' 1365 method: 'get'
1265 }) 1366 })
1266 } 1367 }
1368
1267 // 个人会员月结缴费单 1369 // 个人会员月结缴费单
1268 export function downJiaoYJFei(arr) { 1370 export function downJiaoYJFei(arr) {
1269 return request({ 1371 return request({
...@@ -1278,24 +1380,28 @@ export function queryProcess(id) { ...@@ -1278,24 +1380,28 @@ export function queryProcess(id) {
1278 method: 'get' 1380 method: 'get'
1279 }) 1381 })
1280 } 1382 }
1383
1281 export function checkPersonByPayIds(payIds) { 1384 export function checkPersonByPayIds(payIds) {
1282 return request({ 1385 return request({
1283 url: `/exam/person/checkPersonByPayIds/${payIds}`, 1386 url: `/exam/person/checkPersonByPayIds/${payIds}`,
1284 method: 'get' 1387 method: 'get'
1285 }) 1388 })
1286 } 1389 }
1390
1287 export function checkPersonByExamIds(examIds) { 1391 export function checkPersonByExamIds(examIds) {
1288 return request({ 1392 return request({
1289 url: `/exam/person/checkPersonByExamIds/${examIds}`, 1393 url: `/exam/person/checkPersonByExamIds/${examIds}`,
1290 method: 'get' 1394 method: 'get'
1291 }) 1395 })
1292 } 1396 }
1397
1293 export function checkPersonByPersonId(perId) { 1398 export function checkPersonByPersonId(perId) {
1294 return request({ 1399 return request({
1295 url: `/exam/person/checkPersonByPersonId/${perId}`, 1400 url: `/exam/person/checkPersonByPersonId/${perId}`,
1296 method: 'get' 1401 method: 'get'
1297 }) 1402 })
1298 } 1403 }
1404
1299 // 获取单位会员优惠政策 1405 // 获取单位会员优惠政策
1300 export function canUseDiscount(params) { 1406 export function canUseDiscount(params) {
1301 return request({ 1407 return request({
...@@ -1304,6 +1410,7 @@ export function canUseDiscount(params) { ...@@ -1304,6 +1410,7 @@ export function canUseDiscount(params) {
1304 params 1410 params
1305 }) 1411 })
1306 } 1412 }
1413
1307 // 获取单位会员一年缴费价格 1414 // 获取单位会员一年缴费价格
1308 export function getMyMemberCertUnitFee(params) { 1415 export function getMyMemberCertUnitFee(params) {
1309 return request({ 1416 return request({
...@@ -1312,6 +1419,7 @@ export function getMyMemberCertUnitFee(params) { ...@@ -1312,6 +1419,7 @@ export function getMyMemberCertUnitFee(params) {
1312 params 1419 params
1313 }) 1420 })
1314 } 1421 }
1422
1315 export function checkBusinessLicense(data) { 1423 export function checkBusinessLicense(data) {
1316 return request({ 1424 return request({
1317 url: `/member/info/checkBusinessLicense`, 1425 url: `/member/info/checkBusinessLicense`,
...@@ -1335,12 +1443,14 @@ export function callBack2(orderId) { ...@@ -1335,12 +1443,14 @@ export function callBack2(orderId) {
1335 method: 'get', 1443 method: 'get',
1336 }) 1444 })
1337 } 1445 }
1446
1338 export function pcallBack2(orderId) { 1447 export function pcallBack2(orderId) {
1339 return request({ 1448 return request({
1340 url: `/person/paymentRangeNew/callBack2/${orderId}`, 1449 url: `/person/paymentRangeNew/callBack2/${orderId}`,
1341 method: 'get', 1450 method: 'get',
1342 }) 1451 })
1343 } 1452 }
1453
1344 // 优惠政策回显 1454 // 优惠政策回显
1345 export function getZtxDiscountPolicy(params) { 1455 export function getZtxDiscountPolicy(params) {
1346 return request({ 1456 return request({
...@@ -1349,6 +1459,7 @@ export function getZtxDiscountPolicy(params) { ...@@ -1349,6 +1459,7 @@ export function getZtxDiscountPolicy(params) {
1349 params 1459 params
1350 }) 1460 })
1351 } 1461 }
1462
1352 // 考官列表 1463 // 考官列表
1353 export function listApi(params) { 1464 export function listApi(params) {
1354 return request({ 1465 return request({
...@@ -1358,6 +1469,15 @@ export function listApi(params) { ...@@ -1358,6 +1469,15 @@ export function listApi(params) {
1358 }) 1469 })
1359 } 1470 }
1360 1471
1472 // 获取省级信息
1473 export function getShenMemberInfo() {
1474 return request({
1475 url: `/member/info/getShenMemberInfo`,
1476 method: 'get',
1477 })
1478 }
1479
1480
1361 // 考官列表 1481 // 考官列表
1362 export function examinerDel(id) { 1482 export function examinerDel(id) {
1363 return request({ 1483 return request({
...@@ -1374,6 +1494,14 @@ export function otherAdd(memId, ids) { ...@@ -1374,6 +1494,14 @@ export function otherAdd(memId, ids) {
1374 }) 1494 })
1375 } 1495 }
1376 1496
1497 // 添加考官
1498 export function selfAdd(memId, ids) {
1499 return request({
1500 url: `/member/examiner/selfAdd/${ids}`,
1501 method: 'post'
1502 })
1503 }
1504
1377 export function commitExamPointApply(params) { 1505 export function commitExamPointApply(params) {
1378 return request({ 1506 return request({
1379 url: `/member/examPointApply/commit?selfSelect=${params.selfSelect}`, 1507 url: `/member/examPointApply/commit?selfSelect=${params.selfSelect}`,
...@@ -1384,7 +1512,8 @@ export function commitExamPointApply(params) { ...@@ -1384,7 +1512,8 @@ export function commitExamPointApply(params) {
1384 1512
1385 export function getMyStatus() { 1513 export function getMyStatus() {
1386 return request({ 1514 return request({
1387 url: `/member/examPointApply/getMyStatus` 1515 url: `/member/examPointApply/getMyStatus`,
1516 method: 'get',
1388 }) 1517 })
1389 } 1518 }
1390 1519
...@@ -1395,6 +1524,7 @@ export function goPay(id) { ...@@ -1395,6 +1524,7 @@ export function goPay(id) {
1395 method: 'post' 1524 method: 'post'
1396 }) 1525 })
1397 } 1526 }
1527
1398 // 缴费单列表学员 1528 // 缴费单列表学员
1399 export function listAPI(params) { 1529 export function listAPI(params) {
1400 return request({ 1530 return request({
...@@ -1422,6 +1552,7 @@ export function memberInsertPersons(data) { ...@@ -1422,6 +1552,7 @@ export function memberInsertPersons(data) {
1422 data 1552 data
1423 }) 1553 })
1424 } 1554 }
1555
1425 export function createMemberPayRange(data) { 1556 export function createMemberPayRange(data) {
1426 return request({ 1557 return request({
1427 url: `/person/paymentRangeNew/createMemberPayRange`, 1558 url: `/person/paymentRangeNew/createMemberPayRange`,
...@@ -1430,7 +1561,7 @@ export function createMemberPayRange(data) { ...@@ -1430,7 +1561,7 @@ export function createMemberPayRange(data) {
1430 }) 1561 })
1431 } 1562 }
1432 1563
1433 // 获取最近认证记录 1564 // 获取最近认证记录 团体会员
1434 export function getMyRecent() { 1565 export function getMyRecent() {
1435 return request({ 1566 return request({
1436 url: '/system/certifiedNew/getMyRecent', 1567 url: '/system/certifiedNew/getMyRecent',
...@@ -1438,6 +1569,16 @@ export function getMyRecent() { ...@@ -1438,6 +1569,16 @@ export function getMyRecent() {
1438 }) 1569 })
1439 } 1570 }
1440 1571
1572
1573 // 获取最近认证记录 考点
1574 export function getMyRecentExam() {
1575 return request({
1576 url: '/member/examPointApply/getMyRecent',
1577 method: 'get'
1578 })
1579 }
1580
1581
1441 // 获取订单详情 1582 // 获取订单详情
1442 export function getOrderInfo(orderId) { 1583 export function getOrderInfo(orderId) {
1443 return request({ 1584 return request({
...@@ -1461,6 +1602,7 @@ export function unbindUser() { ...@@ -1461,6 +1602,7 @@ export function unbindUser() {
1461 method: 'post' 1602 method: 'post'
1462 }) 1603 })
1463 } 1604 }
1605
1464 /** 1606 /**
1465 * 订单列表 1607 * 订单列表
1466 * @param params 1608 * @param params
...@@ -1485,6 +1627,7 @@ export function deleteOrder(id) { ...@@ -1485,6 +1627,7 @@ export function deleteOrder(id) {
1485 method: 'delete' 1627 method: 'delete'
1486 }) 1628 })
1487 } 1629 }
1630
1488 /** 1631 /**
1489 * 取消订单 1632 * 取消订单
1490 * @param params 1633 * @param params
...@@ -1511,6 +1654,7 @@ export function getAssoPers(perId) { ...@@ -1511,6 +1654,7 @@ export function getAssoPers(perId) {
1511 method: 'get' 1654 method: 'get'
1512 }) 1655 })
1513 } 1656 }
1657
1514 export function checkMember(data) { 1658 export function checkMember(data) {
1515 return request({ 1659 return request({
1516 url: '/member/info/checkMember', 1660 url: '/member/info/checkMember',
...@@ -1526,13 +1670,15 @@ export function getBusinessLicense(data) { ...@@ -1526,13 +1670,15 @@ export function getBusinessLicense(data) {
1526 data: data 1670 data: data
1527 }) 1671 })
1528 } 1672 }
1673
1529 export function getLogs(examId, type) { 1674 export function getLogs(examId, type) {
1530 return request({ 1675 return request({
1531 url: `/exam/info/getLogs/${examId}`, 1676 url: `/exam/info/getLogs/${examId}`,
1532 method: 'get', 1677 method: 'get',
1533 params: { type } // 1 级位 2 段位 3 段位成绩 4 越段 5 越段成绩 1678 params: {type} // 1 级位 2 段位 3 段位成绩 4 越段 5 越段成绩
1534 }) 1679 })
1535 } 1680 }
1681
1536 export function newGetLogs(id) { 1682 export function newGetLogs(id) {
1537 return request({ 1683 return request({
1538 url: `/person/paymentRangeNew/getLogs/${id}`, 1684 url: `/person/paymentRangeNew/getLogs/${id}`,
...@@ -1547,6 +1693,7 @@ export function certifiedNewList(params) { ...@@ -1547,6 +1693,7 @@ export function certifiedNewList(params) {
1547 params 1693 params
1548 }) 1694 })
1549 } 1695 }
1696
1550 export function certifiedNewGetLogs(id) { 1697 export function certifiedNewGetLogs(id) {
1551 return request({ 1698 return request({
1552 url: `/system/certifiedNew/getLogs/${id}`, 1699 url: `/system/certifiedNew/getLogs/${id}`,
...@@ -1684,6 +1831,7 @@ export function editAddressOrder(examId, addressId) { ...@@ -1684,6 +1831,7 @@ export function editAddressOrder(examId, addressId) {
1684 method: 'put' 1831 method: 'put'
1685 }) 1832 })
1686 } 1833 }
1834
1687 /** 1835 /**
1688 * 查询证书列表 1836 * 查询证书列表
1689 * @param query 1837 * @param query
......
...@@ -50,6 +50,7 @@ export function submitCert(data) { ...@@ -50,6 +50,7 @@ export function submitCert(data) {
50 params: data 50 params: data
51 }) 51 })
52 } 52 }
53
53 /** 54 /**
54 * 段位考试成绩列表 55 * 段位考试成绩列表
55 * @param params 56 * @param params
...@@ -165,6 +166,19 @@ export function ztxAudit(params) { ...@@ -165,6 +166,19 @@ export function ztxAudit(params) {
165 } 166 }
166 167
167 /** 168 /**
169 * 考点审核
170 * @param params
171 * @returns {*}
172 */
173 export function shenAuditExamPointApply(params) {
174 return request({
175 url: `/member/examPointApply/shenAudit/${params.ids}`,
176 method: 'post',
177 params
178 })
179 }
180
181 /**
168 * 获取机构资料 182 * 获取机构资料
169 * @param memId 183 * @param memId
170 * @returns {*} 184 * @returns {*}
......
...@@ -10,6 +10,7 @@ function pcLogin(data) { ...@@ -10,6 +10,7 @@ function pcLogin(data) {
10 params: data 10 params: data
11 }).then((res) => { 11 }).then((res) => {
12 uni.setStorageSync('token', 'Bearer ' + res.data.token) 12 uni.setStorageSync('token', 'Bearer ' + res.data.token)
13 pcLoginOpenId()
13 }).then(getInfo) 14 }).then(getInfo)
14 } 15 }
15 16
...@@ -150,6 +151,7 @@ function groupMemberRegister(data) { ...@@ -150,6 +151,7 @@ function groupMemberRegister(data) {
150 params: data 151 params: data
151 }) 152 })
152 } 153 }
154
153 // 获取道馆信息 155 // 获取道馆信息
154 function getMyOwnMemberInfo() { 156 function getMyOwnMemberInfo() {
155 return request({ 157 return request({
...@@ -163,6 +165,23 @@ function getMyOwnMemberInfo() { ...@@ -163,6 +165,23 @@ function getMyOwnMemberInfo() {
163 }) 165 })
164 } 166 }
165 167
168 function pcLoginOpenId() {
169 uni.login({
170 provider: 'weixin',
171 success: (res) => {
172 if (res.code) {
173 pcBindOpenId(res.code)
174 }
175 },
176 fail: (res) => {
177 uni.showToast({
178 title: '获取用户信息失败',
179 icon: 'none',
180 duration: 2000
181 })
182 }
183 })
184 }
166 185
167 function wxLogin() { 186 function wxLogin() {
168 const openId = uni.getStorageSync('openId') 187 const openId = uni.getStorageSync('openId')
...@@ -209,6 +228,15 @@ function pcLoginByOpenId(openId) { ...@@ -209,6 +228,15 @@ function pcLoginByOpenId(openId) {
209 }) 228 })
210 } 229 }
211 230
231 function pcBindOpenId(code) {
232 return request({
233 url: `/bindOpenId?jsCode=${code}`,
234 method: "POST",
235 }).then((res) => {
236 uni.setStorageSync('openId', res.data.openId);
237 })
238 }
239
212 export { 240 export {
213 pcLogin, 241 pcLogin,
214 getCodeImg, 242 getCodeImg,
......
...@@ -66,6 +66,7 @@ async function minShengPay(orderId, encryptedData) { ...@@ -66,6 +66,7 @@ async function minShengPay(orderId, encryptedData) {
66 })) 66 }))
67 67
68 if (decryptErr || !decryptResult?.data) { 68 if (decryptErr || !decryptResult?.data) {
69
69 handlePaymentError(new Error(ERROR_MESSAGES.DECRYPT_FAILED), orderId) 70 handlePaymentError(new Error(ERROR_MESSAGES.DECRYPT_FAILED), orderId)
70 } 71 }
71 72
...@@ -85,14 +86,14 @@ async function minShengPay(orderId, encryptedData) { ...@@ -85,14 +86,14 @@ async function minShengPay(orderId, encryptedData) {
85 86
86 uni.hideLoading() 87 uni.hideLoading()
87 // 8. 调起微信支付 88 // 8. 调起微信支付
88 const [payErr, paySuccess] = await to(invokeWechatPayment(payParams, orderId)) 89 const [payErr] = await to(invokeWechatPayment(payParams, orderId))
89 if (payErr) { 90 if (payErr) {
90 handlePaymentError(payErr, orderId) 91 handlePaymentError(payErr, orderId)
91 92
92 } 93 }
93 if (paySuccess) { 94 // if (paySuccess) {
94 return paySuccess 95 // return paySuccess
95 } 96 // }
96 } 97 }
97 98
98 /** 99 /**
...@@ -194,7 +195,6 @@ function parsePayInfo(payInfoStr) { ...@@ -194,7 +195,6 @@ function parsePayInfo(payInfoStr) {
194 * @returns {Promise<Object>} 支付结果 195 * @returns {Promise<Object>} 支付结果
195 */ 196 */
196 function invokeWechatPayment(payParams, orderId) { 197 function invokeWechatPayment(payParams, orderId) {
197 debugger
198 return new Promise((resolve, reject) => { 198 return new Promise((resolve, reject) => {
199 // 参数校验 199 // 参数校验
200 const requiredFields = ['appId', 'nonceStr', 'prepayId', 'timeStamp', 'signType', 'paySign'] 200 const requiredFields = ['appId', 'nonceStr', 'prepayId', 'timeStamp', 'signType', 'paySign']
......
...@@ -30,7 +30,7 @@ function getHeaders() { ...@@ -30,7 +30,7 @@ function getHeaders() {
30 return header 30 return header
31 } 31 }
32 32
33 const request = function(req) { 33 const request = function (req) {
34 req.method = req.method.toUpperCase() 34 req.method = req.method.toUpperCase()
35 if (!['GET', 'POST', 'PUT', 'DELETE'].includes(req.method)) { 35 if (!['GET', 'POST', 'PUT', 'DELETE'].includes(req.method)) {
36 uni.showToast({ 36 uni.showToast({
......
1 // dev 1 // dev
2 // const baseUrl_api = 'http://192.168.1.137:8787' 2 const baseUrl_api = 'http://192.168.1.137:8787'
3 const baseUrl_api = 'http://tk001.wxjylt.com/stage-api' 3 // const baseUrl_api = 'http://tk001.wxjylt.com/stage-api'
4 const loginImage_api = 'http://tk001.wxjylt.com/stage-api'
4 const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do' 5 const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do'
5 6
6 // prod 7 // prod
...@@ -9,5 +10,7 @@ const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do' ...@@ -9,5 +10,7 @@ const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do'
9 10
10 export default { 11 export default {
11 baseUrl_api, 12 baseUrl_api,
12 payUrl 13 payUrl,
14 loginImage_api
13 } 15 }
16
......
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
2 <view class="audit-page"> 2 <view class="audit-page">
3 <!-- 提示信息 --> 3 <!-- 提示信息 -->
4 <view class="tips-box"> 4 <view class="tips-box">
5 <uni-icons type="info" size="18" color="#13B5B1"></uni-icons> 5 <uni-icons color="#13B5B1" size="18" type="info"></uni-icons>
6 <text class="tips-text" v-if="type === 'batch'">批量审核 {{ ids.split(',').length }} 条记录</text> 6 <text v-if="type === 'batch'" class="tips-text">批量审核 {{ ids.split(',').length }} 条记录</text>
7 <text class="tips-text" v-else>单个审核</text> 7 <text v-else class="tips-text">单个审核</text>
8 </view> 8 </view>
9 9
10 <!-- 审核表单 --> 10 <!-- 审核表单 -->
11 <view class="form-section"> 11 <view class="form-section">
12 <view class="section-header"> 12 <view class="section-header">
13 <uni-icons type="edit" size="18" color="#AD181F"></uni-icons> 13 <uni-icons color="#AD181F" size="18" type="edit"></uni-icons>
14 <text class="section-title">审核信息</text> 14 <text class="section-title">审核信息</text>
15 </view> 15 </view>
16 16
...@@ -19,22 +19,22 @@ ...@@ -19,22 +19,22 @@
19 <text class="form-label">审批结果</text> 19 <text class="form-label">审批结果</text>
20 <view class="radio-group"> 20 <view class="radio-group">
21 <view 21 <view
22 class="radio-item"
23 :class="{ selected: form.flag === '1' }" 22 :class="{ selected: form.flag === '1' }"
23 class="radio-item"
24 @click="form.flag = '1'" 24 @click="form.flag = '1'"
25 > 25 >
26 <view class="radio-circle"> 26 <view class="radio-circle">
27 <uni-icons v-if="form.flag === '1'" type="checkmark" size="10" color="#fff"></uni-icons> 27 <uni-icons v-if="form.flag === '1'" color="#fff" size="10" type="checkmark"></uni-icons>
28 </view> 28 </view>
29 <text>审批通过</text> 29 <text>审批通过</text>
30 </view> 30 </view>
31 <view 31 <view
32 class="radio-item"
33 :class="{ selected: form.flag === '0' }" 32 :class="{ selected: form.flag === '0' }"
33 class="radio-item"
34 @click="form.flag = '0'" 34 @click="form.flag = '0'"
35 > 35 >
36 <view class="radio-circle"> 36 <view class="radio-circle">
37 <uni-icons v-if="form.flag === '0'" type="checkmark" size="10" color="#fff"></uni-icons> 37 <uni-icons v-if="form.flag === '0'" color="#fff" size="10" type="checkmark"></uni-icons>
38 </view> 38 </view>
39 <text>审批拒绝</text> 39 <text>审批拒绝</text>
40 </view> 40 </view>
...@@ -45,18 +45,37 @@ ...@@ -45,18 +45,37 @@
45 <text class="form-label">备注</text> 45 <text class="form-label">备注</text>
46 <textarea 46 <textarea
47 v-model="form.reason" 47 v-model="form.reason"
48 :maxlength="500"
48 class="textarea" 49 class="textarea"
49 placeholder="请输入备注信息(拒绝时必填)" 50 placeholder="请输入备注信息(拒绝时必填)"
50 :maxlength="500"
51 /> 51 />
52 </view> 52 </view>
53 </view> 53 </view>
54 </view> 54 </view>
55 55
56
57 <view v-if="userType==2&&selfSelect==0" class="section">
58 <view class="section examiner-section">
59 <button class="add-btn" @click="handelAddExamine">+ 添加考官</button>
60 </view>
61
62 <view class="examiner-list">
63 <view v-for="(item, index) in list" :key="item.id" class="examiner-item">
64 <view class="info">
65 <text class="name">{{ item.perName }} {{ item.perCode }}</text>
66 <text class="idc">证件号码:{{ item.perIdcCode }}</text>
67 <text class="reg">注册地:{{ item.memName }}</text>
68 </view>
69 <button class="del-btn" @click="handleDel(item)">删除</button>
70 </view>
71 </view>
72 </view>
73
74
56 <!-- 提交按钮 --> 75 <!-- 提交按钮 -->
57 <view class="submit-wrap"> 76 <view class="submit-wrap">
58 <button class="btn-cancel" @click="goBack">取消</button> 77 <button class="btn-cancel" @click="goBack">取消</button>
59 <button class="btn-submit" @click="doSubmit" :disabled="submitting"> 78 <button :disabled="submitting" class="btn-submit" @click="doSubmit">
60 <text v-if="!submitting">确认提交</text> 79 <text v-if="!submitting">确认提交</text>
61 <text v-else>提交中...</text> 80 <text v-else>提交中...</text>
62 </button> 81 </button>
...@@ -66,32 +85,63 @@ ...@@ -66,32 +85,63 @@
66 85
67 <script setup> 86 <script setup>
68 import * as api from '@/common/api_exam.js' 87 import * as api from '@/common/api_exam.js'
69 import { ref } from 'vue' 88 import {ref} from 'vue'
70 import { onLoad } from '@dcloudio/uni-app' 89 import {onLoad} from '@dcloudio/uni-app'
90 import {listApi} from "@/common/api.js";
71 91
72 92
73 const type = ref('single') // single 或 batch 93 const type = ref('single') // single 或 batch
74 const ids = ref('') 94 const ids = ref('')
75 const submitting = ref(false) 95 const submitting = ref(false)
76 96 const selfSelect = ref('1')
97 const userType = ref('')
98 const list = ref([])
99 const memId = ref('')
100 const app = getApp();
77 const form = ref({ 101 const form = ref({
78 flag: '1', 102 flag: '1',
79 reason: '' 103 reason: '',
104 selfSelect: "1"
80 }) 105 })
81 106
82 onLoad((options) => { 107 onLoad((options) => {
108 console.log(options)
83 if (options.type) { 109 if (options.type) {
84 type.value = options.type 110 type.value = options.type
85 } 111 }
86 if (options.ids) { 112 if (options.ids) {
87 ids.value = options.ids 113 ids.value = options.ids
88 } 114 }
115 if (options.selfSelect) {
116 selfSelect.value = options.selfSelect
117 }
118 if (options.memId) {
119 memId.value = options.memId
120 getExaminer()
121
122 }
123 userType.value = app.globalData.userType
124 console.log(userType.value)
89 }) 125 })
90 126
91 function goBack() { 127 function goBack() {
92 uni.navigateBack() 128 uni.navigateBack()
93 } 129 }
94 130
131 function handelAddExamine() {
132 const chosenStr = JSON.stringify(list.value)
133 uni.navigateTo({
134 url: `/myCenter/chooseExaminer?memId=${memId.value}&isValidity=0&chosen=${chosenStr}&selfSelect=0`
135 })
136 }
137
138
139 async function getExaminer() {
140 const res = await listApi({memId: memId.value})
141 list.value = res.rows
142 }
143
144
95 function doSubmit() { 145 function doSubmit() {
96 if (form.value.flag === '0' && !form.value.reason) { 146 if (form.value.flag === '0' && !form.value.reason) {
97 uni.showToast({ 147 uni.showToast({
...@@ -107,9 +157,10 @@ function doSubmit() { ...@@ -107,9 +157,10 @@ function doSubmit() {
107 const params = { 157 const params = {
108 ids: ids.value, 158 ids: ids.value,
109 flag: form.value.flag, 159 flag: form.value.flag,
110 reason: form.value.reason || '' 160 reason: form.value.reason || '',
161 selfSelect: selfSelect.value
111 } 162 }
112 163 if (userType.value == '1') {
113 api.ztxAudit(params).then(res => { 164 api.ztxAudit(params).then(res => {
114 uni.showToast({ 165 uni.showToast({
115 title: '操作成功', 166 title: '操作成功',
...@@ -126,6 +177,24 @@ function doSubmit() { ...@@ -126,6 +177,24 @@ function doSubmit() {
126 }) 177 })
127 submitting.value = false 178 submitting.value = false
128 }) 179 })
180 } else {
181 api.shenAuditExamPointApply(params).then(res => {
182 uni.showToast({
183 title: '操作成功',
184 icon: 'success'
185 })
186 setTimeout(() => {
187 uni.navigateBack()
188 }, 1500)
189 }).catch(err => {
190 console.error('审核失败', err)
191 uni.showToast({
192 title: '操作失败',
193 icon: 'none'
194 })
195 submitting.value = false
196 })
197 }
129 } 198 }
130 </script> 199 </script>
131 200
...@@ -269,4 +338,161 @@ function doSubmit() { ...@@ -269,4 +338,161 @@ function doSubmit() {
269 } 338 }
270 } 339 }
271 } 340 }
341
342 .section {
343 padding: 15rpx 20rpx;
344 }
345
346 /* 考官区域 */
347 .examiner-section {
348 background: #fff;
349 padding: 15rpx;
350 margin-bottom: 20rpx;
351 border: none;
352 border-radius: 0;
353 }
354
355 .add-btn {
356 background: #fff;
357 color: #C4121B;
358 border: 1rpx solid #C4121B;
359 border-radius: 10rpx;
360 padding: 10rpx 0;
361 width: 100%;
362 font-size: 14px;
363 }
364
365 .examiner-list {
366 padding: 0 10rpx;
367 background-color: #fff;
368 margin-bottom: 20rpx;
369 overflow-y: auto;
370 margin-bottom: 70px;
371 }
372
373 examiner-item {
374 display: flex;
375 justify-content: space-between;
376 align-items: flex-start;
377 padding: 20rpx;
378 border-bottom: 1rpx solid #eee;
379 align-items: center;
380 }
381
382 .info {
383 flex: 1;
384 }
385
386 .name {
387 font-size: 14px;
388 font-weight: 500;
389 color: #333;
390 display: block;
391 margin-bottom: 5rpx;
392 }
393
394 .idc, .reg {
395 font-size: 12px;
396 color: #666;
397 display: block;
398 margin: 10rpx 0;
399 }
400
401 .del-btn {
402 color: #C4121B;
403 font-size: 12px;
404 border: 1rpx solid #C4121B;
405 border-radius: 50rpx;
406 padding: 10rpx 25rpx;
407 line-height: 1.2;
408 background: #fff;
409 }
410
411 /* 提交按钮 */
412 .submit-area {
413 padding: 20rpx 0;
414 background-color: #fff;
415 width: 100%;
416 position: fixed;
417 bottom: 0;
418 }
419
420 .submit-btn {
421 width: 80%;
422 height: 88rpx;
423 border-radius: 44rpx;
424 margin: 0 auto;
425 line-height: 88rpx;
426 background: #C4121B;
427 color: #fff;
428 text-align: center;
429 font-size: 16px;
430 border: none;
431 }
432
433 /* 自定义弹窗样式(核心) */
434 .custom-modal {
435 width: 600rpx;
436 background: #fff;
437 border-radius: 20rpx;
438 padding: 40rpx 30rpx;
439 box-sizing: border-box;
440 text-align: center;
441 }
442
443 .modal-title {
444 font-size: 36rpx;
445 font-weight: 600;
446 color: #333;
447 margin-bottom: 30rpx;
448 }
449
450 .modal-content {
451 font-size: 30rpx;
452 color: #666;
453 line-height: 1.6;
454 margin-bottom: 30rpx;
455 }
456
457 .modal-tip {
458 font-size: 28rpx;
459 color: #FF7A00;
460 margin-top: 20rpx;
461 }
462
463 .modal-btns {
464 display: flex;
465 justify-content: space-between;
466 gap: 20rpx;
467 }
468
469 .btn-cancel {
470 flex: 1;
471 height: 80rpx;
472 line-height: 80rpx;
473 background: #f5f5f5;
474 color: #999;
475 border-radius: 40rpx;
476 font-size: 32rpx;
477 border: none;
478 }
479
480 .btn-confirm {
481 flex: 1;
482 height: 80rpx;
483 line-height: 80rpx;
484 background: #C4121B;
485 color: #fff;
486 border-radius: 40rpx;
487 font-size: 32rpx;
488 border: none;
489 }
490
491 .single-btn {
492 flex: 1;
493 }
494
495 .btn-cancel::after, .btn-confirm::after {
496 border: none;
497 }
272 </style> 498 </style>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <!-- 基本信息 --> 3 <!-- 基本信息 -->
4 <view class="section"> 4 <view class="section">
5 <view class="section-header"> 5 <view class="section-header">
6 <uni-icons type="paperclip" size="18" color="#AD181F"></uni-icons> 6 <uni-icons color="#AD181F" size="18" type="paperclip"></uni-icons>
7 <text class="section-title">基本信息</text> 7 <text class="section-title">基本信息</text>
8 </view> 8 </view>
9 <view class="info-card"> 9 <view class="info-card">
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 </view> 17 </view>
18 <view class="info-row"> 18 <view class="info-row">
19 <text class="label">审核状态</text> 19 <text class="label">审核状态</text>
20 <text class="value" :class="getStatusClass(form.auditStatus)"> 20 <text :class="getStatusClass(form.auditStatus)" class="value">
21 {{ getStatusText(form.auditStatus) }} 21 {{ getStatusText(form.auditStatus) }}
22 </text> 22 </text>
23 </view> 23 </view>
...@@ -45,14 +45,14 @@ ...@@ -45,14 +45,14 @@
45 </view> 45 </view>
46 46
47 <!-- 审核记录 --> 47 <!-- 审核记录 -->
48 <view class="section" v-if="auditList.length > 0"> 48 <view v-if="auditList.length > 0" class="section">
49 <view class="section-header"> 49 <view class="section-header">
50 <uni-icons type="checkmark-circle" size="18" color="#AD181F"></uni-icons> 50 <uni-icons color="#AD181F" size="18" type="checkmark-circle"></uni-icons>
51 <text class="section-title">审核记录</text> 51 <text class="section-title">审核记录</text>
52 </view> 52 </view>
53 <view class="audit-list"> 53 <view class="audit-list">
54 <view class="audit-item" v-for="(item, index) in auditList" :key="index"> 54 <view v-for="(item, index) in auditList" :key="index" class="audit-item">
55 <view class="audit-dot" :class="item.auditResult == 2 ? 'pass' : 'fail'"></view> 55 <view :class="item.auditResult == 2 ? 'pass' : 'fail'" class="audit-dot"></view>
56 <view class="audit-content"> 56 <view class="audit-content">
57 <view class="audit-row"> 57 <view class="audit-row">
58 <text class="audit-label">审核协会</text> 58 <text class="audit-label">审核协会</text>
...@@ -64,11 +64,11 @@ ...@@ -64,11 +64,11 @@
64 </view> 64 </view>
65 <view class="audit-row"> 65 <view class="audit-row">
66 <text class="audit-label">审核状态</text> 66 <text class="audit-label">审核状态</text>
67 <text class="audit-value" :class="item.auditResult == 2 ? 'text-success' : 'text-danger'"> 67 <text :class="item.auditResult == 2 ? 'text-success' : 'text-danger'" class="audit-value">
68 {{ item.auditResult == 2 ? '通过' : '拒绝' }} 68 {{ item.auditResult == 2 ? '通过' : '拒绝' }}
69 </text> 69 </text>
70 </view> 70 </view>
71 <view class="audit-row" v-if="item.auditMsg"> 71 <view v-if="item.auditMsg" class="audit-row">
72 <text class="audit-label">备注</text> 72 <text class="audit-label">备注</text>
73 <text class="audit-value">{{ item.auditMsg }}</text> 73 <text class="audit-value">{{ item.auditMsg }}</text>
74 </view> 74 </view>
...@@ -77,43 +77,43 @@ ...@@ -77,43 +77,43 @@
77 </view> 77 </view>
78 </view> 78 </view>
79 79
80 <!-- 考官信息 --> 80 <!-- &lt;!&ndash; 考官信息 &ndash;&gt;-->
81 <view class="section" v-if="examinerList.length > 0"> 81 <!-- <view class="section" v-if="examinerList.length > 0">-->
82 <view class="section-header"> 82 <!-- <view class="section-header">-->
83 <uni-icons type="person" size="18" color="#AD181F"></uni-icons> 83 <!-- <uni-icons type="person" size="18" color="#AD181F"></uni-icons>-->
84 <text class="section-title">考官信息</text> 84 <!-- <text class="section-title">考官信息</text>-->
85 </view> 85 <!-- </view>-->
86 <view class="examiner-table" v-if="examinerList.length > 0"> 86 <!-- <view class="examiner-table" v-if="examinerList.length > 0">-->
87 <view class="table-header"> 87 <!-- <view class="table-header">-->
88 <view class="th th-name">姓名</view> 88 <!-- <view class="th th-name">姓名</view>-->
89 <view class="th th-code">会员号</view> 89 <!-- <view class="th th-code">会员号</view>-->
90 <view class="th th-idcard">证件号码</view> 90 <!-- <view class="th th-idcard">证件号码</view>-->
91 </view> 91 <!-- </view>-->
92 <view class="table-body"> 92 <!-- <view class="table-body">-->
93 <view class="table-row" v-for="(item, index) in examinerList" :key="index"> 93 <!-- <view class="table-row" v-for="(item, index) in examinerList" :key="index">-->
94 <view class="td td-name">{{ item.perName }}</view> 94 <!-- <view class="td td-name">{{ item.perName }}</view>-->
95 <view class="td td-code">{{ item.perCode || '-' }}</view> 95 <!-- <view class="td td-code">{{ item.perCode || '-' }}</view>-->
96 <view class="td td-idcard">{{ item.perIdcCode || '-' }}</view> 96 <!-- <view class="td td-idcard">{{ item.perIdcCode || '-' }}</view>-->
97 </view> 97 <!-- </view>-->
98 </view> 98 <!-- </view>-->
99 </view> 99 <!-- </view>-->
100 <view class="no-data" v-else> 100 <!-- <view class="no-data" v-else>-->
101 <text>暂无考官信息</text> 101 <!-- <text>暂无考官信息</text>-->
102 </view> 102 <!-- </view>-->
103 </view> 103 <!-- </view>-->
104 </view> 104 </view>
105 </template> 105 </template>
106 106
107 <script setup> 107 <script setup>
108 import * as api from '@/common/api_exam.js' 108 import * as api from '@/common/api_exam.js'
109 import { ref } from 'vue' 109 import {ref} from 'vue'
110 import { onLoad } from '@dcloudio/uni-app' 110 import {onLoad} from '@dcloudio/uni-app'
111 111
112 const form = ref({}) 112 const form = ref({})
113 const auditList = ref([]) 113 const auditList = ref([])
114 const examinerList = ref([]) 114 const examinerList = ref([])
115 115
116 const auditStatusMap = { 1: '审核中', 2: '审核通过', 3: '审核拒绝' } 116 const auditStatusMap = {1: '审核中', 2: '审核通过', 3: '审核拒绝'}
117 117
118 onLoad((options) => { 118 onLoad((options) => {
119 if (options.item) { 119 if (options.item) {
...@@ -133,7 +133,7 @@ onLoad((options) => { ...@@ -133,7 +133,7 @@ onLoad((options) => {
133 }) 133 })
134 134
135 function getExaminerList(memId) { 135 function getExaminerList(memId) {
136 api.listInfo({ memId: memId }).then(res => { 136 api.listInfo({memId: memId}).then(res => {
137 if (res.rows) { 137 if (res.rows) {
138 examinerList.value = res.rows 138 examinerList.value = res.rows
139 } 139 }
...@@ -319,9 +319,17 @@ function formatDateTime(dateStr) { ...@@ -319,9 +319,17 @@ function formatDateTime(dateStr) {
319 } 319 }
320 } 320 }
321 321
322 .th-name { width: 25%; } 322 .th-name {
323 .th-code { width: 30%; } 323 width: 25%;
324 .th-idcard { width: 45%; } 324 }
325
326 .th-code {
327 width: 30%;
328 }
329
330 .th-idcard {
331 width: 45%;
332 }
325 333
326 .table-body { 334 .table-body {
327 .table-row { 335 .table-row {
...@@ -343,9 +351,17 @@ function formatDateTime(dateStr) { ...@@ -343,9 +351,17 @@ function formatDateTime(dateStr) {
343 } 351 }
344 } 352 }
345 353
346 .td-name { width: 25%; } 354 .td-name {
347 .td-code { width: 30%; } 355 width: 25%;
348 .td-idcard { width: 45%; } 356 }
357
358 .td-code {
359 width: 30%;
360 }
361
362 .td-idcard {
363 width: 45%;
364 }
349 } 365 }
350 } 366 }
351 367
......
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
38 <!-- 顶部Tab栏(截图风格) --> 38 <!-- 顶部Tab栏(截图风格) -->
39 <view class="tab-bar"> 39 <view class="tab-bar">
40 <view 40 <view
41 class="tab-item"
42 v-for="(tab, index) in tabList" 41 v-for="(tab, index) in tabList"
43 :key="index" 42 :key="index"
44 :class="{ active: currentTab === index }" 43 :class="{ active: currentTab === index }"
44 class="tab-item"
45 @click="switchTab(index)" 45 @click="switchTab(index)"
46 > 46 >
47 {{ tab.name }} 47 {{ tab.name }}
...@@ -49,26 +49,26 @@ ...@@ -49,26 +49,26 @@
49 </view> 49 </view>
50 50
51 <!-- 批量审核按钮(保留原逻辑,仅优化样式) --> 51 <!-- 批量审核按钮(保留原逻辑,仅优化样式) -->
52 <view class="batch-btn-wrap" v-if="selectedList.length > 0 && currentTab === 0"> 52 <view v-if="selectedList.length > 0 && currentTab === 0" class="batch-btn-wrap">
53 <button class="btn-batch" :disabled="selectedList.length === 0" @click="goBatchAudit"> 53 <button :disabled="selectedList.length === 0" class="btn-batch" @click="goBatchAudit">
54 <uni-icons type="checkmark-circle" size="16" color="#fff"></uni-icons> 54 <uni-icons color="#fff" size="16" type="checkmark-circle"></uni-icons>
55 批量审核 ({{ selectedList.length }}) 55 批量审核 ({{ selectedList.length }})
56 </button> 56 </button>
57 </view> 57 </view>
58 58
59 <!-- 列表区域(保留原字段+截图样式+所有按钮) --> 59 <!-- 列表区域(保留原字段+截图样式+所有按钮) -->
60 <scroll-view 60 <scroll-view
61 :lower-threshold="100"
61 class="scroll-list" 62 class="scroll-list"
62 scroll-y 63 scroll-y
63 @scrolltolower="loadMore" 64 @scrolltolower="loadMore"
64 :lower-threshold="100"
65 > 65 >
66 <view class="appList"> 66 <view class="appList">
67 <view 67 <view
68 class="appItem"
69 v-for="(item, index) in infoList" 68 v-for="(item, index) in infoList"
70 :key="index" 69 :key="index"
71 :class="{ 'item-checked': isSelected(item) }" 70 :class="{ 'item-checked': isSelected(item) }"
71 class="appItem"
72 > 72 >
73 <!-- 选择框(保留原逻辑+适配截图样式) --> 73 <!-- 选择框(保留原逻辑+适配截图样式) -->
74 <!-- <view class="checkbox-wrap" v-if="item.auditStatus == 1" @click="toggleSelect(item)"> 74 <!-- <view class="checkbox-wrap" v-if="item.auditStatus == 1" @click="toggleSelect(item)">
...@@ -78,12 +78,12 @@ ...@@ -78,12 +78,12 @@
78 </view> --> 78 </view> -->
79 79
80 <!-- 主内容区(点击跳详情,保留原所有字段) --> 80 <!-- 主内容区(点击跳详情,保留原所有字段) -->
81 <view @click="goDetail(item)" class="item-content"> 81 <view class="item-content" @click="goDetail(item)">
82 <!-- 状态标签+提交时间(截图风格顶部) --> 82 <!-- 状态标签+提交时间(截图风格顶部) -->
83 <view class="item-top"> 83 <view class="item-top">
84 84
85 <text class="submit-time">{{ formatDate(item.commitTime) }} 提交</text> 85 <text class="submit-time">{{ formatDate(item.commitTime) }} 提交</text>
86 <text class="status-tag" :class="getStatusClass(item.auditStatus)"> 86 <text :class="getStatusClass(item.auditStatus)" class="status-tag">
87 {{ getStatusText(item.auditStatus) }} 87 {{ getStatusText(item.auditStatus) }}
88 </text> 88 </text>
89 </view> 89 </view>
...@@ -127,21 +127,22 @@ ...@@ -127,21 +127,22 @@
127 v-if="item.auditStatus == 1" 127 v-if="item.auditStatus == 1"
128 class="btn-info" 128 class="btn-info"
129 @click.stop="goAudit(item)" 129 @click.stop="goAudit(item)"
130 >审核</button> 130 >审核
131 </button>
131 <button class="btn-info" @click.stop="goInstitution(item)">机构资料</button> 132 <button class="btn-info" @click.stop="goInstitution(item)">机构资料</button>
132 </view> 133 </view>
133 </view> 134 </view>
134 </view> 135 </view>
135 136
136 <!-- 加载更多(保留原逻辑) --> 137 <!-- 加载更多(保留原逻辑) -->
137 <view class="loading-more" v-if="infoList.length > 0"> 138 <view v-if="infoList.length > 0" class="loading-more">
138 <uni-load-more :status="loadMoreStatus" :contentText="loadMoreText"></uni-load-more> 139 <uni-load-more :contentText="loadMoreText" :status="loadMoreStatus"></uni-load-more>
139 </view> 140 </view>
140 </scroll-view> 141 </scroll-view>
141 142
142 <!-- 空数据(保留原逻辑+适配截图样式) --> 143 <!-- 空数据(保留原逻辑+适配截图样式) -->
143 <view class="nodata" v-if="infoList.length == 0 && !loading"> 144 <view v-if="infoList.length == 0 && !loading" class="nodata">
144 <image mode="aspectFit" :src="config.baseUrl_api + '/fs/static/nodata.png'"></image> 145 <image :src="config.baseUrl_api + '/fs/static/nodata.png'" mode="aspectFit"></image>
145 <text>暂无数据</text> 146 <text>暂无数据</text>
146 </view> 147 </view>
147 </view> 148 </view>
...@@ -151,8 +152,8 @@ ...@@ -151,8 +152,8 @@
151 // 完全保留你原代码的所有JS逻辑、方法、字段,未做任何修改 152 // 完全保留你原代码的所有JS逻辑、方法、字段,未做任何修改
152 import * as api from '@/common/api_exam.js' 153 import * as api from '@/common/api_exam.js'
153 import config from '@/config.js' 154 import config from '@/config.js'
154 import { ref } from 'vue' 155 import {ref} from 'vue'
155 import { onLoad, onShow } from '@dcloudio/uni-app' 156 import {onLoad, onShow} from '@dcloudio/uni-app'
156 157
157 const app = getApp() 158 const app = getApp()
158 const loading = ref(false) 159 const loading = ref(false)
...@@ -179,12 +180,14 @@ const selectedList = ref([]) ...@@ -179,12 +180,14 @@ const selectedList = ref([])
179 180
180 // 新增Tab配置(匹配截图,关联原审核状态) 181 // 新增Tab配置(匹配截图,关联原审核状态)
181 const tabList = ref([ 182 const tabList = ref([
182 { name: '全部', auditStatus: '' }, 183 {name: '全部', auditStatus: ''},
183 { name: '审核中', auditStatus: '1' }, 184 {name: '审核中', auditStatus: '1'},
184 { name: '审核通过', auditStatus: '2' }, 185 {name: '审核通过', auditStatus: '2'},
185 { name: '审核拒绝', auditStatus: '3' } 186 {name: '审核拒绝', auditStatus: '3'}
186 ]) 187 ])
187 const currentTab = ref(0) 188 const currentTab = ref(0)
189 const userType = ref('')
190
188 191
189 onLoad(() => { 192 onLoad(() => {
190 init() 193 init()
...@@ -198,6 +201,9 @@ onShow(() => { ...@@ -198,6 +201,9 @@ onShow(() => {
198 // init() 201 // init()
199 } 202 }
200 } 203 }
204
205 userType.value = app.globalData.userType
206 init()
201 }) 207 })
202 208
203 function init() { 209 function init() {
...@@ -208,12 +214,20 @@ function init() { ...@@ -208,12 +214,20 @@ function init() {
208 function switchTab(index) { 214 function switchTab(index) {
209 if (currentTab.value === index) return 215 if (currentTab.value === index) return
210 currentTab.value = index 216 currentTab.value = index
211 // 同步原审核状态查询参数 217
212 queryParams.value.auditStatus = Number(tabList.value[index].auditStatus)
213 // 重置列表和选择状态 218 // 重置列表和选择状态
214 queryParams.value.pageNum = 1 219 queryParams.value.pageNum = 1
215 loadMoreStatus.value = 'more' 220 loadMoreStatus.value = 'more'
216 selectedList.value = [] 221 selectedList.value = []
222
223 if (userType.value == 1) {
224 // 同步原审核状态查询参数
225 queryParams.value.auditStatus = Number(tabList.value[index].auditStatus)
226 }
227 if (userType.value == 2) {
228 // 同步原审核状态查询参数
229 queryParams.value.shenAuditStatus = tabList.value[index].auditStatus
230 }
217 getList() 231 getList()
218 } 232 }
219 233
...@@ -229,9 +243,9 @@ function getList(isLoadMore = false) { ...@@ -229,9 +243,9 @@ function getList(isLoadMore = false) {
229 loadMoreStatus.value = 'loading' 243 loadMoreStatus.value = 'loading'
230 } 244 }
231 245
232 uni.showLoading({ title: '加载中' }) 246 uni.showLoading({title: '加载中'})
233 247
234 const params = { ...queryParams.value } 248 const params = {...queryParams.value}
235 if (commitTimeStart.value) { 249 if (commitTimeStart.value) {
236 params.commitTimeStart = commitTimeStart.value + ' 00:00:00' 250 params.commitTimeStart = commitTimeStart.value + ' 00:00:00'
237 } 251 }
...@@ -327,15 +341,17 @@ function goDetail(item) { ...@@ -327,15 +341,17 @@ function goDetail(item) {
327 } 341 }
328 342
329 function goAudit(item) { 343 function goAudit(item) {
330 const itemStr = encodeURIComponent(JSON.stringify(item)) 344
345 // const itemStr = encodeURIComponent(JSON.stringify(item))
331 uni.navigateTo({ 346 uni.navigateTo({
332 url: `/level/ztx/examinationAudit?item=${itemStr}&type=single` 347 url: `/level/ztx/examinationAudit?ids=${item.id}&type=single&selfSelect=${item.selfSelect}&memId=${item.memId}`
333 }) 348 })
334 } 349 }
335 350
336 function goBatchAudit() { 351 function goBatchAudit() {
337 if (selectedList.value.length === 0) return 352 if (selectedList.value.length === 0) return
338 const ids = selectedList.value.map(s => s.id).join(',') 353 const arr = selectedList.value.filter(s => s.selfSelect == 1)
354 const ids = arr.map(s => s.id).join(',')
339 uni.navigateTo({ 355 uni.navigateTo({
340 url: `/level/ztx/examinationAudit?ids=${ids}&type=batch` 356 url: `/level/ztx/examinationAudit?ids=${ids}&type=batch`
341 }) 357 })
...@@ -348,7 +364,7 @@ function goInstitution(item) { ...@@ -348,7 +364,7 @@ function goInstitution(item) {
348 } 364 }
349 365
350 function getStatusText(status) { 366 function getStatusText(status) {
351 const statusMap = { 1: '审核中', 2: '审核通过', 3: '审核拒绝' } 367 const statusMap = {1: '审核中', 2: '审核通过', 3: '审核拒绝'}
352 return statusMap[status] || '-' 368 return statusMap[status] || '-'
353 } 369 }
354 370
...@@ -656,14 +672,16 @@ function formatDate(dateStr) { ...@@ -656,14 +672,16 @@ function formatDate(dateStr) {
656 padding: 30rpx; 672 padding: 30rpx;
657 margin: 20rpx; 673 margin: 20rpx;
658 border-radius: 16rpx; 674 border-radius: 16rpx;
659 box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.05); 675 box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
660 } 676 }
677
661 .search-form { 678 .search-form {
662 display: flex; 679 display: flex;
663 flex-wrap: wrap; 680 flex-wrap: wrap;
664 justify-content: space-between; 681 justify-content: space-between;
665 gap: 24rpx; 682 gap: 24rpx;
666 } 683 }
684
667 .form-item { 685 .form-item {
668 width: 48%; 686 width: 48%;
669 display: flex; 687 display: flex;
...@@ -678,6 +696,7 @@ function formatDate(dateStr) { ...@@ -678,6 +696,7 @@ function formatDate(dateStr) {
678 font-size: 26rpx; 696 font-size: 26rpx;
679 color: #666; 697 color: #666;
680 } 698 }
699
681 input { 700 input {
682 width: 100%; 701 width: 100%;
683 height: 70rpx; 702 height: 70rpx;
...@@ -688,6 +707,7 @@ function formatDate(dateStr) { ...@@ -688,6 +707,7 @@ function formatDate(dateStr) {
688 background-color: #fafafa; 707 background-color: #fafafa;
689 box-sizing: border-box; 708 box-sizing: border-box;
690 } 709 }
710
691 .picker-value { 711 .picker-value {
692 width: 100%; 712 width: 100%;
693 height: 70rpx; 713 height: 70rpx;
...@@ -702,6 +722,7 @@ function formatDate(dateStr) { ...@@ -702,6 +722,7 @@ function formatDate(dateStr) {
702 line-height: 70rpx; 722 line-height: 70rpx;
703 box-sizing: border-box; 723 box-sizing: border-box;
704 } 724 }
725
705 .date-range { 726 .date-range {
706 display: flex; 727 display: flex;
707 align-items: center; 728 align-items: center;
...@@ -711,11 +732,13 @@ function formatDate(dateStr) { ...@@ -711,11 +732,13 @@ function formatDate(dateStr) {
711 .picker-value { 732 .picker-value {
712 flex: 1; 733 flex: 1;
713 } 734 }
735
714 .date-separator { 736 .date-separator {
715 color: #999; 737 color: #999;
716 } 738 }
717 } 739 }
718 } 740 }
741
719 .search-btns { 742 .search-btns {
720 display: flex; 743 display: flex;
721 justify-content: center; 744 justify-content: center;
...@@ -730,10 +753,12 @@ function formatDate(dateStr) { ...@@ -730,10 +753,12 @@ function formatDate(dateStr) {
730 border-radius: 35rpx; 753 border-radius: 35rpx;
731 border: none; 754 border: none;
732 } 755 }
756
733 .btn-search { 757 .btn-search {
734 background: linear-gradient(135deg, #13B5B1, #15c5c1); 758 background: linear-gradient(135deg, #13B5B1, #15c5c1);
735 color: #fff; 759 color: #fff;
736 } 760 }
761
737 .btn-reset { 762 .btn-reset {
738 background-color: #f5f5f5; 763 background-color: #f5f5f5;
739 color: #666; 764 color: #666;
......
1
2
3 <template> 1 <template>
4 <view class="role-entry-page"> 2 <view class="role-entry-page">
5 <!-- 全屏背景图 --> 3 <!-- 全屏背景图 -->
6 <image class="page-bg" :src="config.baseUrl_api + '/fs/static/bg.png'" mode="aspectFill"></image> 4 <image :src="config.loginImage_api + '/fs/static/bg.png'" class="page-bg" mode="aspectFill"></image>
7 5
8 <!-- 顶部 Logo 区域 --> 6 <!-- 顶部 Logo 区域 -->
9 <view class="header-wrapper"> 7 <view class="header-wrapper">
10 <view class="logo-box"> 8 <view class="logo-box">
11 <image class="logo" :src="config.baseUrl_api + '/fs/static/wx_logo.png'" mode="aspectFit"></image> 9 <image :src="config.loginImage_api + '/fs/static/wx_logo.png'" class="logo" mode="aspectFit"></image>
12 </view> 10 </view>
13 </view> 11 </view>
14 12
15 <!-- 功能按钮区域 --> 13 <!-- 功能按钮区域 -->
16 <view class="btn-container"> 14 <view class="btn-container">
17 <view @click="goToPage('/personal/addVip_per')"> 15 <view @click="goToPage('/personal/addVip_per')">
18 <image :src="config.baseUrl_api + '/fs/static/btn01.png'" class="btn-item"></image> 16 <image :src="config.loginImage_api + '/fs/static/btn01.png'" class="btn-item"></image>
19 </view> 17 </view>
20 <view @click="goToPage('/personal/home')"> 18 <view @click="goToPage('/personal/home')">
21 <image :src="config.baseUrl_api + '/fs/static/btn02.png'" class="btn-item"></image> 19 <image :src="config.loginImage_api + '/fs/static/btn02.png'" class="btn-item"></image>
22 </view> 20 </view>
23 <view @click="goToPage('/login/loginC')"> 21 <view @click="goToPage('/login/loginC')">
24 <image :src="config.baseUrl_api + '/fs/static/btn03.png'" class="btn-item"></image> 22 <image :src="config.loginImage_api + '/fs/static/btn03.png'" class="btn-item"></image>
25 </view> 23 </view>
26 </view> 24 </view>
27 25
...@@ -29,9 +27,10 @@ ...@@ -29,9 +27,10 @@
29 </view> 27 </view>
30 </template> 28 </template>
31 <script setup> 29 <script setup>
32 import { ref } from 'vue' 30 import {ref} from 'vue'
33 import {onShow} from '@dcloudio/uni-app' 31 import {onShow} from '@dcloudio/uni-app'
34 import config from '@/config.js' 32 import config from '@/config.js'
33
35 onShow(() => { 34 onShow(() => {
36 uni.hideLoading(); 35 uni.hideLoading();
37 }) 36 })
...@@ -71,6 +70,7 @@ const goToPage = (url) => { ...@@ -71,6 +70,7 @@ const goToPage = (url) => {
71 display: flex; 70 display: flex;
72 justify-content: space-between; 71 justify-content: space-between;
73 padding: 0 40rpx; 72 padding: 0 40rpx;
73
74 img, image { 74 img, image {
75 width: 90px; 75 width: 90px;
76 } 76 }
......
This diff could not be displayed because it is too large.
...@@ -23,15 +23,23 @@ ...@@ -23,15 +23,23 @@
23 style="margin: 0 20rpx 0 0;" @click="payTheFees">激活 23 style="margin: 0 20rpx 0 0;" @click="payTheFees">激活
24 </button> 24 </button>
25 <view v-else> 25 <view v-else>
26 <button :disabled="auditStatus==1||auditStatus==2||form.isPoints==0" class="btn-red" size="mini" 26 <button v-if="form.deptType==6"
27 :disabled="auditStatus==1||auditStatus==2||form.isPoints==0" class="btn-red"
28 size="mini"
27 style="margin: 0 20rpx 0 0;" 29 style="margin: 0 20rpx 0 0;"
28 @click="showApplyDialog">考点申请 30 @click="showApplyDialog">考点申请
29 </button> 31 </button>
32 <button v-if="form.deptType==6"
33 class="btn-red-kx"
34 size="mini"
35 style="margin: 0 20rpx 0 0;"
36 @click="auditEditFN(2)">考点详情
37 </button>
30 <button :disabled="btn" class="btn-red" size="mini" style="margin: 0 20rpx 0 0;" 38 <button :disabled="btn" class="btn-red" size="mini" style="margin: 0 20rpx 0 0;"
31 @click="payTheFees">去缴费 39 @click="payTheFees">去缴费
32 </button> 40 </button>
33 <button v-if="form.deptType!=1" class="btn-red-kx" size="mini" style="margin: 0 20rpx 0 0;" 41 <button v-if="form.deptType!=1" class="btn-red-kx" size="mini" style="margin: 0 20rpx 0 0;"
34 @click="auditEditFN">审核详情 42 @click="auditEditFN(1)">审核详情
35 </button> 43 </button>
36 </view> 44 </view>
37 </view> 45 </view>
...@@ -167,12 +175,15 @@ const applyPopup = ref(null) ...@@ -167,12 +175,15 @@ const applyPopup = ref(null)
167 const popupShow = ref(false) 175 const popupShow = ref(false)
168 // 考点审核状态 0 未提交 1 审核中 2 审核成功 3 审核失败 176 // 考点审核状态 0 未提交 1 审核中 2 审核成功 3 审核失败
169 const auditStatus = ref(0) 177 const auditStatus = ref(0)
170 178 const openId = uni.getStorageSync('openId')
171 onShow(() => { 179 onShow(() => {
180 console.log(openId)
172 init() 181 init()
173 if (form.value.deptType != 1) { // 修复:原代码deptType未定义,改为form.value.deptType 182 if (form.value.deptType != 1) { // 修复:原代码deptType未定义,改为form.value.deptType
174 getMyStatusAPI() 183 getMyStatusAPI()
175 } 184 }
185
186 console.log()
176 }) 187 })
177 188
178 // 页面卸载时恢复滚动(防止异常锁死) 189 // 页面卸载时恢复滚动(防止异常锁死)
...@@ -339,9 +350,9 @@ function goToApplyPage() { ...@@ -339,9 +350,9 @@ function goToApplyPage() {
339 }) 350 })
340 } 351 }
341 352
342 function auditEditFN() { 353 function auditEditFN(type) {
343 uni.navigateTo({ 354 uni.navigateTo({
344 url: `/myCenter/reviewList` 355 url: `/myCenter/reviewList?type=${type}`
345 }) 356 })
346 } 357 }
347 358
...@@ -599,4 +610,9 @@ function payTheFees() { ...@@ -599,4 +610,9 @@ function payTheFees() {
599 :deep(.uni-popup__mask) { 610 :deep(.uni-popup__mask) {
600 touch-action: none !important; 611 touch-action: none !important;
601 } 612 }
613
614 .btn-red, .btn-red-kx {
615 padding: 0 !important;
616 width: 140rpx;
617 }
602 </style> 618 </style>
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
4 <view class="search-area"> 4 <view class="search-area">
5 <view class="search-item"> 5 <view class="search-item">
6 <text>考官姓名:</text> 6 <text>考官姓名:</text>
7 <input v-model="queryParams.name" placeholder="请输入考官姓名" class="search-input" /> 7 <input v-model="queryParams.name" class="search-input" placeholder="请输入考官姓名"/>
8 </view> 8 </view>
9 <view class="search-item"> 9 <view class="search-item">
10 <text>考官编号:</text> 10 <text>考官编号:</text>
11 <input v-model="queryParams.certCode" placeholder="请输入考官编号" class="search-input" /> 11 <input v-model="queryParams.certCode" class="search-input" placeholder="请输入考官编号"/>
12 </view> 12 </view>
13 <view class="search-buttons"> 13 <view class="search-buttons">
14 <button class="search-btn" @click="handleQuery">查询</button> 14 <button class="search-btn" @click="handleQuery">查询</button>
...@@ -16,23 +16,23 @@ ...@@ -16,23 +16,23 @@
16 </view> 16 </view>
17 </view> 17 </view>
18 18
19 <view class="list-item" v-for="(item, index) in infoList" :key="item.perId"> 19 <view v-for="(item, index) in infoList" :key="item.perId" class="list-item">
20 <view class="info"> 20 <view class="info">
21 <view class="name">{{ item.name }} {{ item.perCode }}</view> 21 <view class="name">{{ item.name }} {{ item.perCode }}</view>
22 <view class="idc">证件号码:{{ item.idcCode }}</view> 22 <view class="idc">证件号码:{{ item.idcCode }}</view>
23 <view class="reg">注册地:{{ item.memName }}</view> 23 <view class="reg">注册地:{{ item.memName }}</view>
24 </view> 24 </view>
25 <button 25 <button
26 class="choose-btn"
27 :class="{ disabled: checkChosen(item) }" 26 :class="{ disabled: checkChosen(item) }"
28 @click="handleChoose(item)"
29 :disabled="checkChosen(item)" 27 :disabled="checkChosen(item)"
28 class="choose-btn"
29 @click="handleChoose(item)"
30 > 30 >
31 {{ checkChosen(item) ? '已选择' : '选择' }} 31 {{ checkChosen(item) ? '已选择' : '选择' }}
32 </button> 32 </button>
33 </view> 33 </view>
34 34
35 <uni-popup ref="expirePopup" type="center" background-color="rgba(0,0,0,0.5)"> 35 <uni-popup ref="expirePopup" background-color="rgba(0,0,0,0.5)" type="center">
36 <view class="custom-modal"> 36 <view class="custom-modal">
37 <view class="modal-title">提示</view> 37 <view class="modal-title">提示</view>
38 <view class="modal-content">该考官资质已过期,是否继续添加?</view> 38 <view class="modal-content">该考官资质已过期,是否继续添加?</view>
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
46 </template> 46 </template>
47 47
48 <script setup> 48 <script setup>
49 import { ref, reactive, toRefs } from 'vue' 49 import {ref, reactive, toRefs} from 'vue'
50 import { onLoad } from '@dcloudio/uni-app'; 50 import {onLoad} from '@dcloudio/uni-app';
51 import * as api from '@/common/api.js' 51 import * as api from '@/common/api.js'
52 import _ from 'lodash' 52 import _ from 'lodash'
53 53
...@@ -63,13 +63,10 @@ const memId = ref('') ...@@ -63,13 +63,10 @@ const memId = ref('')
63 const chosen = ref([]) 63 const chosen = ref([])
64 const expirePopup = ref(null) 64 const expirePopup = ref(null)
65 const currentExpireItem = ref(null) 65 const currentExpireItem = ref(null)
66 66 const infoList = ref([])
67 onLoad((option) => { 67 const loading = ref(false)
68 isValidity.value = option.isValidity 68 const total = ref(0)
69 memId.value = option.memId 69 const selfSelect = ref('0')
70 chosen.value = JSON.parse(option.chosen)
71 })
72
73 const data = reactive({ 70 const data = reactive({
74 queryParams: { 71 queryParams: {
75 pageNum: 1, 72 pageNum: 1,
...@@ -80,18 +77,23 @@ const data = reactive({ ...@@ -80,18 +77,23 @@ const data = reactive({
80 shenMemId: '' 77 shenMemId: ''
81 } 78 }
82 }) 79 })
83 const { queryParams } = toRefs(data) 80 const {queryParams} = toRefs(data)
81
82 onLoad((option) => {
83 console.log(option)
84 isValidity.value = option.isValidity
85 memId.value = option.memId
86 chosen.value = JSON.parse(option.chosen)
87 selfSelect.value = option.selfSelect ?? '1'
88 })
84 89
85 const infoList = ref([])
86 const loading = ref(false)
87 const total = ref(0)
88 90
89 // 获取考官列表 91 // 获取考官列表
90 async function getList() { 92 async function getList() {
91 if (!queryParams.value.name) 93 if (!queryParams.value.name)
92 return uni.showToast({ title: '请输入考官姓名', icon: 'none' }) 94 return uni.showToast({title: '请输入考官姓名', icon: 'none'})
93 if (queryParams.value.type == 1 && !queryParams.value.certCode) 95 if (queryParams.value.type == 1 && !queryParams.value.certCode)
94 return uni.showToast({ title: '请输入考官编号', icon: 'none' }) 96 return uni.showToast({title: '请输入考官编号', icon: 'none'})
95 97
96 loading.value = true 98 loading.value = true
97 const res = await api.getCoachList(queryParams.value) 99 const res = await api.getCoachList(queryParams.value)
...@@ -100,7 +102,7 @@ async function getList() { ...@@ -100,7 +102,7 @@ async function getList() {
100 loading.value = false 102 loading.value = false
101 103
102 if (infoList.value.length === 0) { 104 if (infoList.value.length === 0) {
103 uni.showToast({ title: '请核实考官编号、有效期及归属地!', icon: 'none' }) 105 uni.showToast({title: '请核实考官编号、有效期及归属地!', icon: 'none'})
104 } 106 }
105 } 107 }
106 108
...@@ -126,8 +128,9 @@ function resetQuery() { ...@@ -126,8 +128,9 @@ function resetQuery() {
126 } 128 }
127 129
128 async function handleChoose(row) { 130 async function handleChoose(row) {
131 debugger
129 if (checkChosen(row)) { 132 if (checkChosen(row)) {
130 return uni.showToast({ title: '已选择该考官', icon: 'none' }) 133 return uni.showToast({title: '已选择该考官', icon: 'none'})
131 } 134 }
132 135
133 // 资质过期逻辑 136 // 资质过期逻辑
...@@ -150,11 +153,19 @@ async function confirmAddExpireExaminer() { ...@@ -150,11 +153,19 @@ async function confirmAddExpireExaminer() {
150 if (!currentExpireItem.value) return 153 if (!currentExpireItem.value) return
151 154
152 try { 155 try {
156 if (selfSelect.value == 1) {
157 // 自己添加
158 await api.selfAdd(currentExpireItem.value.perId)
159 } else {
160 // 省级添加
161 await api.otherAdd(memId.value, currentExpireItem.value.perId)
162 }
163
153 await api.otherAdd(memId.value, currentExpireItem.value.perId) 164 await api.otherAdd(memId.value, currentExpireItem.value.perId)
154 uni.showToast({ title: '添加成功', icon: 'success' }) 165 uni.showToast({title: '添加成功', icon: 'success'})
155 uni.navigateBack({ delta: 1 }) 166 uni.navigateBack({delta: 1})
156 } catch (err) { 167 } catch (err) {
157 uni.showToast({ title: '添加失败', icon: 'none' }) 168 uni.showToast({title: '添加失败', icon: 'none'})
158 } finally { 169 } finally {
159 expirePopup.value.close() 170 expirePopup.value.close()
160 currentExpireItem.value = null 171 currentExpireItem.value = null
...@@ -184,6 +195,7 @@ async function confirmAddExpireExaminer() { ...@@ -184,6 +195,7 @@ async function confirmAddExpireExaminer() {
184 align-items: center; 195 align-items: center;
185 margin-bottom: 20rpx; 196 margin-bottom: 20rpx;
186 } 197 }
198
187 .search-input { 199 .search-input {
188 flex: 1; 200 flex: 1;
189 border: 1rpx solid #ddd; 201 border: 1rpx solid #ddd;
...@@ -198,6 +210,7 @@ async function confirmAddExpireExaminer() { ...@@ -198,6 +210,7 @@ async function confirmAddExpireExaminer() {
198 margin-top: 30rpx; 210 margin-top: 30rpx;
199 margin-left: 80px; 211 margin-left: 80px;
200 } 212 }
213
201 .search-btn, .reset-btn { 214 .search-btn, .reset-btn {
202 width: 220rpx; 215 width: 220rpx;
203 height: 70rpx; 216 height: 70rpx;
...@@ -206,10 +219,12 @@ async function confirmAddExpireExaminer() { ...@@ -206,10 +219,12 @@ async function confirmAddExpireExaminer() {
206 text-align: center; 219 text-align: center;
207 font-size: 28rpx; 220 font-size: 28rpx;
208 } 221 }
222
209 .search-btn { 223 .search-btn {
210 background: #C4121B; 224 background: #C4121B;
211 color: #fff; 225 color: #fff;
212 } 226 }
227
213 .reset-btn { 228 .reset-btn {
214 background: #f7f7f7; 229 background: #f7f7f7;
215 color: #333; 230 color: #333;
...@@ -230,19 +245,23 @@ async function confirmAddExpireExaminer() { ...@@ -230,19 +245,23 @@ async function confirmAddExpireExaminer() {
230 border-bottom: 1rpx solid #eee; 245 border-bottom: 1rpx solid #eee;
231 background-color: #fff; 246 background-color: #fff;
232 } 247 }
248
233 .info { 249 .info {
234 flex: 1; 250 flex: 1;
235 } 251 }
252
236 .name { 253 .name {
237 font-size: 30rpx; 254 font-size: 30rpx;
238 font-weight: bold; 255 font-weight: bold;
239 color: #333; 256 color: #333;
240 } 257 }
258
241 .idc, .reg { 259 .idc, .reg {
242 font-size: 26rpx; 260 font-size: 26rpx;
243 color: #666; 261 color: #666;
244 margin: 20rpx 0; 262 margin: 20rpx 0;
245 } 263 }
264
246 .choose-btn { 265 .choose-btn {
247 color: #C4121B; 266 color: #C4121B;
248 font-size: 26rpx; 267 font-size: 26rpx;
...@@ -252,6 +271,7 @@ async function confirmAddExpireExaminer() { ...@@ -252,6 +271,7 @@ async function confirmAddExpireExaminer() {
252 background-color: #fff; 271 background-color: #fff;
253 margin: 10rpx auto; 272 margin: 10rpx auto;
254 } 273 }
274
255 .choose-btn.disabled { 275 .choose-btn.disabled {
256 color: #ccc; 276 color: #ccc;
257 border-color: #ccc; 277 border-color: #ccc;
...@@ -266,23 +286,27 @@ async function confirmAddExpireExaminer() { ...@@ -266,23 +286,27 @@ async function confirmAddExpireExaminer() {
266 box-sizing: border-box; 286 box-sizing: border-box;
267 text-align: center; 287 text-align: center;
268 } 288 }
289
269 .modal-title { 290 .modal-title {
270 font-size: 36rpx; 291 font-size: 36rpx;
271 font-weight: 600; 292 font-weight: 600;
272 color: #333; 293 color: #333;
273 margin-bottom: 30rpx; 294 margin-bottom: 30rpx;
274 } 295 }
296
275 .modal-content { 297 .modal-content {
276 font-size: 30rpx; 298 font-size: 30rpx;
277 color: #666; 299 color: #666;
278 line-height: 1.6; 300 line-height: 1.6;
279 margin-bottom: 30rpx; 301 margin-bottom: 30rpx;
280 } 302 }
303
281 .modal-btns { 304 .modal-btns {
282 display: flex; 305 display: flex;
283 justify-content: space-between; 306 justify-content: space-between;
284 gap: 20rpx; 307 gap: 20rpx;
285 } 308 }
309
286 .btn-cancel { 310 .btn-cancel {
287 flex: 1; 311 flex: 1;
288 height: 80rpx; 312 height: 80rpx;
...@@ -293,6 +317,7 @@ async function confirmAddExpireExaminer() { ...@@ -293,6 +317,7 @@ async function confirmAddExpireExaminer() {
293 font-size: 32rpx; 317 font-size: 32rpx;
294 border: none; 318 border: none;
295 } 319 }
320
296 .btn-confirm { 321 .btn-confirm {
297 flex: 1; 322 flex: 1;
298 height: 80rpx; 323 height: 80rpx;
...@@ -303,6 +328,7 @@ async function confirmAddExpireExaminer() { ...@@ -303,6 +328,7 @@ async function confirmAddExpireExaminer() {
303 font-size: 32rpx; 328 font-size: 32rpx;
304 border: none; 329 border: none;
305 } 330 }
331
306 /* 去除button默认边框 */ 332 /* 去除button默认边框 */
307 .btn-cancel::after, .btn-confirm::after { 333 .btn-cancel::after, .btn-confirm::after {
308 border: none; 334 border: none;
......
...@@ -2,25 +2,32 @@ ...@@ -2,25 +2,32 @@
2 <view class="container"> 2 <view class="container">
3 <!-- 考官选择类型 --> 3 <!-- 考官选择类型 -->
4 <view class="radio-section"> 4 <view class="radio-section">
5 <radio-group @change="onSelfSelectChange" class="radio-group"> 5 <radio-group class="radio-group" @change="onSelfSelectChange">
6 <label class="radio-item"> 6 <label class="radio-item">
7 <radio value="1" :checked="form.selfSelect == '1'" class="custom-radio" /> 7 <radio :checked="form.selfSelect == '1'" class="custom-radio" value="1"/>
8 <text class="radio-text">自行录入考官(级位考官)</text> 8 <text class="radio-text">自行录入考官(级位考官)</text>
9 </label> 9 </label>
10 <label class="radio-item"> 10 <label v-if="shenForm.memberEpAudit==1" class="radio-item">
11 <radio value="0" :checked="form.selfSelect == '0'" class="custom-radio" /> 11 <radio :checked="form.selfSelect == '0'" class="custom-radio" value="0"/>
12 <text class="radio-text">省跆协指派考官</text> 12 <text class="radio-text">省跆协指派考官</text>
13 </label> 13 </label>
14 </radio-group> 14 </radio-group>
15 </view> 15 </view>
16 <view class="section"> 16 <view class="section">
17 <!-- 自行录入考官区域 --> 17 <!-- 自行录入考官区域 -->
18 <view class="section examiner-section" v-if="showExamine"> 18 <view v-if="form.selfSelect==0" class="section examiner-section">
19 <view class="modal-title">温馨提示</view>
20 <view class="modal-content"> 关于考官指派,请联系{{ shenForm.baseName }},联系电话:{{ shenForm.phone }}
21 </view>
22 </view>
23
24 <!-- 温馨提示 -->
25 <view v-if="showExamine" class="section examiner-section">
19 <button class="add-btn" @click="handelAddExamine">+ 添加考官</button> 26 <button class="add-btn" @click="handelAddExamine">+ 添加考官</button>
20 </view> 27 </view>
21 28
22 <view class="examiner-list" v-if="showExamine"> 29 <view v-if="showExamine" class="examiner-list">
23 <view class="examiner-item" v-for="(item, index) in list" :key="item.id"> 30 <view v-for="(item, index) in list" :key="item.id" class="examiner-item">
24 <view class="info"> 31 <view class="info">
25 <text class="name">{{ item.perName }} {{ item.perCode }}</text> 32 <text class="name">{{ item.perName }} {{ item.perCode }}</text>
26 <text class="idc">证件号码:{{ item.perIdcCode }}</text> 33 <text class="idc">证件号码:{{ item.perIdcCode }}</text>
...@@ -36,7 +43,7 @@ ...@@ -36,7 +43,7 @@
36 </view> 43 </view>
37 44
38 <!-- 自定义考点申请弹窗(替换原uni.showModal) --> 45 <!-- 自定义考点申请弹窗(替换原uni.showModal) -->
39 <uni-popup ref="applyPopup" type="center" background-color="rgba(0,0,0,0.5)"> 46 <uni-popup ref="applyPopup" background-color="rgba(0,0,0,0.5)" type="center">
40 <view class="custom-modal"> 47 <view class="custom-modal">
41 <view class="modal-title">考点申请</view> 48 <view class="modal-title">考点申请</view>
42 <view class="modal-btns"> 49 <view class="modal-btns">
...@@ -48,7 +55,7 @@ ...@@ -48,7 +55,7 @@
48 </uni-popup> 55 </uni-popup>
49 56
50 <!-- 自定义删除确认弹窗 --> 57 <!-- 自定义删除确认弹窗 -->
51 <uni-popup ref="delPopup" type="center" background-color="rgba(0,0,0,0.5)"> 58 <uni-popup ref="delPopup" background-color="rgba(0,0,0,0.5)" type="center">
52 <view class="custom-modal"> 59 <view class="custom-modal">
53 <view class="modal-title">提示</view> 60 <view class="modal-title">提示</view>
54 <view class="modal-content">确定删除该考官吗?</view> 61 <view class="modal-content">确定删除该考官吗?</view>
...@@ -60,10 +67,11 @@ ...@@ -60,10 +67,11 @@
60 </uni-popup> 67 </uni-popup>
61 68
62 <!-- 自定义省跆协指派提示弹窗 --> 69 <!-- 自定义省跆协指派提示弹窗 -->
63 <uni-popup ref="assignPopup" type="center" background-color="rgba(0,0,0,0.5)"> 70 <uni-popup ref="assignPopup" background-color="rgba(0,0,0,0.5)" type="center">
64 <view class="custom-modal"> 71 <view class="custom-modal">
65 <view class="modal-title">温馨提示</view> 72 <view class="modal-title">温馨提示</view>
66 <view class="modal-content">关于考官指派,请联系河北省跆协,联系电话:XXXX</view> 73 <view class="modal-content"> 关于考官指派,请联系{{ shenForm.baseName }},联系电话:{{ shenForm.phone }}
74 </view>
67 <view class="modal-btns"> 75 <view class="modal-btns">
68 <button class="btn-confirm single-btn" @click="closeAssignPopup()">我知道了</button> 76 <button class="btn-confirm single-btn" @click="closeAssignPopup()">我知道了</button>
69 </view> 77 </view>
...@@ -71,7 +79,7 @@ ...@@ -71,7 +79,7 @@
71 </uni-popup> 79 </uni-popup>
72 80
73 <!-- 自定义提交成功弹窗 --> 81 <!-- 自定义提交成功弹窗 -->
74 <uni-popup ref="successPopup" type="center" background-color="rgba(0,0,0,0.5)"> 82 <uni-popup ref="successPopup" background-color="rgba(0,0,0,0.5)" type="center">
75 <view class="custom-modal"> 83 <view class="custom-modal">
76 <view class="modal-title">成功</view> 84 <view class="modal-title">成功</view>
77 <view class="modal-content">提交成功,请等待审核</view> 85 <view class="modal-content">提交成功,请等待审核</view>
...@@ -84,9 +92,10 @@ ...@@ -84,9 +92,10 @@
84 </template> 92 </template>
85 93
86 <script setup> 94 <script setup>
87 import { ref, } from 'vue' 95 import {ref,} from 'vue'
88 import { onLoad,onShow } from '@dcloudio/uni-app' 96 import {onLoad, onShow} from '@dcloudio/uni-app'
89 import * as api from '@/common/api.js' 97 import * as api from '@/common/api.js'
98 import {getShenMemberInfo} from "@/common/api.js";
90 99
91 const form = ref({ 100 const form = ref({
92 selfSelect: '1' // 1:自行录入 0:省跆协指派 101 selfSelect: '1' // 1:自行录入 0:省跆协指派
...@@ -95,6 +104,7 @@ const showExamine = ref(true) ...@@ -95,6 +104,7 @@ const showExamine = ref(true)
95 const loading = ref(false) 104 const loading = ref(false)
96 const list = ref([]) 105 const list = ref([])
97 const memId = ref(null) 106 const memId = ref(null)
107 const shenForm = ref({})
98 108
99 // 弹窗引用 109 // 弹窗引用
100 const applyPopup = ref(null) 110 const applyPopup = ref(null)
...@@ -112,27 +122,35 @@ onShow(() => { ...@@ -112,27 +122,35 @@ onShow(() => {
112 if (memId.value) { 122 if (memId.value) {
113 getExaminer() 123 getExaminer()
114 } 124 }
125 getShenMemberInfoFn()
115 }) 126 })
116 127
117 async function getExaminer() { 128 async function getExaminer() {
118 loading.value = true 129 loading.value = true
119 const res = await api.listApi({ memId: memId.value }) 130 const res = await api.listApi({memId: memId.value})
120 list.value = res.rows 131 list.value = res.rows
121 loading.value = false 132 loading.value = false
122 } 133 }
123 134
135 async function getShenMemberInfoFn() {
136 const res = await api.getShenMemberInfo()
137 shenForm.value = res.data ?? {}
138 }
139
124 // 删除考官:打开自定义弹窗 140 // 删除考官:打开自定义弹窗
125 function handleDel(row) { 141 function handleDel(row) {
126 currentDelItem.value = row 142 currentDelItem.value = row
127 delPopup.value.open() 143 delPopup.value.open()
128 } 144 }
145
129 // 确认删除 146 // 确认删除
130 async function confirmDel() { 147 async function confirmDel() {
131 await api.examinerDel(currentDelItem.value.id) 148 await api.examinerDel(currentDelItem.value.id)
132 uni.showToast({ title: '删除成功', icon: 'success' }) 149 uni.showToast({title: '删除成功', icon: 'success'})
133 getExaminer() 150 await getExaminer()
134 closeDelPopup() 151 closeDelPopup()
135 } 152 }
153
136 function closeDelPopup() { 154 function closeDelPopup() {
137 delPopup.value.close() 155 delPopup.value.close()
138 } 156 }
...@@ -141,10 +159,11 @@ function closeDelPopup() { ...@@ -141,10 +159,11 @@ function closeDelPopup() {
141 function onSelfSelectChange(e) { 159 function onSelfSelectChange(e) {
142 form.value.selfSelect = e.detail.value 160 form.value.selfSelect = e.detail.value
143 showExamine.value = e.detail.value == '1' 161 showExamine.value = e.detail.value == '1'
144 if (e.detail.value == '2') { 162 if (e.detail.value == '0') {
145 assignPopup.value.open() 163 assignPopup.value.open()
146 } 164 }
147 } 165 }
166
148 function closeAssignPopup() { 167 function closeAssignPopup() {
149 assignPopup.value.close() 168 assignPopup.value.close()
150 } 169 }
...@@ -159,19 +178,20 @@ function handelAddExamine() { ...@@ -159,19 +178,20 @@ function handelAddExamine() {
159 // 提交申请:打开自定义成功弹窗 178 // 提交申请:打开自定义成功弹窗
160 async function handelSubmit() { 179 async function handelSubmit() {
161 if (!form.value.selfSelect) { 180 if (!form.value.selfSelect) {
162 return uni.showToast({ title: '请选择考官类型', icon: 'none' }) 181 return uni.showToast({title: '请选择考官类型', icon: 'none'})
163 } 182 }
164 if (form.value.selfSelect == '1' && list.value.length == 0) { 183 if (form.value.selfSelect == '1' && list.value.length == 0) {
165 return uni.showToast({ title: '请添加考官', icon: 'none' }) 184 return uni.showToast({title: '请添加考官', icon: 'none'})
166 } 185 }
167 186
168 try { 187 try {
169 await api.commitExamPointApply(form.value) 188 await api.commitExamPointApply(form.value)
170 successPopup.value.open() 189 successPopup.value.open()
171 } catch (err) { 190 } catch (err) {
172 uni.showToast({ title: err.data.msg, icon: 'none' }) 191 uni.showToast({title: err.data.msg, icon: 'none'})
173 } 192 }
174 } 193 }
194
175 function confirmSuccess() { 195 function confirmSuccess() {
176 successPopup.value.close() 196 successPopup.value.close()
177 uni.navigateBack() 197 uni.navigateBack()
...@@ -181,9 +201,11 @@ function confirmSuccess() { ...@@ -181,9 +201,11 @@ function confirmSuccess() {
181 function openApplyPopup() { 201 function openApplyPopup() {
182 applyPopup.value.open() 202 applyPopup.value.open()
183 } 203 }
204
184 function closeApplyPopup() { 205 function closeApplyPopup() {
185 applyPopup.value.close() 206 applyPopup.value.close()
186 } 207 }
208
187 function confirmApply() { 209 function confirmApply() {
188 applyPopup.value.close() 210 applyPopup.value.close()
189 // 此处添加考点申请逻辑 211 // 此处添加考点申请逻辑
...@@ -195,9 +217,11 @@ function confirmApply() { ...@@ -195,9 +217,11 @@ function confirmApply() {
195 .container { 217 .container {
196 min-height: 100vh; 218 min-height: 100vh;
197 } 219 }
198 .section{ 220
199 padding:15rpx 20rpx; 221 .section {
222 padding: 15rpx 20rpx;
200 } 223 }
224
201 /* 单选框区域 */ 225 /* 单选框区域 */
202 .radio-section { 226 .radio-section {
203 background: #fff; 227 background: #fff;
...@@ -332,28 +356,33 @@ function confirmApply() { ...@@ -332,28 +356,33 @@ function confirmApply() {
332 box-sizing: border-box; 356 box-sizing: border-box;
333 text-align: center; 357 text-align: center;
334 } 358 }
359
335 .modal-title { 360 .modal-title {
336 font-size: 36rpx; 361 font-size: 36rpx;
337 font-weight: 600; 362 font-weight: 600;
338 color: #333; 363 color: #333;
339 margin-bottom: 30rpx; 364 margin-bottom: 30rpx;
340 } 365 }
366
341 .modal-content { 367 .modal-content {
342 font-size: 30rpx; 368 font-size: 30rpx;
343 color: #666; 369 color: #666;
344 line-height: 1.6; 370 line-height: 1.6;
345 margin-bottom: 30rpx; 371 margin-bottom: 30rpx;
346 } 372 }
373
347 .modal-tip { 374 .modal-tip {
348 font-size: 28rpx; 375 font-size: 28rpx;
349 color: #FF7A00; 376 color: #FF7A00;
350 margin-top: 20rpx; 377 margin-top: 20rpx;
351 } 378 }
379
352 .modal-btns { 380 .modal-btns {
353 display: flex; 381 display: flex;
354 justify-content: space-between; 382 justify-content: space-between;
355 gap: 20rpx; 383 gap: 20rpx;
356 } 384 }
385
357 .btn-cancel { 386 .btn-cancel {
358 flex: 1; 387 flex: 1;
359 height: 80rpx; 388 height: 80rpx;
...@@ -364,6 +393,7 @@ function confirmApply() { ...@@ -364,6 +393,7 @@ function confirmApply() {
364 font-size: 32rpx; 393 font-size: 32rpx;
365 border: none; 394 border: none;
366 } 395 }
396
367 .btn-confirm { 397 .btn-confirm {
368 flex: 1; 398 flex: 1;
369 height: 80rpx; 399 height: 80rpx;
...@@ -374,9 +404,11 @@ function confirmApply() { ...@@ -374,9 +404,11 @@ function confirmApply() {
374 font-size: 32rpx; 404 font-size: 32rpx;
375 border: none; 405 border: none;
376 } 406 }
407
377 .single-btn { 408 .single-btn {
378 flex: 1; 409 flex: 1;
379 } 410 }
411
380 .btn-cancel::after, .btn-confirm::after { 412 .btn-cancel::after, .btn-confirm::after {
381 border: none; 413 border: none;
382 } 414 }
......
...@@ -5,17 +5,17 @@ ...@@ -5,17 +5,17 @@
5 审核信息 5 审核信息
6 </view> 6 </view>
7 <view> 7 <view>
8 <view class="stepItem" v-for="(n,index) in recordList" :key="index"> 8 <view v-for="(n,index) in recordList" :key="index" class="stepItem">
9 <view class="time">{{n.auditTime||'待审批'}}</view> 9 <view class="time">{{ n.auditTime || '待审批' }}</view>
10 <view class="content"> 10 <view class="content">
11 <view class="status"> 11 <view class="status">
12 <text v-if="n.auditResult==1" class="text-success">审核通过</text> 12 <text v-if="n.auditResult==1" class="text-success">审核通过</text>
13 <text v-if="n.auditResult==0" class="text-danger"> 审核拒绝</text> 13 <text v-if="n.auditResult==0" class="text-danger"> 审核拒绝</text>
14 </view> 14 </view>
15 <!-- <view class="name">{{index+1}}</view> --> 15 <!-- <view class="name">{{index+1}}</view> -->
16 <view class="deptName">{{n.auditDeptName}}</view> 16 <view class="deptName">{{ n.auditDeptName }}</view>
17 <view v-if="n.auditResult==0"> 17 <view v-if="n.auditResult==0">
18 备注:{{n.auditMsg||'/' }} 18 备注:{{ n.auditMsg || '/' }}
19 </view> 19 </view>
20 </view> 20 </view>
21 </view> 21 </view>
...@@ -26,35 +26,46 @@ ...@@ -26,35 +26,46 @@
26 </template> 26 </template>
27 27
28 <script setup> 28 <script setup>
29 import * as api from '@/common/api.js' 29 import * as api from '@/common/api.js'
30 import config from '@/config.js' 30 import config from '@/config.js'
31 import _ from 'underscore' 31 import _ from 'underscore'
32 import to from 'await-to-js' 32 import to from 'await-to-js'
33 import { 33 import {
34 onMounted, 34 onMounted,
35 ref 35 ref
36 } from 'vue' 36 } from 'vue'
37 import { 37 import {
38 onLoad, 38 onLoad,
39 onShow 39 onShow
40 } from '@dcloudio/uni-app' 40 } from '@dcloudio/uni-app'
41 const app = getApp();
42 const userType = ref('')
43 const recordList = ref([])
44 onLoad(async (option) => {
45 await getMyRecentFN()
46 })
47 41
48 async function getMyRecentFN() { 42 const app = getApp();
43 const userType = ref('')
44 const recordList = ref([])
45
46 onLoad(async (option) => {
47 console.log(option)
48 if (option.type == 1) await getMyRecentFN()
49 if (option.type == 2) await getMyRecentExamFn()
50 })
51
52 async function getMyRecentFN() {
49 const [err, res] = await to(api.getMyRecent()) 53 const [err, res] = await to(api.getMyRecent())
50 if (!err && res.data && res.data.auditLogs) { 54 if (!err && res.data && res.data.auditLogs) {
51 recordList.value = JSON.parse(res.data.auditLogs) 55 recordList.value = JSON.parse(res.data.auditLogs)
52 } 56 }
57 }
58
59 async function getMyRecentExamFn() {
60 const [err, res] = await to(api.getMyRecentExam())
61 if (!err && res.data && res.data.auditLogs) {
62 recordList.value = JSON.parse(res.data.auditLogs)
53 } 63 }
64 }
54 </script> 65 </script>
55 66
56 <style scoped lang="scss"> 67 <style lang="scss" scoped>
57 .wBox { 68 .wBox {
58 width: 700rpx; 69 width: 700rpx;
59 padding: 30rpx; 70 padding: 30rpx;
60 margin: 20rpx auto; 71 margin: 20rpx auto;
...@@ -79,5 +90,5 @@ ...@@ -79,5 +90,5 @@
79 text-align: justify; 90 text-align: justify;
80 } 91 }
81 } 92 }
82 } 93 }
83 </style> 94 </style>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!