From 1c3b3407ce3dfe05783215e63668b6cdc12ff321 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Thu, 18 Jan 2024 10:56:14 +0800 Subject: [PATCH] fix --- src/api/index.js | 6 + src/assets/images/auth.png | Bin 0 -> 741 bytes src/assets/images/avatar.png | Bin 0 -> 1459 bytes src/assets/images/org.png | Bin 0 -> 458 bytes src/assets/images/user1.png | Bin 0 -> 566 bytes src/pages/activity/add/index.vue | 32 ++- src/pages/activity/manage/index.vue | 3 +- src/pages/activity/manage/matchSignup.vue | 156 ++++++++++- src/pages/join/add/index.vue | 62 +---- .../miniProgramMg/index/banner/list/index.vue | 10 +- src/pages/preschool/manage/member.vue | 262 ++++++++++++++---- src/pages/supplier/manage/member.vue | 262 ++++++++++++++---- src/pages/user/detail/index.vue | 36 ++- src/setting.js | 4 +- 14 files changed, 634 insertions(+), 199 deletions(-) create mode 100644 src/assets/images/auth.png create mode 100644 src/assets/images/avatar.png create mode 100644 src/assets/images/org.png create mode 100644 src/assets/images/user1.png diff --git a/src/api/index.js b/src/api/index.js index e8a9f78..92beaa0 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -31,6 +31,10 @@ export default { excelExportCom: `${host}competition/competition/registration/excelExport`, exportDataInBatchesCom: `${host}competition/competition/registration/exportDataInBatches`, enterpriseCertificationDetails: `nakadai/enterprise/certification/enterpriseCertificationDetails`, + addNewApplicantsInTheBackground: `competition/competition/registration/addNewApplicantsInTheBackground`, + detailsOfApplicants: `competition/competition/registration/detailsOfApplicants`, + editRegistrationInformation: `competition/competition/registration/editRegistrationInformation`, + getOrganizationInformationByPhone: `competition/competition/registration/getOrganizationInformationByPhone`, delCertification: `nakadai/enterprise/certification/batchDeletion`, findCertification: `nakadai/enterprise/certification/findById`, @@ -52,6 +56,8 @@ export default { platformTeamAccountList: `nakadai/kindergarten/platformTeamAccount/platformTeamAccountList`, removeOrganization: `nakadai/kindergarten/platformTeamAccount/removeOrganization`, updateAccountStatus: `nakadai/kindergarten/platformTeamAccount/updateAccountStatus`, + transferTeam: `nakadai/kindergarten/platformTeamAccount/transferTeam`, + inviteJoinOrganization: `nakadai/kindergarten/platformTeamAccount/inviteJoinOrganization`, delSupplierClass: `nakadai/supplierClassification/batchDeletion`, findSupplierClass: `nakadai/supplierClassification/findById`, diff --git a/src/assets/images/auth.png b/src/assets/images/auth.png new file mode 100644 index 0000000000000000000000000000000000000000..577e8fcaff1425c613a8f2528d91ee89be2502b6 GIT binary patch literal 741 zcmVPx%pGibPR7gv;l}kueaTLaX=Z=#g&O)LGEi9;T9#FLD0R@p26}1SNC@pgCfK*Uo zv}kG6t_(^tDjg#qP-CSF7d?rRT(v3Yp@>N)VVkgle9x(CV~jF0n&91C?zzAJ_nmvr zcZEf|WRbYc8|?JyRUj5!%@ryoK9`_5!EV16s$xMmC15=Y7gy%f_NG!M(jAZz?D6Zm zN!TpPG2kFDF3L3(z5|zmT;MZ8t3c<3@}WB*y~&5n0K5I_Rpn7q!3e@l`xsRp8^nUL z;e;+9w{rn7fu+;6hT;v?OUv~AOt7g(6dnRKacCKh)7f`lMpD_`S*cmy`q^SA#lV@& z;Dlm<9pQjq>C+G|5l5soNFa%}a4+u!_s18CaE*#qQxTwyMEf5srlGB$%-k z>B0Y?M}hX7EDkRS?D464*v>%jT^Rxur%8iA2@qV7Pq8&_^J;~wR1aX#uFAe86LgH* z=>i6`;}nkCs75)i&=ievlAuglwwPegCXE)Bp}up;r8h{6>cEZM(QX_hFZ^E zK7EX^&xny13d&eYaKc)nz@e;c)_l4xmQp-E-4&{r*R#jZRjTVT=u)VT2BbXg<|V+} z1l|L!k$j5M1&*~KgI{>{$KA%s2|V2oWFRAW%AQ}Zqf`LTt&#e0SAHeGRA8#Z_`9L| z)u1R^D^F&-Nu6$9wYhSsLMTTGVWT2aD=+Y>&F$c*3YSpUif}4iCwEe9XvWw~gwicw z8PJDfAmju6qMQxaOWS|N=8R&m+MEtd(Wx}E(ylQUqxox4hBJlzoIyX=pJL&P7fAjM X#9hu4|-v8X{|KRNZ&f@>o z<^L-3L)icT03&o#PE!E*)OY7o91`=z2RSUNg-h+Sn_}PE&ApCjGNXP)Be+{XZ_I{8 zCIA2gok>JNRA}C{+KF=FFboD@<={RRC{Um*l>W{^NJzr*{;#&v?vdF6Y>Bwv3utUB zk{z4Gn(y9lJ8k1PXEc2sdhadzUXAtK!Cg*g-JtKW@j5W*culgb<+)&SJ)5)sV+?`8 zPqJeStj`;zT@|*|ipCCV#FkvM3 zJM@xkq;BL_;h5#?dp)YVq6~V5b?!kcjMYPN2pvb8+x<3l(m-h(Q|S0jO}&~y=Nc%j zAcM}F9@;`DQzpShUp<9=p_*r-pnN8^SI`NMiXlp%(Z0XTE_4dTvWHGbzTdbgrW86$ zy3vPLq?mH(IJevVSJQy)4Ear1Dr3bKL#s#sn?Wa3d_f4Exu^#pl)ypKr+m{)3lz|D z1p`K)1Oh>8cA-@&kr3P}@)LTQ61jkz*aPUDl*j>k6Z)eCgS`?tL(l0}?a*rAJq(sr zYUvf01HaOjCQM=_Qoy9knrZtZ#5*4LQPqhNHFX0?e^HAK7LvC-%5eht8OPJkf?-KR!0sXk2^hSp7u(z3 zaxALWWNVvw1;>^~;79_yGYyvCPn(P96Uf8UFrgn z56v$hSzf0QX_Dp)BUQ^MKy{565WHBwx`zJ$S$d3l?hj!GoY%+5|4~RGoqCPPN-2 zt)7Fc{kSRo4H@i!EU+H8-RC@xv^?9#673!_?Aj=g%9<#I-zS!pkI>pjm4|Sf#I%_q zDXdk?PK(%DufQR&(~SpRl2`*}WMP_}7ZTd}NX|js9hciDvDUWUKC=j`SKUGlAIP5F z(5HaAqbGG2&mLi}fa6gO{nyXXkvuF0O{!nE3dVl-X&&kMlf=@;u(3 z4}Tx);M&zIbWTH`_G4;biMh{n5yu&c~DCN25t%zW@eLAH?-rf9(JO N002ovPDHLkV1mHH19|`e literal 0 HcmV?d00001 diff --git a/src/assets/images/org.png b/src/assets/images/org.png new file mode 100644 index 0000000000000000000000000000000000000000..4be761d4547625e5c27d5e04e28b3e28fe11a2e0 GIT binary patch literal 458 zcmV;*0X6=KP)Px$gh@m}R5(wilFdpSK@^3*ThT>KT!>^54gRdO8#g8d23+Vc&)@@0O%Qwm7j7H{ z7e0cDjc=k&+=;px8-JK>Mz=x?I@4FGuw@)u(O9dhTlbzi=hP8$*0|MGfyMSK5mt`3 zWT~@V@&E#>HzsAMwk-{JKW25nz*!Q>r`G~#63HX*!0MBl1AC6ay8*6E%4jAbnA5K` zsV9+qe4T`fuAwaaw~5(cSkYy-&vQTP$@Spv0JHib>?Ky1%KO%wTAV}_LDVw{erbV} z&7Lm4A8g3&OALO@Y4_h-j*L>SZOgs~7_(Y5P)#D4Zh!4L4+5)k3e}THcBDPF3YQ9# zCs$l_Nb-~?%6w}H2f!B}B4I@WtN%>Oi2L)<>bk-?hToYa*O*am8A<}fNhI@GydA(p z>O!kkH;@{3CH0bKyhm1d)lfAl{(KyX?{l*b;30LMflxJiVq7d}a@!aBpgyTu}=97}O?*K!4`J9WmmPx$@JU2LR5(wqltFI{aTvyb&+fsc5(k_m5}nzKkV>S4PvAhP3t@Mb`UD8h2tI+b z|5?IC2?w8`LL<=-(VeM8;*5htFAlq}%(S!FZDwjG@xM&+pZEFYnfH0;7618YBi?vm zo2zimU}sV%_}Yb=%TB+GbcMiOb@Qqf+Q0$CQVK98fOp*<^)GG3dC)?jAJ_}vn8c}0 zOLK|1*0gCeo&ql;r{g07Yk{3Mcx)B+#}BkPDD=+Tq=Cx_5;`oEU(>-13x3DZKdYW3v5O(15BpE;WD(Z6sE2;jZev`|3uC>L z{*a41QA<~{_kExj*a^Y2ykRctR~C}N$=K=n+W)>c$2xzfHwq}Huc#4v8`WafP3q<nSkZEMiC0 z(!MgV{=7Er1ID*x1Es(uvE-Spsj|>P{e~O6EI6tE3rsD^6}45W!vFvP07*qoM6N<$ Ef{fM%YybcN literal 0 HcmV?d00001 diff --git a/src/pages/activity/add/index.vue b/src/pages/activity/add/index.vue index 30a4bf8..8390f95 100644 --- a/src/pages/activity/add/index.vue +++ b/src/pages/activity/add/index.vue @@ -134,13 +134,13 @@ label="发布范围">
全平台 + label="1">全平台
指定范围 + label="0">指定范围 - +e) - data.competitionScope = 0 + if (data.competitionScope === '0') { + data.competitionScope = '1' + } else if (data.competitionScope !== '1') { + this.competitionScope = data.competitionScope.split(',') + data.competitionScope = '0' } // 附件 const fileList = data.competitionAnnexList @@ -565,7 +565,7 @@ export default { }, // 提交 save (status) { - const { form } = this + const form = JSON.parse(JSON.stringify(this.form)) if (!form.name) return Util.warningMsg("请填写活动名称"); // 发布需要校验 if (status) { @@ -580,12 +580,12 @@ export default { if (!form.playStartTime) return Util.warningMsg("请选择举办时间"); if (playStartTime && signUpEndTime && playStartTime < signUpEndTime) return Util.warningMsg("举办时间不能早于报名结束时间"); if (form.isNeedCode && (!form.invitationCode || form.invitationCode.length !== 4)) return Util.warningMsg('请填写四位数邀请码') - if (!form.competitionScope && !this.competitionScope.length) return Util.warningMsg('请选择指定范围') + if (form.competitionScope === '0' && !this.competitionScope.length) return Util.warningMsg('请选择指定范围') if (!form.quantityLimit) return Util.warningMsg('请填写报名人数上限') if (!form.description) return Util.warningMsg("请填写活动详情"); } form.publishStatus = status - if (!form.competitionScope) { + if (form.competitionScope === '0') { form.competitionScope = this.competitionScope.join(',') } form.sponsor = this.sponsorList.filter(d => d).join(); @@ -729,7 +729,9 @@ $upload-lg-height: 150px; } } } - +.input-form.model { + height: calc(100vh - 300px); +} /deep/ .d-inline-block { width: 216px; diff --git a/src/pages/activity/manage/index.vue b/src/pages/activity/manage/index.vue index 1658d7e..4f7159c 100644 --- a/src/pages/activity/manage/index.vue +++ b/src/pages/activity/manage/index.vue @@ -1,7 +1,6 @@ - - - + 转让管理员 + 踢出 - --> + + + +
    +
  • +
    + + {{ item.userName }} +
    + +
    • +
