diff --git a/src/views/Home/index-new-blue.vue b/src/views/Home/index-new-blue.vue index 516c869..a8e5018 100644 --- a/src/views/Home/index-new-blue.vue +++ b/src/views/Home/index-new-blue.vue @@ -963,7 +963,7 @@ export default { this.avatar = store.getters.avatar; }, mounted() { - if (checkPermi(['home:stu:undo1'])) { + if (checkPermi(['home:stu:undo1']) && store.getters.name !== 'admin') { console.log("检查到学生身份，获取个人信息"); this.getOwnInfo(); } diff --git a/src/views/comprehensive/knzzGlApply/cpnt/GlLook.vue b/src/views/comprehensive/knzzGlApply/cpnt/GlLook.vue index c3c9aaa..e20a1da 100644 --- a/src/views/comprehensive/knzzGlApply/cpnt/GlLook.vue +++ b/src/views/comprehensive/knzzGlApply/cpnt/GlLook.vue @@ -3,7 +3,7 @@

{{ formData.stuYearName - }} + }} 国家励志奖学金申请审批表 @@ -12,7 +12,7 @@ @@ -292,7 +292,7 @@ @@ -355,9 +355,9 @@ （名次/总人数）

- + @@ -528,4 +540,24 @@ export default { - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/comprehensive/knzzGlApply/stu.vue b/src/views/comprehensive/knzzGlApply/stu.vue index c64f9b4..a025b60 100644 --- a/src/views/comprehensive/knzzGlApply/stu.vue +++ b/src/views/comprehensive/knzzGlApply/stu.vue @@ -276,13 +276,13 @@ import { getTokenKeySessionStorage as getToken } from "@/utils/auth"; import GlApply from "@/views/comprehensive/knzzGlApply/cpnt/GlApply.vue"; import GlLook from "@/views/comprehensive/knzzGlApply/cpnt/GlLook.vue"; -import {selectTestStu} from "@/api/stuCQS/info-fill/sportTest"; +import { selectTestStu } from "@/api/stuCQS/info-fill/sportTest"; import { getDicts } from "@/api/system/dict/data"; import { listDisciplinaryApplication } from "@/api/routine/disciplinaryApplication"; import { getOwnStuScoreMajorRank } from "@/api/comprehensive/biyeapply"; import { -listOwnScoreClassRank + listOwnScoreClassRank } from "@/api/stuCQS/good/apply"; import { listStu as listView, doEdit, doCancel, doReApply } from "@/api/comprehensive/knzzGlApply"; @@ -307,9 +307,9 @@ export default { applyV: false, sportScore: null, - getDicts:null, - getDicts: [], - penaltyStatusValue:null, + getDicts: null, + getDicts: [], + penaltyStatusValue: null, lookForm: {}, lookV: false, @@ -454,11 +454,11 @@ export default { } }, -/* applyVClick() { - this.fetchcjpm() - this.fetchSportScoreData() - this.fetchcfwjc() - }, */ + /* applyVClick() { + this.fetchcjpm() + this.fetchSportScoreData() + this.fetchcfwjc() + }, */ applyVClick() { this.checkAllConditions(); }, @@ -533,8 +533,8 @@ export default { }); loading.close(); let data = res.data[0]; - if (res.code === 200 && data&& data.stuMajorRank != null && data.majorCount != null) { - + if (res.code === 200 && data && data.stuMajorRank != null && data.majorCount != null) { + let stuRank = Math.round(Math.round(data.stuMajorRank / data.majorCount * 10000) / 100); if (stuRank <= 30) { return true; @@ -546,59 +546,59 @@ export default { this.$message.info("无法获取您的专业排名数据"); return false; }, -/* async fetchSportScoreData() { - const res = await listOwnSportScore() - if (res.code === 200 && res.data && res.data.length > 1) { - const sportScore = res.data[res.data.length - 1].sportScore; - if (sportScore >= 60) { + /* async fetchSportScoreData() { + const res = await listOwnSportScore() + if (res.code === 200 && res.data && res.data.length > 1) { + const sportScore = res.data[res.data.length - 1].sportScore; + if (sportScore >= 60) { + this.applyV = true; + } else { + this.applyV = false; + this.$message.info("您的体能成绩不达标"); + } + } else { + this.applyV = false; + this.$message.info("请先完成体能测试"); + } + }, + async fetchcfwjc() { + const response1 = await getDicts('rt_penalty_status'); + const response2 = await listDisciplinaryApplication(); + if (Array.isArray(response2.rows) && response2.rows.length === 1) { + this.penaltyStatusValue = response2.rows[0].penaltyStatus; + if (response1.data[0].dictSort === this.penaltyStatusValue) { + this.applyV = false; + this.$message.info("处分中"); + } else if (response1.data[1].dictSort === this.penaltyStatusValue) { this.applyV = true; + } else if (response1.data[2].dictSort === this.penaltyStatusValue) { + this.applyV = false; + this.$message.info("解除申请中"); + } else if (response1.data[3].dictSort === this.penaltyStatusValue) { + this.applyV = false; + this.$message.info("处分申请中"); } else { this.applyV = false; - this.$message.info("您的体能成绩不达标"); } } else { - this.applyV = false; - this.$message.info("请先完成体能测试"); + this.applyV = true; } - }, - async fetchcfwjc() { - const response1 = await getDicts('rt_penalty_status'); - const response2 = await listDisciplinaryApplication(); - if (Array.isArray(response2.rows) && response2.rows.length === 1) { - this.penaltyStatusValue = response2.rows[0].penaltyStatus; - if (response1.data[0].dictSort === this.penaltyStatusValue) { - this.applyV = false; - this.$message.info("处分中"); - } else if (response1.data[1].dictSort === this.penaltyStatusValue) { - this.applyV = true; - } else if (response1.data[2].dictSort === this.penaltyStatusValue) { - this.applyV = false; - this.$message.info("解除申请中"); - } else if (response1.data[3].dictSort === this.penaltyStatusValue) { - this.applyV = false; - this.$message.info("处分申请中"); - } else { - this.applyV = false; - } - } else { - this.applyV = true; - } - }, - async fetchcjpm() { - let loading = fullLoading(this); - let res = await getOwnStuScoreMajorRank(); - loading.close(); - if (res.code == 200) { - let data = res.data; - let stuRank = Math.round(Math.round(data.majorRank / data.majorCount * 10000) / 100); - if (stuRank > 30) { - this.applyV = false; - this.$message.error("您的学业成绩未达到专业前30%"); - } else { - this.applyV = true; - } - } - }, */ + }, + async fetchcjpm() { + let loading = fullLoading(this); + let res = await getOwnStuScoreMajorRank(); + loading.close(); + if (res.code == 200) { + let data = res.data; + let stuRank = Math.round(Math.round(data.majorRank / data.majorCount * 10000) / 100); + if (stuRank > 30) { + this.applyV = false; + this.$message.error("您的学业成绩未达到专业前30%"); + } else { + this.applyV = true; + } + } + }, */ lookVClick(row) { this.lookForm = {}; this.lookForm = { ...row };
+ style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:24.65pt">

     

+ style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:24.65pt">

家庭经济情况

+ style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:24.65pt">

学习成绩
+ style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:24.65pt">

申请理由

 -

- {{ formData.applyReason }} -

- 申请人签名： - - + style="line-height:15pt; margin:10pt 0pt 0pt; orphans:0; text-align:left; text-indent:2em; widows:0"> + + {{ formData.applyReason }} + +

+
+
+ 申请人签名： + 年 月 日 - -

+
+
+ style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:24.65pt">

班级评议意见

 -

{{ formData.fdyCmt }} -

- 辅导员（签名）： - -
- + style="line-height:15pt; margin:10pt 0pt 0pt; orphans:0; text-align:left; text-indent:2em; widows:0"> + {{ formData.fdyCmt }} +

+
+ +
+ + 辅导员（签名）： + + +
+ +
年 月 日 - -

+
+
@@ -419,13 +429,15 @@ style="font-family:仿宋; font-size:12pt"> 

 

-

同意推荐 + 同意推荐该同学申请国家励志奖学金。

+ style="font-family:仿宋; font-size:12pt">奖学金。 +

 

+ style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:24.65pt">

学校审核意见