基础信息管理 所有双击选中 添加查看

This commit is contained in:
shidongli 2022-08-30 17:35:50 +08:00
parent 5ab8d48451
commit 671966510f
5 changed files with 188 additions and 41 deletions

View File

@ -46,6 +46,14 @@ export function getTestItemScore(query) {
})
}
// 查询个人成绩
// export function getAllTestItemScoreInfo(id) {
// return request({
// url: 'system/testItemScore/getAllTestItemScoreInfo' + id,
// method: 'get'
// })
// }
// 新增个人成绩录入管理
export function addTestItemScore(data) {
return request({
@ -76,6 +84,6 @@ export function getAllTestItemScoreInfo(query) {
return request({
url: '/system/testItemScore/getAllTestItemScoreInfo',
method: 'get',
params: query
params: query,
})
}

View File

@ -293,7 +293,7 @@
<el-table
:data="kindergartenInfoList"
@row-click="kindergartenNameclick"
@cell-dblclick="kindergartenNameclick"
>
<el-table-column label="请选择" width="70" align="center">
<template slot-scope="scope">
@ -388,9 +388,11 @@ export default {
console.log(str);
//
const regMobile =
/^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/;
/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
// /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
// /^(?:(?:\+|0086))?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[0-9]))\d{8}$/;
const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
const isTel = reg.test(str);
const isTel = reg.test(value);
if (str.length == 11) {
if (regMobile.test(str)) {

View File

@ -381,21 +381,22 @@
</el-form-item>
</el-form>
<el-table ref="tags" :data="parentInfoList" align="center">
<el-table-column label="请选择" width="100" align="center">
<el-table ref="tags" :data="parentInfoList" align="center" @cell-dblclick="handleSelectionChange2">
<!-- <el-table-column type="selection" label="请选择" width="100" align="center"> -->
<el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope">
<el-button
type="primary"
style="width: 15px; height: 15px"
circle
style="width: 20px; height: 20px;padding:0px;"
v-if="parent1 == scope.row.id || parent2 == scope.row.id"
@click="handleSelectionChange3(scope.row)"
></el-button>
<el-button
v-else
style="width: 15px; height: 15px"
circle
style="width: 20px; height: 20px;padding:0px"
@click="handleSelectionChange2(scope.row)"
></el-button>
</template>
@ -509,7 +510,7 @@
</el-form-item>
</el-form>
<el-table :data="classinfoList" align="center" style="margin-top: 10px">
<el-table :data="classinfoList" align="center" style="margin-top: 10px" @cell-dblclick="classinfoclick">
<el-table-column label="请选择" width="80" align="center">
<template slot-scope="scope">
<el-button
@ -1334,6 +1335,7 @@ export default {
resetQuery1() {
this.resetForm("queryForm");
this.handleQuery();
form.studentNumber=null;
},
/** 重置按钮操作 */
resetQuery3() {
@ -1444,3 +1446,7 @@ export default {
},
};
</script>
<style lang="scss" scoped>
</style>

View File

@ -302,8 +302,8 @@
</el-form-item>
</el-form>
<el-table :data="kindergartenInfoList">
<el-table-column label="请选择" width="70" align="center">
<el-table :data="kindergartenInfoList" @cell-dblclick="kindergartenNameclick">
<el-table-column label="请选择" width="70" align="center" >
<template slot-scope="scope">
<el-button
type="primary"
@ -431,7 +431,7 @@
</el-form-item>
</el-form>
<el-table :data="classinfoList" align="center" style="margin-top: 10px">
<el-table :data="classinfoList" align="center" style="margin-top: 10px" @cell-dblclick="classinfoclick">
<!-- <el-table-column type="selection" width="50" align="center" /> -->
<el-table-column label="请选择" width="70" align="center">
<template slot-scope="scope">
@ -494,21 +494,20 @@
>
</el-table-column>
</el-table>
<el-button
type="success"
plain
size="mini"
@click="cancel3"
style="margin-top: 30px; margin-left: 20px"
>选择完成</el-button
>
<pagination
<pagination
v-show="total2 > 0"
:total="total2"
:page.sync="classinfoList2.pageNum"
:limit.sync="classinfoList2.pageSize"
@pagination="getList"
/>
<el-button
type="primary"
size="mini"
@click="cancel3"
style="margin-top: 30px; margin-left: 85%;width: 100px; height: 50px;font-size:15px"
>选择完成</el-button>
</el-dialog>
<el-dialog

View File

@ -113,20 +113,19 @@
:data="testItemScoreList"
@selection-change="handleSelectionChange"
@row-dblclick="handledbClick"
ref="table"
ref="table"
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column
<el-table-column
width="150"
label="所属批次编号"
align="center"
prop="batchCode"
/>
<el-table-column label="批次名称" align="center" prop="batchName" />
<el-table-column label="批次名称" align="center" prop="batchName" />
<el-table-column label="班级名称" align="center" prop="className" />
<el-table-column label="学生姓名" align="center" prop="studentName" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<!-- <el-table-column label="修改人" align="center" prop="updateBy" />
@ -137,6 +136,14 @@
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-search"
@click="seepraent(scope.row)"
v-hasPermi="['system:testItemScore:edit']"
>查看</el-button
>
<el-button
size="mini"
type="text"
@ -419,7 +426,8 @@
append-to-body
:before-close="kindergartencancel"
>
<el-table :data="kindergartenList">
<el-table :data="kindergartenList"
@cell-dblclick="kindergartenNameclick">
<el-table-column label="请选择" width="70" align="center">
<template slot-scope="scope">
<el-button
@ -893,6 +901,101 @@
@pagination="getList"
/>
</el-dialog>
<!-- // -->
<el-dialog
title="查看个人成绩"
:visible.sync="innerVisible5"
append-to-body
style="margin-top: 5%"
width="1000px"
>
<el-table
ref="singleTable"
:data="getAllTestItemScore"
style="width: 95%; margin: 20px auto"
>
<el-table-column
property="itemCode"
label="项目编号"
width="185"
align="center"
>
</el-table-column>
<el-table-column
property="itemName"
label="项目名称"
width="185"
align="center"
>
</el-table-column>
<!-- <el-table-column
property="scoreDictId"
label="字典类型"
align="center"
width="120"
>
<template slot-scope="scope">
{{
scope.row.scoreDictId == ResultType1.dictCode
? ResultType1.dictLabel
: ""
}}{{
scope.row.scoreDictId == ResultType2.dictCode
? ResultType2.dictLabel
: ""
}}</template
>
</el-table-column> -->
<el-table-column
property="itemScore"
label="个人成绩"
width="180"
align="center"
>
<!-- <template slot-scope="scope">
<el-input
readonly
type="number"
v-model="scope.row.itemScore"
v-if="
scope.row.itemScore != null ||
scope.row.scoreDictId == ResultType1.dictCode
"
></el-input>
<el-input
readonly
v-model="scope.row.scoreDictValue"
v-if="
scope.row.scoreDictValue != null ||
scope.row.scoreDictId == ResultType2.dictCode
"
></el-input>
</template> -->
</el-table-column>
<el-table-column
property="itemFraction"
label="个人成绩得分"
width="180"
align="center"
>
<!-- <template slot-scope="scope">
<el-input type="number" v-model="scope.row.itemFraction" readonly></el-input>
</template> -->
</el-table-column>
<el-table-column
property="syntheticalAssess"
label="综合评价"
width="180"
align="center"
>
<!-- <template slot-scope="scope">
<el-input v-model="scope.row.syntheticalAssess" readonly></el-input>
</template> -->
</el-table-column>
</el-table>
</el-dialog>
</div>
</template>
@ -939,6 +1042,7 @@ export default {
testItemss: [],
testScoreBatchs: [],
innerVisible4: false,
innerVisible5: false,
itemNumbername: "请选择批次编号",
//
kqueryParams: {
@ -976,6 +1080,8 @@ export default {
classInfos: [],
//
testItemScoreList: [],
//
getAllTestItemScore: [],
//
title: "",
//
@ -1046,12 +1152,36 @@ export default {
},
methods: {
handledbClick(row, event, column) {
// alert("");
handledbClick(row, event, column) {
// alert("");
this.$refs.table.toggleRowSelection(row);
console.log(row, event, column);
},
console.log(row, event, column);
},
//
seepraent(row) {
this.reset();
// const row = row.id || this.ids;
getAllTestItemScoreInfo(row).then((res) => {
this.getAllTestItemScore = res.data;
// console.log(this.getAllTestItemScore);
this.innerVisible5 = true;
});
},
// seepraent(row) {
// getAllTestItemScoreInfo(row).then((res) => {
// console.log(res)
// this.form.getAllTestItemScore = [];
// // // console.log(this.addqueryParams);
// this.getAllTestItemScore = res.data.getAllTestItemScore;
// // console.log(this.form);
// // this.form.itemScoreList = res.data;
// // console.log(this.getAllTestItemScore);
// this.innerVisible5 = true;
// });
// },
testclick() {
if (this.addqueryParams.studentId == "") {
this.$message.error("请先选择学生");
@ -1065,14 +1195,14 @@ export default {
return e.id != item.id;
});
},
getAllTestItemScore() {
this.form.itemScoreList = [];
console.log(this.addqueryParams);
getAllTestItemScoreInfo(this.addqueryParams).then((res) => {
console.log(this.form);
this.form.itemScoreList = res.data;
});
},
// getAllTestItemScore() {
// this.form.itemScoreList = [];
// console.log(this.addqueryParams);
// getAllTestItemScoreInfo(this.addqueryParams).then((res) => {
// console.log(this.form);
// this.form.itemScoreList = res.data;
// });
// },
//
kindergartenNameclick(row) {
this.queryParams2.kindergartenId = row.id;
@ -1195,6 +1325,8 @@ export default {
studentId: null,
batchCode: null,
itemScoreList: [],
batchId:null,
batchCode:null,
};
this.resetForm("form");
},
@ -1241,7 +1373,7 @@ export default {
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
this.queryParams.className ="";
this.queryParams.className = "";
},
//
handleSelectionChange(selection) {