+ + 取 消 + 确 定 + + + + + + + + + + + + + + + + + + + + + + + + + + + 取消 + 确定 + +
@@ -93,6 +169,21 @@ export default { page: 1, pageSize: 10, total: 0, + + transferVisible: false, + chooseVisible: false, + members: [], + choosePartnerId: '', + curRow: '', + provinces: [], + cities: [], + editVisible: false, + form: { + userName: '', + provinceId: '', + cityId: '', + }, + roles: [] }; }, watch: { @@ -133,60 +224,95 @@ export default { this.page = 1 this.getData() }, - handleSelectionChange (val) { - this.multipleSelection = val; - }, handleCurrentChange (val) { this.page = val; this.getData(); }, - switchOff (val, row, index) { - this.$put(`${this.api.disableActivityApplicant}?competitionRegistrationId=${row.id}&isDisable=${val}`).then(res => { }).catch(err => { }); + // 编辑 + edit (row) { + this.editVisible = true + this.form = JSON.parse(JSON.stringify(row)) }, - delData (row) { - this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", { + // 删除 + del (row) { + this.$confirm("确定要删除吗？", "提示", { type: "warning" - }) - .then(() => { - this.$post(`${this.api.delActivityApplicant}?id=${row.id}`).then(res => { - util.successMsg("删除成功"); - this.getData(); - }).catch(res => { - }); - }) - .catch(() => { - }); - }, - // 排序回调 - sortChange (column) { - // 1上2下 - if (column.prop === 'school') this.schoolOrder = column.order ? column.order === 'ascending' ? 2 : 1 : '' - if (column.prop === 'teamName') this.teamOrder = column.order ? column.order === 'ascending' ? 2 : 1 : '' - this.getData() + }).then(() => { + this.$post(`${this.api.delPartnerAccount}?accountId=${row.accountId}`).then(res => { + util.successMsg("删除成功") + this.getList() + }).catch(res => { }) + }).catch(() => { }) }, - exportAll () { - const data = this.multipleSelection - if (data.length) { - data.map((e, i) => e.id = i + 1) - axios.post(this.api.exportDataInBatchesApplicant, data, { - headers: { - token: this.token - }, - responseType: 'blob' - }).then((res) => { - util.downloadFileDirect(`报名人员.xls`, new Blob([res.data])) + // 移除 + remove (row) { + this.$confirm("确定要移除吗？", "提示", { + type: "warning" + }).then(() => { + this.$get(this.api.removeOrganization, { + manageId: row.manageId, + teamId: row.classificationId, + }).then(res => { + util.successMsg("移除成功") + this.getData() }).catch(res => { }) + }).catch(() => { }) + }, + // 转让超管 + transfer (row) { + this.curRow = row + this.chooseVisible = true + this.$post(this.api.platformTeamAccountList, { + type: 1, + classificationId: this.teamId, + keyWord: '', + platformId: 5, + pageNum: 1, + pageSize: 10000 + }).then(({ pageList }) => { + this.members = pageList.records + }).catch(err => { }) + }, + // 选择成员提交 + chooseSubmit () { + const { curRow } = this + const id = this.choosePartnerId + const member = this.members.find(e => e.manageId === id) // 获取选择的成员 + if (member) { + this.$post(this.api.transferTeam, { + adminManageId: curRow.manageId, + adminTeamId: curRow.classificationId, + memberManageId: member.manageId, + memberName: member.userName, + memberTeamId: member.classificationId + }).then(res => { + this.chooseVisible = false + this.transferVisible = false + this.getData() + }).catch(err => { }) } else { - axios.get(`${this.api.excelExportApplicant}?activityId=${this.id}`, { - headers: { - token: this.token - }, - responseType: 'blob' - }).then((res) => { - util.downloadFileDirect(`报名人员.xls`, new Blob([res.data])) - }).catch(res => { }) + util.warningMsg('请选择成员！') } - } + }, + // 编辑提交 + submitEdit () { + if (this.submiting) return false + this.submiting = true + const form = JSON.parse(JSON.stringify(this.form)) + form.classificationId = form.partnerClassificationId + this.$post(this.api.editProvinceCity, form).then(res => { + this.getList() + util.successMsg("编辑成功！") + this.editVisible = false + setTimeout(() => { + this.submiting = false + }, 2000) + }).catch(res => { + setTimeout(() => { + this.submiting = false + }, 2000) + }) + }, } }; @@ -202,4 +328,28 @@ export default { align-items: center; } } +/deep/.choose-dia { + .member-list { + li { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 10px; + } + .info { + display: inline-flex; + align-items: center; + } + img { + width: 40px; + height: 40px; + } + .name { + margin-left: 10px; + } + .el-radio__label { + display: none; + } + } +} \ No newline at end of file diff --git a/src/pages/supplier/manage/member.vue b/src/pages/supplier/manage/member.vue index e8bdca1..156fb92 100644 --- a/src/pages/supplier/manage/member.vue +++ b/src/pages/supplier/manage/member.vue @@ -42,29 +42,29 @@ {{ scope.row.isTeam === '1' ? '负责人' : '成员' }} - - - + 转让管理员 + 踢出 - --> + + + +
    +
  • +
    + + {{ item.userName }} +
    + +
    • +
+ + 取 消 + 确 定 + + + + + + + + + + + + + + + + + + + + + + + + + + + 取消 + 确定 + + @@ -93,6 +169,21 @@ export default { page: 1, pageSize: 10, total: 0, + + transferVisible: false, + chooseVisible: false, + members: [], + choosePartnerId: '', + curRow: '', + provinces: [], + cities: [], + editVisible: false, + form: { + userName: '', + provinceId: '', + cityId: '', + }, + roles: [] }; }, watch: { @@ -133,60 +224,95 @@ export default { this.page = 1 this.getData() }, - handleSelectionChange (val) { - this.multipleSelection = val; - }, handleCurrentChange (val) { this.page = val; this.getData(); }, - switchOff (val, row, index) { - this.$put(`${this.api.disableActivityApplicant}?competitionRegistrationId=${row.id}&isDisable=${val}`).then(res => { }).catch(err => { }); + // 编辑 + edit (row) { + this.editVisible = true + this.form = JSON.parse(JSON.stringify(row)) }, - delData (row) { - this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", { + // 删除 + del (row) { + this.$confirm("确定要删除吗？", "提示", { type: "warning" - }) - .then(() => { - this.$post(`${this.api.delActivityApplicant}?id=${row.id}`).then(res => { - util.successMsg("删除成功"); - this.getData(); - }).catch(res => { - }); - }) - .catch(() => { - }); - }, - // 排序回调 - sortChange (column) { - // 1上2下 - if (column.prop === 'school') this.schoolOrder = column.order ? column.order === 'ascending' ? 2 : 1 : '' - if (column.prop === 'teamName') this.teamOrder = column.order ? column.order === 'ascending' ? 2 : 1 : '' - this.getData() + }).then(() => { + this.$post(`${this.api.delPartnerAccount}?accountId=${row.accountId}`).then(res => { + util.successMsg("删除成功") + this.getList() + }).catch(res => { }) + }).catch(() => { }) }, - exportAll () { - const data = this.multipleSelection - if (data.length) { - data.map((e, i) => e.id = i + 1) - axios.post(this.api.exportDataInBatchesApplicant, data, { - headers: { - token: this.token - }, - responseType: 'blob' - }).then((res) => { - util.downloadFileDirect(`报名人员.xls`, new Blob([res.data])) + // 移除 + remove (row) { + this.$confirm("确定要移除吗？", "提示", { + type: "warning" + }).then(() => { + this.$get(this.api.removeOrganization, { + manageId: row.manageId, + teamId: row.classificationId, + }).then(res => { + util.successMsg("移除成功") + this.getData() }).catch(res => { }) + }).catch(() => { }) + }, + // 转让超管 + transfer (row) { + this.curRow = row + this.chooseVisible = true + this.$post(this.api.platformTeamAccountList, { + type: 1, + classificationId: this.teamId, + keyWord: '', + platformId: 6, + pageNum: 1, + pageSize: 10000 + }).then(({ pageList }) => { + this.members = pageList.records + }).catch(err => { }) + }, + // 选择成员提交 + chooseSubmit () { + const { curRow } = this + const id = this.choosePartnerId + const member = this.members.find(e => e.manageId === id) // 获取选择的成员 + if (member) { + this.$post(this.api.transferTeam, { + adminManageId: curRow.manageId, + adminTeamId: curRow.classificationId, + memberManageId: member.manageId, + memberName: member.userName, + memberTeamId: member.classificationId + }).then(res => { + this.chooseVisible = false + this.transferVisible = false + this.getData() + }).catch(err => { }) } else { - axios.get(`${this.api.excelExportApplicant}?activityId=${this.id}`, { - headers: { - token: this.token - }, - responseType: 'blob' - }).then((res) => { - util.downloadFileDirect(`报名人员.xls`, new Blob([res.data])) - }).catch(res => { }) + util.warningMsg('请选择成员！') } - } + }, + // 编辑提交 + submitEdit () { + if (this.submiting) return false + this.submiting = true + const form = JSON.parse(JSON.stringify(this.form)) + form.classificationId = form.partnerClassificationId + this.$post(this.api.editProvinceCity, form).then(res => { + this.getList() + util.successMsg("编辑成功！") + this.editVisible = false + setTimeout(() => { + this.submiting = false + }, 2000) + }).catch(res => { + setTimeout(() => { + this.submiting = false + }, 2000) + }) + }, } }; @@ -202,4 +328,28 @@ export default { align-items: center; } } +/deep/.choose-dia { + .member-list { + li { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 10px; + } + .info { + display: inline-flex; + align-items: center; + } + img { + width: 40px; + height: 40px; + } + .name { + margin-left: 10px; + } + .el-radio__label { + display: none; + } + } +} \ No newline at end of file diff --git a/src/pages/user/detail/index.vue b/src/pages/user/detail/index.vue index 60ffa3b..fc4912f 100644 --- a/src/pages/user/detail/index.vue +++ b/src/pages/user/detail/index.vue @@ -2,7 +2,12 @@

用户信息

-

账号信息

+

+ + 账号信息 +

- - + +
-

实名认证信息（{{ form.authentication }}）

+

+ + 实名认证信息（{{ form.authentication }}） +

-

已绑定的组织信息

+

+ + 已绑定的组织信息 +