代码格式修改
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<div class="app-container" v-loading.fullscreen.lock="fullLoading">
|
||||
<div v-loading.fullscreen.lock="fullLoading" class="app-container">
|
||||
|
||||
<el-dialog :visible.sync="lookMoreV">
|
||||
<MoreDetail></MoreDetail>
|
||||
<MoreDetail />
|
||||
</el-dialog>
|
||||
|
||||
<div class="sign">
|
||||
@@ -23,13 +23,14 @@
|
||||
参评学年各科平均学分绩为70分以上(含70分),平均学分绩班级排名前40%,学年综合素质测评班级排名前50%。
|
||||
</li>
|
||||
<li>
|
||||
<span @click="lookMore" style="text-decoration: underline;color: lightskyblue;cursor: pointer;">查看更多</span>
|
||||
<span style="text-decoration: underline;color: lightskyblue;cursor: pointer;" @click="lookMore">查看更多</span>
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
|
||||
<el-row :gutter="10" class="mb8" v-loading="loading_btn" element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0)" element-loading-text="正在校验资格.....">
|
||||
<el-row v-loading="loading_btn" :gutter="10" class="mb8" element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0)" element-loading-text="正在校验资格....."
|
||||
>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addVClick">
|
||||
提交申请
|
||||
@@ -44,7 +45,7 @@
|
||||
<!-- <el-table-column label="奖项代码" prop="typeCode" /> -->
|
||||
<el-table-column label="奖项" prop="typeName" />
|
||||
<el-table-column label="申请学年" prop="stuYearName" />
|
||||
<el-table-column label="申请时间" prop="applyTime"></el-table-column>
|
||||
<el-table-column label="申请时间" prop="applyTime" />
|
||||
<el-table-column label="申请状态">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.audius_detail_type" :value="scope.row.status" />
|
||||
@@ -55,16 +56,19 @@
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="mini" icon="el-icon-view" @click="lookVClick(scope.row)">查看详情</el-button>
|
||||
<el-button v-if="scope.row.status === '1'" type="text" size="mini" icon="el-icon-close"
|
||||
@click="cancelVClick(scope.row)">取消申请
|
||||
@click="cancelVClick(scope.row)"
|
||||
>取消申请
|
||||
</el-button>
|
||||
<el-button v-if="scope.row.status == '10'" type="text" size="mini" icon="el-icon-refresh"
|
||||
@click="refreshVClick(scope.row)">重新提交</el-button>
|
||||
@click="refreshVClick(scope.row)"
|
||||
>重新提交</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
||||
@pagination="getList" />
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
|
||||
<el-dialog title="申请优秀学生干部" :visible.sync="addV" width="600px" :top="'0'">
|
||||
@@ -79,13 +83,13 @@
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="政治面貌">
|
||||
<el-input size="mini" class="addForm-input" v-model="addForm.zzmm"
|
||||
placeholder="请输入政治面貌(例如:群众、共青团员)"></el-input>
|
||||
<el-input v-model="addForm.zzmm" size="mini" class="addForm-input"
|
||||
placeholder="请输入政治面貌(例如:群众、共青团员)"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="第二课堂学分认定">
|
||||
<el-select size="mini" v-model="addForm.classtwoSure" placeholder="第二学分成绩认定">
|
||||
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
|
||||
</el-option>
|
||||
<el-select v-model="addForm.classtwoSure" size="mini" placeholder="第二学分成绩认定">
|
||||
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="青年大学习学习率">
|
||||
@@ -93,16 +97,17 @@
|
||||
placeholder="请输入青年大学学习率,单位为%"></el-input>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="职务">
|
||||
<el-input size="mini" class="addForm-input" v-model="addForm.classPost" placeholder="请输入职务(例如:班长,没有填 无)">
|
||||
</el-input>
|
||||
<el-input v-model="addForm.classPost" size="mini" class="addForm-input" placeholder="请输入职务(例如:班长,没有填 无)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="获奖情况">
|
||||
<el-input type="textarea" :maxlength="1000" :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input"
|
||||
v-model="addForm.goodHis" placeholder="请输入获奖情况"></el-input>
|
||||
<el-input v-model="addForm.goodHis" type="textarea" :maxlength="1000" :autosize="{ minRows: 10, maxRows: 10 }"
|
||||
class="addForm-input" placeholder="请输入获奖情况"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="主要事迹">
|
||||
<el-input type="textarea" :maxlength="1000" :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input"
|
||||
v-model="addForm.mainHis" placeholder="请输入主要事迹,字数100字以上"></el-input>
|
||||
<el-input v-model="addForm.mainHis" type="textarea" :maxlength="1000" :autosize="{ minRows: 10, maxRows: 10 }"
|
||||
class="addForm-input" placeholder="请输入主要事迹,字数100字以上"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="">
|
||||
<el-button type="primary" size="mini" @click="doApply">提交申请</el-button>
|
||||
@@ -140,7 +145,7 @@
|
||||
</el-table>
|
||||
|
||||
|
||||
<el-table :data="course_list" v-loading="course_loading">
|
||||
<el-table v-loading="course_loading" :data="course_list">
|
||||
<el-table-column label="学期" prop="termName" align="center" />
|
||||
<el-table-column label="课程" prop="courseName" align="center" />
|
||||
<el-table-column label="成绩" prop="courseScore" align="center" />
|
||||
@@ -151,13 +156,14 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination v-show="courseTotal > 0" :total="courseTotal" :page.sync="courseParams.pageNum"
|
||||
:limit.sync="courseParams.pageSize" @pagination="listOwnCourseScore" />
|
||||
:limit.sync="courseParams.pageSize" @pagination="listOwnCourseScore"
|
||||
/>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
<el-dialog :visible.sync="lookV" title="查看详情" fullscreen>
|
||||
<el-steps :active="getStep(lookForm)">
|
||||
<el-step title="学生提交申请" description=""></el-step>
|
||||
<el-step title="学生提交申请" description="" />
|
||||
|
||||
<el-step title="辅导员审核" :status="isEmpty(lookForm.fdyComment) ? 'wait' : getStepStatus(lookForm.fdyComment)">
|
||||
<template slot="description">
|
||||
@@ -201,21 +207,23 @@
|
||||
</template>
|
||||
</el-step>
|
||||
</el-steps>
|
||||
<hr />
|
||||
<hr>
|
||||
<el-form label-width="160px">
|
||||
<el-form-item label="政治面貌">
|
||||
<el-input size="mini" class="addForm-input" v-model="lookForm.zzmm" readonly></el-input>
|
||||
<el-input v-model="lookForm.zzmm" size="mini" class="addForm-input" readonly />
|
||||
</el-form-item>
|
||||
<el-form-item label="职务">
|
||||
<el-input size="mini" class="addForm-input" v-model="lookForm.classPost" readonly></el-input>
|
||||
<el-input v-model="lookForm.classPost" size="mini" class="addForm-input" readonly />
|
||||
</el-form-item>
|
||||
<el-form-item label="获奖情况">
|
||||
<el-input type="textarea" :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input"
|
||||
v-model="lookForm.goodHis" readonly></el-input>
|
||||
<el-input v-model="lookForm.goodHis" type="textarea" :autosize="{ minRows: 10, maxRows: 10 }"
|
||||
class="addForm-input" readonly
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="主要事迹">
|
||||
<el-input type="textarea" :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input"
|
||||
v-model="lookForm.mainHis" readonly></el-input>
|
||||
<el-input v-model="lookForm.mainHis" type="textarea" :autosize="{ minRows: 10, maxRows: 10 }"
|
||||
class="addForm-input" readonly
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-dialog>
|
||||
@@ -226,13 +234,13 @@
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="政治面貌">
|
||||
<el-input size="mini" class="addForm-input" v-model="refreshForm.zzmm"
|
||||
placeholder="请输入政治面貌(例如:群众、共青团员)"></el-input>
|
||||
<el-input v-model="refreshForm.zzmm" size="mini" class="addForm-input"
|
||||
placeholder="请输入政治面貌(例如:群众、共青团员)"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="第二课堂学分认定">
|
||||
<el-select size="mini" v-model="refreshForm.classtwoSure" placeholder="第二学分成绩认定">
|
||||
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
|
||||
</el-option>
|
||||
<el-select v-model="refreshForm.classtwoSure" size="mini" placeholder="第二学分成绩认定">
|
||||
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="青年大学习学习率">
|
||||
@@ -240,16 +248,19 @@
|
||||
placeholder="请输入青年大学学习率,单位为%"></el-input>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="职务">
|
||||
<el-input size="mini" class="addForm-input" v-model="refreshForm.classPost"
|
||||
placeholder="请输入职务(例如:班长,没有填 无)"></el-input>
|
||||
<el-input v-model="refreshForm.classPost" size="mini" class="addForm-input"
|
||||
placeholder="请输入职务(例如:班长,没有填 无)"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="获奖情况">
|
||||
<el-input type="textarea" :maxlength="1000" :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input"
|
||||
v-model="refreshForm.goodHis" placeholder="请输入获奖情况"></el-input>
|
||||
<el-input v-model="refreshForm.goodHis" type="textarea" :maxlength="1000" :autosize="{ minRows: 10, maxRows: 10 }"
|
||||
class="addForm-input" placeholder="请输入获奖情况"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="主要事迹">
|
||||
<el-input type="textarea" :maxlength="1000" :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input"
|
||||
v-model="refreshForm.mainHis" placeholder="请输入主要事迹,字数100字以上"></el-input>
|
||||
<el-input v-model="refreshForm.mainHis" type="textarea" :maxlength="1000" :autosize="{ minRows: 10, maxRows: 10 }"
|
||||
class="addForm-input" placeholder="请输入主要事迹,字数100字以上"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="">
|
||||
<el-button type="primary" size="mini" @click="reApply">提交申请</el-button>
|
||||
@@ -272,8 +283,8 @@ import {
|
||||
|
||||
import {
|
||||
isEmpty
|
||||
} from '@/api/helpFunc';
|
||||
import lodash from 'lodash';
|
||||
} from '@/api/helpFunc'
|
||||
import lodash from 'lodash'
|
||||
import {
|
||||
listXyjxjCanType, listTermByYear, applyXyjxj, listOwnXyjxjApply, listOwnScoreClassRank
|
||||
, listOwnYearCourseScore, countOwnPass, countOwnIam, getOwnPassCountByCode, getOwnIamCountByCode
|
||||
@@ -284,7 +295,7 @@ import MoreDetail from '@/views/stuCQS/good/MoreDetail.vue'
|
||||
import { verifyApplyYXGB, reApplyYXG } from '@/api/stuCQS/good/MeritStudentCadres'
|
||||
|
||||
export default {
|
||||
name: 'xyjxy-apply',
|
||||
name: 'XyjxyApply',
|
||||
dicts: ['audius_detail_type'],
|
||||
components: {
|
||||
MoreDetail
|
||||
@@ -299,17 +310,17 @@ export default {
|
||||
addV: false,
|
||||
addForm: {
|
||||
applyId: null,
|
||||
bornTime: "",
|
||||
classTwoSure: "",
|
||||
classPost: "",
|
||||
goodHis: "",
|
||||
mainHis: "",
|
||||
material: "",
|
||||
typeCode: "YXXSGB",
|
||||
bornTime: '',
|
||||
classTwoSure: '',
|
||||
classPost: '',
|
||||
goodHis: '',
|
||||
mainHis: '',
|
||||
material: '',
|
||||
typeCode: 'YXXSGB',
|
||||
// youthPercent: "",
|
||||
zzmm: ""
|
||||
zzmm: ''
|
||||
},
|
||||
stuYearId: "",
|
||||
stuYearId: '',
|
||||
term_list: [],
|
||||
fullLoading: false,
|
||||
|
||||
@@ -365,69 +376,69 @@ export default {
|
||||
methods: {
|
||||
getStepStatus(data) {
|
||||
if ((data.includes('同意') && !data.includes('不同意')) || data.includes('通过') || (data.includes('符合') && !data.includes('不符合'))) {
|
||||
return 'success';
|
||||
return 'success'
|
||||
} else {
|
||||
return 'error';
|
||||
return 'error'
|
||||
}
|
||||
},
|
||||
getStep(data) {
|
||||
if (!isEmpty(data.finalComment)) {
|
||||
return 4;
|
||||
return 4
|
||||
} else if (!isEmpty(data.deptComment)) {
|
||||
return 3;
|
||||
return 3
|
||||
} else if (!isEmpty(data.fdyComment)) {
|
||||
return 2;
|
||||
return 2
|
||||
} else {
|
||||
return 1;
|
||||
return 1
|
||||
}
|
||||
},
|
||||
async reApply() {
|
||||
let sdata = { ...this.refreshForm };
|
||||
let sdata = { ...this.refreshForm }
|
||||
if (isEmpty(sdata.zzmm)) {
|
||||
this.$message.info("请填写政治面貌");
|
||||
return;
|
||||
this.$message.info('请填写政治面貌')
|
||||
return
|
||||
}
|
||||
if (isEmpty(sdata.classPost)) {
|
||||
this.$message.info("请填写职务");
|
||||
return;
|
||||
this.$message.info('请填写职务')
|
||||
return
|
||||
}
|
||||
// if (isEmpty(sdata.youthPercent)) {
|
||||
// this.$message.info("请填写青年大学习学习率");
|
||||
// return;
|
||||
// }
|
||||
if (isEmpty(sdata.classtwoSure)) {
|
||||
this.$message.info("请填写第二课堂学分认定");
|
||||
return;
|
||||
this.$message.info('请填写第二课堂学分认定')
|
||||
return
|
||||
}
|
||||
|
||||
if (isEmpty(sdata.goodHis)) {
|
||||
this.$message.info("请填写获奖记录");
|
||||
return;
|
||||
this.$message.info('请填写获奖记录')
|
||||
return
|
||||
}
|
||||
if (isEmpty(sdata.mainHis)) {
|
||||
this.$message.info("请填写主要事迹");
|
||||
return;
|
||||
this.$message.info('请填写主要事迹')
|
||||
return
|
||||
}
|
||||
if (sdata.mainHis.length < 100) {
|
||||
this.$message.info("主要事迹字数需要100字以上");
|
||||
return;
|
||||
this.$message.info('主要事迹字数需要100字以上')
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
this.fullLoading = true;
|
||||
sdata.applyId = sdata.id;
|
||||
let res = await reApplyYXG(sdata);
|
||||
this.fullLoading = false;
|
||||
this.fullLoading = true
|
||||
sdata.applyId = sdata.id
|
||||
let res = await reApplyYXG(sdata)
|
||||
this.fullLoading = false
|
||||
if (res.code == 200) {
|
||||
this.refreshV = false;
|
||||
this.resetAddForm();
|
||||
this.$message.success(res.msg);
|
||||
this.getList();
|
||||
this.refreshV = false
|
||||
this.resetAddForm()
|
||||
this.$message.success(res.msg)
|
||||
this.getList()
|
||||
}
|
||||
},
|
||||
refreshVClick(v) {
|
||||
this.refreshForm = { ...v };
|
||||
this.refreshV = true;
|
||||
this.refreshForm = { ...v }
|
||||
this.refreshV = true
|
||||
},
|
||||
lookMore() {
|
||||
this.lookMoreV = true
|
||||
@@ -446,21 +457,21 @@ export default {
|
||||
let sdata = {
|
||||
id: id,
|
||||
reason: value
|
||||
};
|
||||
this.fullLoading = true;
|
||||
let res = await cancelOwnApply(sdata);
|
||||
this.fullLoading = false;
|
||||
}
|
||||
this.fullLoading = true
|
||||
let res = await cancelOwnApply(sdata)
|
||||
this.fullLoading = false
|
||||
if (res.code == 200) {
|
||||
this.$message.success(res.msg);
|
||||
this.getList();
|
||||
this.$message.success(res.msg)
|
||||
this.getList()
|
||||
}
|
||||
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '取消输入'
|
||||
});
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
}
|
||||
}
|
||||
@@ -556,7 +567,7 @@ export default {
|
||||
this.countOwnPass()
|
||||
this.listOwnScoreClassRank()
|
||||
this.listOwnCourseScore()
|
||||
console.log("aa")
|
||||
console.log('aa')
|
||||
} else {
|
||||
verifyApplyYXGB().then(res => {
|
||||
if (res.code !== 200) {
|
||||
@@ -577,7 +588,7 @@ export default {
|
||||
async doApply() {
|
||||
let sdata = lodash.cloneDeep(this.addForm)
|
||||
// 将 stuYearId 添加到 sdata 对象中
|
||||
sdata.stuYearId = this.stuYearId;
|
||||
sdata.stuYearId = this.stuYearId
|
||||
console.log(sdata)
|
||||
if (isEmpty(sdata.zzmm)) {
|
||||
this.$message.info('请填写政治面貌')
|
||||
@@ -614,7 +625,7 @@ export default {
|
||||
|
||||
this.fullLoading = true
|
||||
console.log(sdata)
|
||||
let res = await addApplyYxgb(sdata);
|
||||
let res = await addApplyYxgb(sdata)
|
||||
console.log(res)
|
||||
this.fullLoading = false
|
||||
if (res.code === 200) {
|
||||
|
||||
Reference in New Issue
Block a user