From c7772e54ad5f68364b695b0cd31e530bff362a72 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Wed, 17 Apr 2024 18:43:54 +0800 Subject: [PATCH] fix --- public/favicon.ico | Bin 0 -> 4286 bytes src/views/customer/AddCustomer.vue | 133 ++++++++++++++++++++++- src/views/match/add/step3.vue | 2 + src/views/match/manage/matchArchList.vue | 3 +- src/views/match/manage/matchInfo.vue | 1 + src/views/match/manage/matchRank.vue | 2 +- src/views/match/manage/matchSignup.vue | 10 +- 7 files changed, 141 insertions(+), 10 deletions(-) create mode 100644 public/favicon.ico diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..18d2a14b493ea0bfce3b78ca8c10fb6b3c18464c GIT binary patch literal 4286 zcmbW*S!`5Q9LMo9GHElYR}mtR5I|!Xgvdov+OkykT@YloR4OVE1F{+r!48xifwE{p z78ytv9F%H&Ha95A6*N&4BN(g7B9A1Axe)50Y411c+T}@3$0c%=~J&ST_kQSUF5&MY?0BbIV;|^t~=hR zz8@!dXEn*H5b(or=h*l6n`7UlXEm-|U`cLJ|At?h`IUVfa@K5IIbVfnTs7a%ozd(* z$=>d3KI=SZjZXI32k%&tpBh)qdy0AO(IG8Wlc|z&c8>`a0)7~fXMMx0j(5+R*M-~} zC)==Qt|ig0efX9F_iJ)(_1l8q(L?5_l(TzGs1VoI%=NPxkY|M&*1qY5JIl_(2hGhE z7g-G%dPDIX1#V9=Fh?ZU7kbD9rJUVkHhfg1vI_WNK%N!i-V1kDI_qQAoNRL48* zt}9gF_VBhyZYc1O2}(J;Cx(6y@WX&SE5zQ5%&a?EA7`4IEh(^)8G5p0wt`F#?>DR~ z@{kEiIlHGRvElU-iH)-cCrS!BCD+g1&sjpsgc2JIyon73nOP+Tf_on{Cl}u|(~{`a zN_@-o?D*yxZ6M;CXNttO86M7qQcmuPkqcrVpJix#*w$&QW80>6kL;cx>Pw~wGP|Ullh3SMr$^#jr(opkM5k@mi=<+tcm)E=+0M*qPr%wV{VVw$5Xa(RwrfT8BTqPS!?L& z7TYn|L%$$z^FecZ&C*GhM30tEYRi7PbmrXuW0p=lWA2_fjf}#)XPI3_E_{!y)6+!H zAM`9lX9%)BXl~D*36`0mn|mj;WxrfHlke^NHoi6Yjvt@O?w*)y?s=u0vxfWhG;w#1 zo_yA9XioO(C*v%MPW_0vZ+xD)Z`@hxCh1Pj*>&U9PsfI?mW|0L?_>5TdQNeE>pnfj z++{&?GLf>;mPC(~jZq+&-I>`7sV{QhBxU5hU7L~pqYp>+kLq)^Y^*}xWO`0>e)}Fh z#hhh9bMC^QjkF{>wE_`2FbbnR%KMheq_mI_@q@dAZlAYr=EEFZtB?^F&>Fj)$|Ll(T!HP{I9x-UvgU6*4OFy!O5GW7qIOLn>QanQKY(+KM~{P7C=w zQ6C)WArq8xc8>`aqP8Np2de>jR;aEr*9&)6DqETBW7XVjRgP7gp;Iexd+I84gi(>> zsjccClyY{D36*mJKef^9K2%qgb2UE(~J@#IOxN@?epVfdoE5`muG@o^r zvj!(y^VRcKE1C4E5b(o5%V(YHYt^)lNuLS + 确定 + + +
+ +
+ + + + + + + + + + + + + + + + + + + + 取消 + 确定 + + @@ -784,7 +861,14 @@ export default { schoolName: '', provinceName: '', cityName: '', - } + }, + + customerListVisible: false, + customers: [{}], + pageCustomer: 1, + pageSizeCustomer: 10, + totalCustomer: 0, + customerKeyword: '', }; }, watch: { @@ -948,7 +1032,6 @@ export default { 1 } }) - console.log("🚀 ~ file: AddCustomer.vue:651 ~ getProduct ~ data:", data) this.productAll = data this.totalProduct = data.length this.handlePage() @@ -969,7 +1052,38 @@ export default { }, // 创建客户 addCustomer () { + // this.customerListVisible = true + this.customerVisible = true + }, + handleCurrentChangeCustomer (val) { + this.pageCustomer = val + // this.getCustomer() + }, + // 获取客户列表 + getCustomer () { + this.$get(this.api.queryCity, { + provinceId: this.provinceList.find(e => e.provinceName == name).provinceId + }).then(({ list }) => { + this.cities = list + this.customerForm.cityName = '' + }).catch(res => { }); + }, + // 编辑客户 + editCustomer (row) { this.customerVisible = true + // this.customerForm = { + // schoolName: '', + // provinceName: '', + // cityName: '', + // } + }, + // 删除客户 + delCustomer (row, i) { + this.$confirm('确定要删除吗？', '提示', { + type: 'warning' + }).then(() => { + + }).catch(() => { }) }, // 获取城市 provinceChange (name) { @@ -1018,7 +1132,7 @@ export default { data.push({ productName: e.productName, productStatus: e.status, - productType: e.productName, + productType: e.productTypeName, remainingPeriod: e.remain, startAndEndTime: e.startAndEndTime, subscriptionStatus: e.isEnable ? '启用' : '禁用', @@ -1332,7 +1446,7 @@ export default { if ((id && updateTime > 1) || (!id && updateTime)) { this.$confirm(`编辑的内容未保存，是否保存？`, '提示', { type: 'warning', - closeOnClickModal: false + closeOnClickModal: false }).then(() => { this.saveAdd(i) }).catch(() => { @@ -1395,4 +1509,15 @@ export default { color: #666; cursor: pointer; } +/deep/.customer-dia { + .icon { + margin-right: 10px; + font-size: 16px; + color: #7a7a7a; + cursor: pointer; + &:hover { + color: #9076ff; + } + } +} diff --git a/src/views/match/add/step3.vue b/src/views/match/add/step3.vue index 12d52dc..8be98fe 100644 --- a/src/views/match/add/step3.vue +++ b/src/views/match/add/step3.vue @@ -259,6 +259,8 @@ export default { url: n }) }) + } else { + form.competitionStageContentSetting.fileList = [] } form.competitionStageContentSetting.competitionId = this.id form.competitionStageContentSetting.stageId = e.stageId diff --git a/src/views/match/manage/matchArchList.vue b/src/views/match/manage/matchArchList.vue index b39628e..4a98eeb 100644 --- a/src/views/match/manage/matchArchList.vue +++ b/src/views/match/manage/matchArchList.vue @@ -561,6 +561,7 @@ export default { this.uploading = false this.uploadFaild = false if (res.status === 200) { + this.initData() const { data } = res if (data.exportCode) { this.faildData = data @@ -593,7 +594,7 @@ export default { }, cancelUpload () { this.uploading = false - this.$refs.upload.abort() + if (this.$refs.upload) this.$refs.upload.abort() this.keyword = '' this.initData() this.importVisible = false diff --git a/src/views/match/manage/matchInfo.vue b/src/views/match/manage/matchInfo.vue index a1eb598..6c4043c 100644 --- a/src/views/match/manage/matchInfo.vue +++ b/src/views/match/manage/matchInfo.vue @@ -22,6 +22,7 @@ 团队邀请码： diff --git a/src/views/match/manage/matchRank.vue b/src/views/match/manage/matchRank.vue index d96bb44..a244510 100644 --- a/src/views/match/manage/matchRank.vue +++ b/src/views/match/manage/matchRank.vue @@ -729,6 +729,7 @@ export default { this.uploadFaild = false this.uploaded = 0 if (res.status === 200) { + this.getRank() const { data } = res if (data.exportCode) { this.faildData = data @@ -736,7 +737,6 @@ export default { } else { this.uploaded = 1 this.importVisible = false - this.getRank() util.successMsg(data.tip, 3000) // util.successMsg('请检查数据后，点击发布排名以发布数据！') } diff --git a/src/views/match/manage/matchSignup.vue b/src/views/match/manage/matchSignup.vue index 609b7ac..336770c 100644 --- a/src/views/match/manage/matchSignup.vue +++ b/src/views/match/manage/matchSignup.vue @@ -476,6 +476,7 @@ export default { getInfo () { this.$post(`${this.api.getCompetition}?competitionId=${this.id}`).then(({ competition }) => { this.info = competition + this.getSchool() // 非本校内则查询接口获取学校列表 if (competition.competitionScope) { this.getClient() @@ -757,6 +758,11 @@ export default { } this.teamVisible = true }, + // 学生所属院校固定查询所有学校 + async getSchool () { + const { list } = await this.$get(this.api.querySchoolData) + this.schools = list + }, // 获取客户 async getClient () { if (this.info.competitionScope === 2) { @@ -780,10 +786,6 @@ export default { this.clients = list }).catch(res => { }) } - // 学生所属院校固定查询所有学校 - this.$get(this.api.querySchoolData).then(({ list }) => { - this.schools = list - }).catch(res => { }) }, // 获取团队列表 getTeam () {