提交 319a6c34 编写于 作者: 符英鹏's avatar 符英鹏 🏀

feat:'单项得分修改'

上级 3851538e
流水线 #5855 已通过 ,包含阶段
in 26 second
.title[data-v-d3e4f54c]{text-align:center}.row-title[data-v-d3e4f54c]{display:flex;margin-bottom:20px}.add-btn[data-v-d3e4f54c]{display:flex;justify-content:center}[data-v-d3e4f54c] .ivu-tag-text{font-size:16px}
\ No newline at end of file
.title[data-v-1813b8bd]{text-align:center}.row-title[data-v-1813b8bd]{display:flex;margin-bottom:20px}.add-btn[data-v-1813b8bd]{display:flex;justify-content:center}[data-v-1813b8bd] .ivu-tag-text{font-size:16px}
\ No newline at end of file
.title[data-v-7cb7f6cc]{text-align:center}.row-title[data-v-7cb7f6cc]{display:flex;margin-bottom:20px}.add-btn[data-v-7cb7f6cc]{display:flex;justify-content:center}.cell-row[data-v-7cb7f6cc]{margin-bottom:10px}[data-v-7cb7f6cc] .ivu-tag-text{font-size:16px}
\ No newline at end of file
.title[data-v-2b5aaf0e]{text-align:center}.row-title[data-v-2b5aaf0e]{display:flex;margin-bottom:20px}.add-btn[data-v-2b5aaf0e]{display:flex;justify-content:center}[data-v-2b5aaf0e] .ivu-tag-text{font-size:16px}
\ No newline at end of file
.title[data-v-7d66b5e1]{text-align:center}.row-title[data-v-7d66b5e1]{display:flex;margin-bottom:20px}.add-btn[data-v-7d66b5e1]{display:flex;justify-content:center}[data-v-7d66b5e1] .ivu-tag-text{font-size:16px}
\ No newline at end of file
.title[data-v-ce5c7412]{text-align:center}.row-title[data-v-ce5c7412]{display:flex;margin-bottom:20px}.add-btn[data-v-ce5c7412]{display:flex;justify-content:center}.cell-row[data-v-ce5c7412]{margin-bottom:10px}[data-v-ce5c7412] .ivu-tag-text{font-size:16px}
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>iView Admin Pro</title><link href=css/app.5ea00409.css rel=stylesheet></head><body><noscript><strong>请开启 JavaScript 功能来使用 iView Admin Pro。</strong></noscript><div id=app></div><script src=js/chunk-vendors.35c4ce0a.js></script><script src=js/app.317e0c82.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>iView Admin Pro</title><link href=css/app.5ea00409.css rel=stylesheet></head><body><noscript><strong>请开启 JavaScript 功能来使用 iView Admin Pro。</strong></noscript><div id=app></div><script src=js/chunk-vendors.35c4ce0a.js></script><script src=js/app.5993dec5.js></script></body></html>
\ No newline at end of file \ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-03460c75"],{"736d":function(t,e,a){"use strict";a.r(e);var n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",[a("Card",{attrs:{bordered:!1}},[a("Select",{staticStyle:{width:"200px","margin-right":"15px"},model:{value:t.selectYear,callback:function(e){t.selectYear=e},expression:"selectYear"}},t._l(t.yearList,(function(e){return a("Option",{key:e.value,attrs:{value:e.value}},[t._v(t._s(e.label))])})),1),a("Button",{staticStyle:{"margin-right":"15px"},attrs:{type:"primary"},on:{click:t.getData}},[t._v("查询")]),a("Dropdown",{staticStyle:{"margin-left":"20px"}},[a("Button",{attrs:{type:"primary"}},[t._v("\n 奖学金申请\n "),a("Icon",{attrs:{type:"ios-arrow-down"}})],1),a("DropdownMenu",{attrs:{slot:"list"},slot:"list"},[a("DropdownItem",{attrs:{disabled:-1==t.projectList.indexOf("国家奖学金")},nativeOn:{click:function(e){return t.handleAdd("国家奖学金")}}},[t._v("国家奖学金")]),a("DropdownItem",{attrs:{disabled:-1==t.projectList.indexOf("国家励志奖学金")},nativeOn:{click:function(e){return t.handleAdd("国家励志奖学金")}}},[t._v("国家励志奖学金")])],1)],1),a("Table",{ref:"table",staticClass:"ivu-mt",attrs:{columns:t.columns,data:t.tableData,loading:t.loading},scopedSlots:t._u([{key:"applyforStatus",fn:function(e){var n=e.row;return["审核中"==n.applyforStatus?a("Tag",{attrs:{color:"warning"}},[t._v("审核中")]):t._e(),"已审核"==n.applyforStatus?a("Tag",{attrs:{color:"success"}},[t._v("已审核")]):t._e(),"已拒绝"==n.applyforStatus?a("Tag",{attrs:{color:"error"}},[t._v("已拒绝")]):t._e()]}},{key:"action",fn:function(e){var n=e.row;return[a("div",{on:{click:function(t){t.stopPropagation(),t.preventDefault()}}},[a("a",{attrs:{type:"text"},on:{click:function(e){return t.handleCheck(n.id)}}},[t._v("查看详情")])])]}}])}),a("Page",{staticClass:"ivu-mt",attrs:{total:t.total,"show-total":"","show-elevator":"","show-sizer":"","class-name":"pagenation",current:t.pageIndex,"page-size":t.pageSize,"page-size-opts":[10,20,50]},on:{"on-change":t.handleCurrentChange,"on-page-size-change":t.handleSizeChange}})],1)],1)},r=[],o=a("c9ee"),i={data:function(){return{columns:[],tableData:[],totalData:[],loading:!1,yearList:[],selectYear:"",projectList:[],selectPro:"",total:0,pageIndex:1,pageSize:10}},created:function(){this.GetCanApplyForItemByNowYear(),this.StudentGetAllApplyForYear()},methods:{GetCanApplyForItemByNowYear:function(){var t=this;o["a"]().then((function(e){t.projectList=e}))},getData:function(){var t=this,e={year:this.selectYear};this.loading=!0,o["g"](e).then((function(e){t.loading=!1,t.columns.length<=0&&(t.columns=[{type:"index",width:80,align:"center",title:"序号"}],Object.assign(t.columns,e.titlelist),t.columns.push({title:"操作",slot:"action"})),t.totalData=e.tableData,t.total=e.tableData.length,t.setCurrentPageData()}))},StudentGetAllApplyForYear:function(){var t=this;o["e"]().then((function(e){e.length>0&&(t.selectYear=e[0]),e.map((function(e){t.yearList.push({label:e,value:e})})),t.getData()}))},handleCurrentChange:function(t){this.pageIndex=t,this.setCurrentPageData()},handleSizeChange:function(t){this.pageSize=t,this.setCurrentPageData()},setCurrentPageData:function(t){var e=t||this.totalData,a=(this.pageIndex-1)*this.pageSize,n=this.pageIndex*this.pageSize;this.tableData=e.slice(a,n)},handleAdd:function(t){"国家奖学金"==t&&-1==this.projectList.indexOf("国家奖学金")||"国家励志奖学金"==t&&-1==this.projectList.indexOf("国家励志奖学金")||(window.sessionStorage.setItem("project",t),this.$router.push("/applyform"))},handleCheck:function(t){this.$router.push({name:"detail",params:{id:t}})}}},l=i,s=a("4ac2"),c=Object(s["a"])(l,n,r,!1,null,"91d42cc8",null);e["default"]=c.exports},c9ee:function(t,e,a){"use strict";a.d(e,"c",(function(){return r})),a.d(e,"a",(function(){return o})),a.d(e,"b",(function(){return i})),a.d(e,"g",(function(){return l})),a.d(e,"f",(function(){return s})),a.d(e,"e",(function(){return c})),a.d(e,"d",(function(){return u}));var n=a("b6bd");function r(t){return Object(n["a"])({url:"/api/ApplyFor/GetStudentInfoByCard",method:"get",params:t})}function o(t){return Object(n["a"])({url:"/api/ApplyFor/GetCanApplyForItemByNowYear",method:"get",params:t})}function i(t){return Object(n["a"])({url:"/api/ApplyFor/GetScoreInfoByCardAndYear",method:"get",params:t})}function l(t){return Object(n["a"])({url:"/api/ApplyFor/StudentGetApplyForListByYear",method:"get",params:t})}function s(t){return Object(n["a"])({url:"/api/ApplyFor/StudentGetApplyForInfoByID",method:"get",params:t})}function c(t){return Object(n["a"])({url:"/api/ApplyFor/StudentGetAllApplyForYear",method:"get",params:t})}function u(t){return Object(n["a"])({url:"/api/ApplyFor/StudentApplyForSchoolShip",method:"post",data:t})}}}]); (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-03460c75"],{"736d":function(t,e,a){"use strict";a.r(e);var n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",[a("Card",{attrs:{bordered:!1}},[a("Select",{staticStyle:{width:"200px","margin-right":"15px"},model:{value:t.selectYear,callback:function(e){t.selectYear=e},expression:"selectYear"}},t._l(t.yearList,(function(e){return a("Option",{key:e.value,attrs:{value:e.value}},[t._v(t._s(e.label))])})),1),a("Button",{staticStyle:{"margin-right":"15px"},attrs:{type:"primary"},on:{click:t.getData}},[t._v("查询")]),a("Dropdown",{staticStyle:{"margin-left":"20px"}},[a("Button",{attrs:{type:"primary"}},[t._v("\n 奖学金申请\n "),a("Icon",{attrs:{type:"ios-arrow-down"}})],1),a("DropdownMenu",{attrs:{slot:"list"},slot:"list"},[a("DropdownItem",{attrs:{disabled:-1==t.projectList.indexOf("国家奖学金")},nativeOn:{click:function(e){return t.handleAdd("国家奖学金")}}},[t._v("国家奖学金")]),a("DropdownItem",{attrs:{disabled:-1==t.projectList.indexOf("国家励志奖学金")},nativeOn:{click:function(e){return t.handleAdd("国家励志奖学金")}}},[t._v("国家励志奖学金")])],1)],1),a("Table",{ref:"table",staticClass:"ivu-mt",attrs:{columns:t.columns,data:t.tableData,loading:t.loading},scopedSlots:t._u([{key:"applyforStatus",fn:function(e){var n=e.row;return["审核中"==n.applyforStatus?a("Tag",{attrs:{color:"warning"}},[t._v("审核中")]):t._e(),"已审核"==n.applyforStatus?a("Tag",{attrs:{color:"success"}},[t._v("已审核")]):t._e(),"已拒绝"==n.applyforStatus?a("Tag",{attrs:{color:"error"}},[t._v("已拒绝")]):t._e()]}},{key:"action",fn:function(e){var n=e.row;return[a("div",{on:{click:function(t){t.stopPropagation(),t.preventDefault()}}},[a("a",{attrs:{type:"text"},on:{click:function(e){return t.handleCheck(n.id)}}},[t._v("查看详情")])])]}}])}),a("Page",{staticClass:"ivu-mt",attrs:{total:t.total,"show-total":"","show-elevator":"","show-sizer":"","class-name":"pagenation",current:t.pageIndex,"page-size":t.pageSize,"page-size-opts":[10,20,50]},on:{"on-change":t.handleCurrentChange,"on-page-size-change":t.handleSizeChange}})],1)],1)},r=[],o=a("c9ee"),i={data:function(){return{columns:[],tableData:[],totalData:[],loading:!1,yearList:[],selectYear:"",projectList:[],selectPro:"",total:0,pageIndex:1,pageSize:10}},created:function(){this.GetCanApplyForItemByNowYear(),this.StudentGetAllApplyForYear()},methods:{GetCanApplyForItemByNowYear:function(){var t=this;o["a"]().then((function(e){t.projectList=e}))},getData:function(){var t=this,e={year:this.selectYear};this.loading=!0,o["h"](e).then((function(e){t.loading=!1,t.columns.length<=0&&(t.columns=[{type:"index",width:80,align:"center",title:"序号"}],Object.assign(t.columns,e.titlelist),t.columns.push({title:"操作",slot:"action"})),t.totalData=e.tableData,t.total=e.tableData.length,t.setCurrentPageData()}))},StudentGetAllApplyForYear:function(){var t=this;o["f"]().then((function(e){e.length>0&&(t.selectYear=e[0]),e.map((function(e){t.yearList.push({label:e,value:e})})),t.getData()}))},handleCurrentChange:function(t){this.pageIndex=t,this.setCurrentPageData()},handleSizeChange:function(t){this.pageSize=t,this.setCurrentPageData()},setCurrentPageData:function(t){var e=t||this.totalData,a=(this.pageIndex-1)*this.pageSize,n=this.pageIndex*this.pageSize;this.tableData=e.slice(a,n)},handleAdd:function(t){"国家奖学金"==t&&-1==this.projectList.indexOf("国家奖学金")||"国家励志奖学金"==t&&-1==this.projectList.indexOf("国家励志奖学金")||(window.sessionStorage.setItem("project",t),this.$router.push("/applyform"))},handleCheck:function(t){this.$router.push({name:"detail",params:{id:t}})}}},l=i,s=a("4ac2"),u=Object(s["a"])(l,n,r,!1,null,"91d42cc8",null);e["default"]=u.exports},c9ee:function(t,e,a){"use strict";a.d(e,"d",(function(){return r})),a.d(e,"a",(function(){return o})),a.d(e,"c",(function(){return i})),a.d(e,"h",(function(){return l})),a.d(e,"g",(function(){return s})),a.d(e,"f",(function(){return u})),a.d(e,"e",(function(){return c})),a.d(e,"b",(function(){return p}));var n=a("b6bd");function r(t){return Object(n["a"])({url:"/api/ApplyFor/GetStudentInfoByCard",method:"get",params:t})}function o(t){return Object(n["a"])({url:"/api/ApplyFor/GetCanApplyForItemByNowYear",method:"get",params:t})}function i(t){return Object(n["a"])({url:"/api/ApplyFor/GetScoreInfoByCardAndYear",method:"get",params:t})}function l(t){return Object(n["a"])({url:"/api/ApplyFor/StudentGetApplyForListByYear",method:"get",params:t})}function s(t){return Object(n["a"])({url:"/api/ApplyFor/StudentGetApplyForInfoByID",method:"get",params:t})}function u(t){return Object(n["a"])({url:"/api/ApplyFor/StudentGetAllApplyForYear",method:"get",params:t})}function c(t){return Object(n["a"])({url:"/api/ApplyFor/StudentApplyForSchoolShip",method:"post",data:t})}function p(t){return Object(n["a"])({url:"/api/ApplyFor/GetColumnInfoByItemName",method:"get",params:t})}}}]);
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -58,3 +58,11 @@ export function StudentApplyForSchoolShip(data) { ...@@ -58,3 +58,11 @@ export function StudentApplyForSchoolShip(data) {
data: data data: data
}); });
} }
// 根据项目名称获取栏目信息
export function GetColumnInfoByItemName(data) {
return request({
url: '/api/ApplyFor/GetColumnInfoByItemName',
method: 'get',
params: data
});
}
此差异已折叠。
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
<Description term="专业年级年度最高学分绩点和:">{{ <Description term="专业年级年度最高学分绩点和:">{{
detailData.scoremaxsumYearMajor detailData.scoremaxsumYearMajor
}}</Description> }}</Description>
<Description term="学习成绩评分:">{{
detailData.studyScore
}}</Description>
</DescriptionList> </DescriptionList>
</Card> </Card>
...@@ -28,8 +31,8 @@ ...@@ -28,8 +31,8 @@
<Row style="text-align: left; flex: 1" :gutter="20"> <Row style="text-align: left; flex: 1" :gutter="20">
<Col :span="2"> <Tag type="border" size="large" color="primary">序号</Tag></Col> <Col :span="2"> <Tag type="border" size="large" color="primary">序号</Tag></Col>
<Col :span="15"><Tag type="border" size="large" color="primary">加分项目(学生竞赛获奖、发表论文及发明专利)</Tag></Col> <Col :span="13"><Tag type="border" size="large" color="primary">加分项目(学生竞赛获奖、发表论文及发明专利)</Tag></Col>
<Col :span="6" offset="1"><Tag type="border" size="large" color="primary">单项得分</Tag></Col> <Col :span="8" offset="1"><Tag type="border" size="large" color="primary">单项得分</Tag></Col>
</Row> </Row>
</div> </div>
...@@ -42,18 +45,18 @@ ...@@ -42,18 +45,18 @@
<Col :span="2"> <Col :span="2">
{{ item.sort }} {{ item.sort }}
</Col> </Col>
<Col :span="15"> <Col :span="13">
{{ item.itemName }} {{ item.itemName }}
</Col> </Col>
<Col :span="6" offset="1"> <Col :span="8" offset="1">
{{ item.score }} <Cascader :data="innovationTree" v-model="item.columnId" disabled></Cascader>
</Col> </Col>
</Row> </Row>
<Divider dashed /> <Divider dashed />
<Row type="flex" justify="space-between" v-font="16" :gutter="20"> <Row type="flex" justify="space-between" v-font="16" :gutter="20">
<Col :span="13">审核状态:{{ detailData.innovationAuditStatus }}</Col> <Col :span="13">审核状态:{{ detailData.innovationAuditStatus }}</Col>
<Col :span="6">小计:{{innovationTotal}}分</Col> <Col :span="8">小计:{{innovationTotal}}分</Col>
</Row> </Row>
</Card> </Card>
...@@ -64,8 +67,8 @@ ...@@ -64,8 +67,8 @@
<div class="row-title" v-font="16"> <div class="row-title" v-font="16">
<Row style="text-align: left; flex: 1" :gutter="20"> <Row style="text-align: left; flex: 1" :gutter="20">
<Col :span="2"> <Tag type="border" size="large" color="primary">序号</Tag></Col> <Col :span="2"> <Tag type="border" size="large" color="primary">序号</Tag></Col>
<Col :span="15"><Tag type="border" size="large" color="primary">加分项目(校内外社会实践及志愿服务)</Tag></Col> <Col :span="13"><Tag type="border" size="large" color="primary">加分项目(校内外社会实践及志愿服务)</Tag></Col>
<Col :span="6" offset="1"><Tag type="border" size="large" color="primary">单项得分</Tag></Col> <Col :span="8" offset="1"><Tag type="border" size="large" color="primary">单项得分</Tag></Col>
</Row> </Row>
</div> </div>
...@@ -78,11 +81,11 @@ ...@@ -78,11 +81,11 @@
<Col :span="2"> <Col :span="2">
{{ item.sort }} {{ item.sort }}
</Col> </Col>
<Col :span="15"> <Col :span="13">
{{ item.itemName }} {{ item.itemName }}
</Col> </Col>
<Col :span="6" offset="1"> <Col :span="8" offset="1">
{{ item.score }} <Cascader :data="praticeTree" v-model="item.columnId" disabled></Cascader>
</Col> </Col>
</Row> </Row>
...@@ -91,7 +94,7 @@ ...@@ -91,7 +94,7 @@
<Col :span="13" <Col :span="13"
>审核状态:{{ detailData.socialpracticeAuditStatus }}</Col >审核状态:{{ detailData.socialpracticeAuditStatus }}</Col
> >
<Col :span="6">小计:{{socialTotal}}分</Col> <Col :span="8">小计:{{socialTotal}}分</Col>
</Row> </Row>
</Card> </Card>
...@@ -103,7 +106,7 @@ ...@@ -103,7 +106,7 @@
<Row style="text-align: left; flex: 1" :gutter="20"> <Row style="text-align: left; flex: 1" :gutter="20">
<Col :span="2"> <Tag type="border" size="large" color="primary">序号</Tag></Col> <Col :span="2"> <Tag type="border" size="large" color="primary">序号</Tag></Col>
<Col :span="15"> <Tag type="border" size="large" color="primary">加分项目(学生获得各级表彰情况)</Tag></Col> <Col :span="13"> <Tag type="border" size="large" color="primary">加分项目(学生获得各级表彰情况)</Tag></Col>
<Col :span="6" offset="1"><Tag type="border" size="large" color="primary">单项得分</Tag></Col> <Col :span="6" offset="1"><Tag type="border" size="large" color="primary">单项得分</Tag></Col>
</Row> </Row>
</div> </div>
...@@ -117,18 +120,18 @@ ...@@ -117,18 +120,18 @@
<Col :span="2"> <Col :span="2">
{{ item.sort }} {{ item.sort }}
</Col> </Col>
<Col :span="15"> <Col :span="13">
{{ item.itemName }} {{ item.itemName }}
</Col> </Col>
<Col :span="6" offset="1"> <Col :span="8" offset="1">
{{ item.score }} <Cascader :data="comprehensiveTree" v-model="item.columnId" disabled></Cascader>
</Col> </Col>
</Row> </Row>
<Divider dashed /> <Divider dashed />
<Row type="flex" justify="space-between" v-font="16" :gutter="20"> <Row type="flex" justify="space-between" v-font="16" :gutter="20">
<Col :span="13">审核状态:{{ detailData.qualityAuditStatus }}</Col> <Col :span="13">审核状态:{{ detailData.qualityAuditStatus }}</Col>
<Col :span="6">小计:{{comprehensiveTotal}}分</Col> <Col :span="8">小计:{{comprehensiveTotal}}分</Col>
</Row> </Row>
</Card> </Card>
...@@ -138,7 +141,7 @@ ...@@ -138,7 +141,7 @@
<script> <script>
import * as api from "@/api/apply"; import * as api from "@/api/apply";
import { mapState, mapActions } from 'vuex'; import { mapState } from 'vuex';
export default { export default {
...@@ -158,6 +161,9 @@ export default { ...@@ -158,6 +161,9 @@ export default {
socialPracticeTables: [], socialPracticeTables: [],
comprehensiveQualityTables: [], comprehensiveQualityTables: [],
currentYear:new Date().getFullYear() - 1, currentYear:new Date().getFullYear() - 1,
innovationTree:[],
praticeTree:[],
comprehensiveTree:[],
}; };
}, },
...@@ -189,6 +195,7 @@ export default { ...@@ -189,6 +195,7 @@ export default {
}, },
created() { created() {
this.getData(); this.getData();
this.GetColumnInfoByItemName();
}, },
...@@ -197,9 +204,29 @@ export default { ...@@ -197,9 +204,29 @@ export default {
const { id } = this.$route.params; const { id } = this.$route.params;
api.StudentGetApplyForInfoByID({ id }).then((resp) => { api.StudentGetApplyForInfoByID({ id }).then((resp) => {
this.detailData = resp; this.detailData = resp;
this.innovationAbilityTables = resp.innovationAbilityTables; this.innovationAbilityTables = resp.innovationAbilityTables
this.socialPracticeTables = resp.socialPracticeTables; this.innovationAbilityTables.map(item => {
this.comprehensiveQualityTables = resp.comprehensiveQualityTables; item.columnId = item.columnId.split(',')
});
this.socialPracticeTables = resp.socialPracticeTables
this.socialPracticeTables.map(item => {
item.columnId = item.columnId.split(',')
});
this.comprehensiveQualityTables = resp.comprehensiveQualityTables
this.comprehensiveQualityTables.map(item => {
item.columnId = item.columnId.split(',')
});
});
},
// 根据项目名称获取栏目信息
GetColumnInfoByItemName() {
api.GetColumnInfoByItemName().then((resp) => {
this.innovationTree = resp[0].treeModels;
this.praticeTree = resp[1].treeModels;
this.comprehensiveTree = resp[2].treeModels;
}); });
}, },
......
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或