Skip to content

D
dd_school
Commit de0d67d5 by Cat
Options

zd 教师电子档案

parent 72a9b992
Showing with 555 additions and 90 deletions
ruoyi-ui/src/views/smartSchool/gradeWork/electronicRecord/index.vue
...@@ -372,9 +372,18 @@ ...@@ -372,9 +372,18 @@
label="发表时间" label="发表时间"
> >
</el-table-column> </el-table-column>
<el-table-column align="center" label="附件"> <el-table-column align="center" label="附件" prop="thesisList">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="success" href=""></el-link> <div
v-for="(accessory, index) in scope.row.thesisListInfo"
:key="index"
>
<a
:href="baseUrl + accessory.accessoryUrl"
target="_blank"
>{{ accessory.accessoryName }}</a
>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -397,9 +406,22 @@ ...@@ -397,9 +406,22 @@
label="发表时间" label="发表时间"
> >
</el-table-column> </el-table-column>
<el-table-column align="center" label="附件"> <el-table-column
align="center"
label="附件"
prop="materialList"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="success" href=""></el-link> <div
v-for="(accessory, index) in scope.row.matListInfo"
:key="index"
>
<a
:href="baseUrl + accessory.accessoryUrl"
target="_blank"
>{{ accessory.accessoryName }}</a
>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -432,7 +454,16 @@ ...@@ -432,7 +454,16 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="附件"> <el-table-column align="center" label="附件">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="success" href=""></el-link> <div
v-for="(accessory, index) in scope.row.trainingListInfo"
:key="index"
>
<a
:href="baseUrl + accessory.accessoryUrl"
target="_blank"
>{{ accessory.accessoryName }}</a
>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -469,9 +500,23 @@ ...@@ -469,9 +500,23 @@
label="发证机关" label="发证机关"
> >
</el-table-column> </el-table-column>
<el-table-column align="center" label="附件"> <el-table-column
align="center"
label="附件"
prop="awardList
"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="success" href=""></el-link> <div
v-for="(accessory, index) in scope.row.accListInfo"
:key="index"
>
<a
:href="baseUrl + accessory.accessoryUrl"
target="_blank"
>{{ accessory.accessoryName }}</a
>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -544,6 +589,15 @@ export default { ...@@ -544,6 +589,15 @@ export default {
tableForthData: [], tableForthData: [],
// 多选 // 多选
ids: [], ids: [],
tableFirstDataInfo: [], //awardList
tableFirstDataInfoRes: [], //1
tableSecondDataInfo: [], //materialList
tableSecondDataInfoRes: [], //2
tableThirdDataInfo: [], //trainingList
tableThirdDataInfoRes: [], //3
tableForthDataInfo: [], //thesisList
tableForthDataInfoRes: [], //4
baseUrl: process.env.VUE_APP_BASE_API,
}; };
}, },
mounted() { mounted() {
...@@ -609,6 +663,7 @@ export default { ...@@ -609,6 +663,7 @@ export default {
noticeName: "", noticeName: "",
name: "", name: "",
}; };
this.form = {};
this.handleQuery(); this.handleQuery();
}, },
//多选 //多选
...@@ -639,34 +694,112 @@ export default { ...@@ -639,34 +694,112 @@ export default {
}); });
}, },
//查看按钮 //查看按钮
handleCheck(row, column, event) { handleCheck(row) {
this.check = true; this.check = true;
this.title = "基本信息查看";
this.dialogVisible = true;
// this.dialogForm = { ...row }; //Vue深拷贝
this.dialogVisible = true; this.dialogVisible = true;
const id = row.id; const id = row.id;
getFileTnfo(id).then((res) => { getFileTnfo(id).then((res) => {
this.form = res.data; this.dialogForm = res.data;
this.title = "基本信息查看"; this.title = "基本信息查看";
this.tableForthData = res.data.awardList;
this.tableSecondData = res.data.materialList;
this.tableFirstData = res.data.thesisList; this.tableFirstData = res.data.thesisList;
this.tableSecondData = res.data.materialList;
this.tableThirdData = res.data.trainingList; this.tableThirdData = res.data.trainingList;
console.log(this.tableForth, " this.tableForth"); this.tableForthData = res.data.awardList;
console.log(this.tableSecond, " this.tableSecond"); // ----------------------------------------4
console.log(this.tableFirst, " this.tableFirst"); this.tableForthDataInfo = res.data.awardList.map((item) => {
console.log(this.tableThird, " this.tableThird"); item.accList = item.accessories;
return item;
});
console.log(this.tableForthDataInfo, "this.tableForthDataInfo333333");
this.tableForthDataInfoRes = this.tableForthDataInfo.map((val) => {
val.accListInfo = val.accList;
return val;
});
// ---------------------------------------2
this.tableSecondDataInfo = res.data.materialList.map((item) => {
item.accessoriesInfo = item.accessories;
return item;
});
this.tableSecondDataInfoRes = this.tableSecondDataInfo.map((val) => {
val.matListInfo = val.accessories;
return val;
});
// ---------------------------------------3
this.tableThirdDataInfo = res.data.trainingList.map((item) => {
item.accessoriesInfo = item.accessories;
return item;
});
this.tableThirdDataInfoRes = this.tableThirdDataInfo.map((val) => {
val.trainingListInfo = val.accessories;
return val;
});
// -----------------------------1
this.tableFirstDataInfo = res.data.thesisList.map((item) => {
item.accessoriesInfo = item.schoolAccessoryList;
return item;
});
this.tableFirstDataInfoRes = this.tableFirstDataInfo.map((val) => {
val.thesisListInfo = val.schoolAccessoryList;
return val;
});
}); });
}, },
//修改按钮 //修改按钮
handleEdit(row) { handleEdit(row) {
this.resetQuery();
this.check = false; this.check = false;
this.title = "基本信息修改"; this.title = "基本信息修改";
this.dialogVisible = true; this.dialogVisible = true;
const id = row.id;
getFileTnfo(id).then((res) => {
this.dialogForm = res.data;
this.title = "基本信息查看";
this.tableFirstData = res.data.thesisList;
this.tableSecondData = res.data.materialList;
this.tableThirdData = res.data.trainingList;
this.tableForthData = res.data.awardList;
// ----------------------------------------4
this.tableForthDataInfo = res.data.awardList.map((item) => {
item.accList = item.accessories;
return item;
});
console.log(this.tableForthDataInfo, "this.tableForthDataInfo333333");
this.tableForthDataInfoRes = this.tableForthDataInfo.map((val) => {
val.accListInfo = val.accList;
return val;
});
// ---------------------------------------2
this.tableSecondDataInfo = res.data.materialList.map((item) => {
item.accessoriesInfo = item.accessories;
return item;
});
this.tableSecondDataInfoRes = this.tableSecondDataInfo.map((val) => {
val.matListInfo = val.accessories;
return val;
});
// ---------------------------------------3
this.tableThirdDataInfo = res.data.trainingList.map((item) => {
item.accessoriesInfo = item.accessories;
return item;
});
this.tableThirdDataInfoRes = this.tableThirdDataInfo.map((val) => {
val.trainingListInfo = val.accessories;
return val;
});
// -----------------------------1
this.tableFirstDataInfo = res.data.thesisList.map((item) => {
item.accessoriesInfo = item.schoolAccessoryList;
return item;
});
this.tableFirstDataInfoRes = this.tableFirstDataInfo.map((val) => {
val.thesisListInfo = val.schoolAccessoryList;
return val;
});
});
// this.handleCheck();
// this.dialogForm = row; // this.dialogForm = row;
this.dialogForm = JSON.parse(JSON.stringify(row)); // this.dialogForm = JSON.parse(JSON.stringify(row));
}, },
//提交按钮 //提交按钮
...@@ -705,11 +838,12 @@ export default { ...@@ -705,11 +838,12 @@ export default {
}, },
// 提取 ` // 提取 `
handleExtract() { handleExtract() {
const id = this.form.id; const id = this.dialogForm.id;
syncNotice(id).then((res) => { syncNotice(id).then((res) => {
console.log(id, "id"); console.log(id, "id");
console.log("res提取", res); console.log("res提取", res);
this.$modal.msgSuccess("提取成功"); this.$modal.msgSuccess("提取成功");
this.getList();
}); });
}, },
//弹窗确定按钮 //弹窗确定按钮
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/experimentalRecords/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px"> <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
label-width="78px"
>
<el-form-item label="教师" prop="applyName"> <el-form-item label="教师" prop="applyName">
<el-input v-model="queryParams.applyName" placeholder="请输入教师" clearable /> <el-input
v-model="queryParams.applyName"
placeholder="请输入教师"
clearable
/>
</el-form-item> </el-form-item>
<el-form-item label="实验时间" prop="time"> <el-form-item label="实验时间" prop="time">
<el-date-picker v-model="queryParams.startTime" type="date" placeholder="选择" value-format="yyyy-MM-dd"> <el-date-picker
v-model="queryParams.startTime"
type="date"
placeholder="选择"
value-format="yyyy-MM-dd"
>
</el-date-picker> </el-date-picker>
<el-date-picker v-model="queryParams.endTime" type="date" placeholder="选择" value-format="yyyy-MM-dd"> <el-date-picker
v-model="queryParams.endTime"
type="date"
placeholder="选择"
value-format="yyyy-MM-dd"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="实验分类"> <el-form-item label="实验分类">
<el-select v-model="queryParams.experimentClassify" placeholder="请选择" clearable> <el-select
<el-option v-for="dict in dict.type.experiment_classify" :key="dict.value" :label="dict.label" v-model="queryParams.experimentClassify"
:value="dict.value" /> placeholder="请选择"
clearable
>
<el-option
v-for="dict in dict.type.experiment_classify"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="实验名称"> <el-form-item label="实验名称">
<el-input v-model="queryParams.experimentName" placeholder="请输入"></el-input> <el-input
v-model="queryParams.experimentName"
placeholder="请输入"
></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="getList"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table border v-loading="loading" :data="tableData" stripe> <el-table border v-loading="loading" :data="tableData" stripe>
<el-table-column fixed="left" label="序号" type="index" width="55" align="center" /> <el-table-column
fixed="left"
label="序号"
type="index"
width="55"
align="center"
/>
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.lab_sub, row.sub) }}</div> <div>{{ selectDictLabel(dict.type.lab_sub, row.sub) }}</div>
...@@ -36,38 +81,58 @@ ...@@ -36,38 +81,58 @@
<el-table-column label="班级" align="center" prop="className" /> <el-table-column label="班级" align="center" prop="className" />
<el-table-column label="实验时间" align="center" prop="experimentTime" /> <el-table-column label="实验时间" align="center" prop="experimentTime" />
<el-table-column label="实验名称" align="center" prop="experimentName" /> <el-table-column label="实验名称" align="center" prop="experimentName" />
<el-table-column label="实验分类" align="center" prop="experimentClassify"> <el-table-column
label="实验分类"
align="center"
prop="experimentClassify"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.experiment_classify, row.experimentClassify) }}</div> <div>
{{
selectDictLabel(
dict.type.experiment_classify,
row.experimentClassify
)
}}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实验室" align="center" prop="labName" /> <el-table-column label="实验室" align="center" prop="labName" />
<el-table-column label="实验用品" align="center" prop="experimentUseGoods" /> <el-table-column
label="实验用品"
align="center"
prop="experimentUseGoods"
/>
<el-table-column label="章节内容" align="center" prop="chapterContent" /> <el-table-column label="章节内容" align="center" prop="chapterContent" />
<el-table-column label="教师" align="center" prop="applyName" /> <el-table-column label="教师" align="center" prop="applyName" />
<el-table-column label="附件" align="center" prop="schoolAccessoryList"> <el-table-column label="附件" align="center" prop="schoolAccessoryList">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="(accessory, index) in scope.row.accessoryList" :key="index"> <div
<a :href="baseUrl + accessory.accessoryUrl" target="_blank">{{ accessory.accessoryName }}</a> v-for="(accessory, index) in scope.row.accessoryList"
:key="index"
>
<a :href="baseUrl + accessory.accessoryUrl" target="_blank">{{
accessory.accessoryName
}}</a>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination ref="pageBlock" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" <pagination
:limit.sync="queryParams.pageSize" @pagination="getList" /> ref="pageBlock"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div> </div>
</template> </template>
<script> <script>
import { import { getList } from "@/api/smartSchool/laboratoryManagement/experimentalRecords";
getList,
} from '@/api/smartSchool/laboratoryManagement/experimentalRecords'
export default { export default {
dicts: ['experiment_classify', 'lab_sub'], dicts: ["experiment_classify", "lab_sub"],
data() { data() {
return { return {
baseUrl: process.env.VUE_APP_BASE_API, baseUrl: process.env.VUE_APP_BASE_API,
...@@ -82,7 +147,7 @@ export default { ...@@ -82,7 +147,7 @@ export default {
loading: false, loading: false,
total: 0, total: 0,
tableData: [], tableData: [],
} };
}, },
mounted() { mounted() {
this.getList(); this.getList();
...@@ -90,34 +155,31 @@ export default { ...@@ -90,34 +155,31 @@ export default {
methods: { methods: {
//获取列表数据 //获取列表数据
getList() { getList() {
getList(this.queryParams).then(response => { getList(this.queryParams).then((response) => {
this.tableData = response.rows; this.tableData = response.rows;
console.log(this.tableData); console.log(this.tableData);
this.tableData = response.rows.map(item => { this.tableData = response.rows.map((item) => {
item.accessoryList = item.schoolAccessoryList; // 将附件信息赋值给accessoryList属性 item.accessoryList = item.schoolAccessoryList; // 将附件信息赋值给accessoryList属性
return item; return item;
}); });
this.total = response.total this.total = response.total;
this.loading = false this.loading = false;
}) });
}, },
//重置 //重置
resetQuery() { resetQuery() {
this.queryParams = { (this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
applyName: "", applyName: "",
startTime: "", startTime: "",
endTime: "", endTime: "",
experimentClassify: "", experimentClassify: "",
}, }),
this.getList(); this.getList();
}, },
}, },
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue
...@@ -374,10 +374,19 @@ ...@@ -374,10 +374,19 @@
label="发表时间" label="发表时间"
> >
</el-table-column> </el-table-column>
<el-table-column align="center" label="附件"> <el-table-column align="center" label="附件" prop="thesisList">
<!-- <template slot-scope="scope"> <template slot-scope="scope">
<el-link type="success" href=""></el-link> <div
</template> --> v-for="(accessory, index) in scope.row.thesisListInfo"
:key="index"
>
<a
:href="baseUrl + accessory.accessoryUrl"
target="_blank"
>{{ accessory.accessoryName }}</a
>
</div>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -399,7 +408,24 @@ ...@@ -399,7 +408,24 @@
label="发表时间" label="发表时间"
> >
</el-table-column> </el-table-column>
<el-table-column align="center" label="附件"> </el-table-column> <el-table-column
align="center"
label="附件"
prop="materialList"
>
<template slot-scope="scope">
<div
v-for="(accessory, index) in scope.row.matListInfo"
:key="index"
>
<a
:href="baseUrl + accessory.accessoryUrl"
target="_blank"
>{{ accessory.accessoryName }}</a
>
</div>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="tableThird"> <div class="tableThird">
...@@ -428,7 +454,20 @@ ...@@ -428,7 +454,20 @@
label="是否合格" label="是否合格"
> >
</el-table-column> </el-table-column>
<el-table-column align="center" label="附件"> </el-table-column> <el-table-column align="center" label="附件">
<template slot-scope="scope">
<div
v-for="(accessory, index) in scope.row.trainingListInfo"
:key="index"
>
<a
:href="baseUrl + accessory.accessoryUrl"
target="_blank"
>{{ accessory.accessoryName }}</a
>
</div>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="tableForth"> <div class="tableForth">
...@@ -463,7 +502,25 @@ ...@@ -463,7 +502,25 @@
label="发证机关" label="发证机关"
> >
</el-table-column> </el-table-column>
<el-table-column align="center" label="附件"> </el-table-column> <el-table-column
align="center"
label="附件"
prop="awardList
"
>
<template slot-scope="scope">
<div
v-for="(accessory, index) in scope.row.accListInfo"
:key="index"
>
<a
:href="baseUrl + accessory.accessoryUrl"
target="_blank"
>{{ accessory.accessoryName }}</a
>
</div>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -545,6 +602,15 @@ export default { ...@@ -545,6 +602,15 @@ export default {
tableThirdData: [], tableThirdData: [],
//弹窗表格4 //弹窗表格4
tableForthData: [], tableForthData: [],
tableFirstDataInfo: [], //awardList
tableFirstDataInfoRes: [], //1
tableSecondDataInfo: [], //materialList
tableSecondDataInfoRes: [], //2
tableThirdDataInfo: [], //trainingList
tableThirdDataInfoRes: [], //3
tableForthDataInfo: [], //thesisList
tableForthDataInfoRes: [], //4
baseUrl: process.env.VUE_APP_BASE_API,
}; };
}, },
mounted() { mounted() {
...@@ -600,14 +666,50 @@ export default { ...@@ -600,14 +666,50 @@ export default {
handleCheck(row) { handleCheck(row) {
this.check = true; this.check = true;
this.dialogVisible = true; this.dialogVisible = true;
const id = row.fid; const id = row.id;
getFileTnfo(id).then((res) => { getFileTnfo(id).then((res) => {
this.form = res.data; this.form = res.data;
this.title = "基本信息查看"; this.title = "基本信息查看";
this.tableForthData = res.data.awardList;
this.tableSecondData = res.data.materialList;
this.tableFirstData = res.data.thesisList; this.tableFirstData = res.data.thesisList;
this.tableSecondData = res.data.materialList;
this.tableThirdData = res.data.trainingList; this.tableThirdData = res.data.trainingList;
this.tableForthData = res.data.awardList;
// ----------------------------------------4
this.tableForthDataInfo = res.data.awardList.map((item) => {
item.accList = item.accessories;
return item;
});
this.tableForthDataInfoRes = this.tableForthDataInfo.map((val) => {
val.accListInfo = val.accList;
return val;
});
// ---------------------------------------2
this.tableSecondDataInfo = res.data.materialList.map((item) => {
item.accessoriesInfo = item.accessories;
return item;
});
this.tableSecondDataInfoRes = this.tableSecondDataInfo.map((val) => {
val.matListInfo = val.accessories;
return val;
});
// ---------------------------------------3
this.tableThirdDataInfo = res.data.trainingList.map((item) => {
item.accessoriesInfo = item.accessories;
return item;
});
this.tableThirdDataInfoRes = this.tableThirdDataInfo.map((val) => {
val.trainingListInfo = val.accessories;
return val;
});
// -----------------------------1
this.tableFirstDataInfo = res.data.thesisList.map((item) => {
item.accessoriesInfo = item.schoolAccessoryList;
return item;
});
this.tableFirstDataInfoRes = this.tableFirstDataInfo.map((val) => {
val.thesisListInfo = val.schoolAccessoryList;
return val;
});
}); });
}, },
//填写按钮 //填写按钮
...@@ -615,12 +717,52 @@ export default { ...@@ -615,12 +717,52 @@ export default {
this.check = false; this.check = false;
this.title = "基本信息修改"; this.title = "基本信息修改";
this.dialogVisible = true; this.dialogVisible = true;
// this.form = row;
const id = row.fid; const id = row.fid;
console.log(id, 33333333333333);
getFileTnfo(id).then((res) => { getFileTnfo(id).then((res) => {
this.form = res.data; this.form = res.data;
this.title = "基本信息查看";
this.tableFirstData = res.data.thesisList;
this.tableSecondData = res.data.materialList;
this.tableThirdData = res.data.trainingList;
this.tableForthData = res.data.awardList;
// ----------------------------------------4
this.tableForthDataInfo = res.data.awardList.map((item) => {
item.accList = item.accessories;
return item;
});
this.tableForthDataInfoRes = this.tableForthDataInfo.map((val) => {
val.accListInfo = val.accList;
return val;
});
// ---------------------------------------2
this.tableSecondDataInfo = res.data.materialList.map((item) => {
item.accessoriesInfo = item.accessories;
return item;
});
this.tableSecondDataInfoRes = this.tableSecondDataInfo.map((val) => {
val.matListInfo = val.accessories;
return val;
});
// ---------------------------------------3
this.tableThirdDataInfo = res.data.trainingList.map((item) => {
item.accessoriesInfo = item.accessories;
return item;
});
this.tableThirdDataInfoRes = this.tableThirdDataInfo.map((val) => {
val.trainingListInfo = val.accessories;
return val;
});
// -----------------------------1
this.tableFirstDataInfo = res.data.thesisList.map((item) => {
item.accessoriesInfo = item.schoolAccessoryList;
return item;
});
this.tableFirstDataInfoRes = this.tableFirstDataInfo.map((val) => {
val.thesisListInfo = val.schoolAccessoryList;
return val;
});
}); });
// /teacherFiles/files/30 查看档案详情列表
}, },
//提交按钮 //提交按钮
handleSubmit(row) { handleSubmit(row) {
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance.vue
...@@ -361,10 +361,19 @@ ...@@ -361,10 +361,19 @@
label="发表时间" label="发表时间"
> >
</el-table-column> </el-table-column>
<el-table-column align="center" label="附件"> <el-table-column align="center" label="附件" prop="thesisList">
<!-- <template slot-scope="scope"> <template slot-scope="scope">
<el-link type="success" href=""></el-link> <div
</template> --> v-for="(accessory, index) in scope.row.thesisListInfo"
:key="index"
>
<a
:href="baseUrl + accessory.accessoryUrl"
target="_blank"
>{{ accessory.accessoryName }}</a
>
</div>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -386,9 +395,22 @@ ...@@ -386,9 +395,22 @@
label="发表时间" label="发表时间"
> >
</el-table-column> </el-table-column>
<el-table-column align="center" label="附件"> <el-table-column
align="center"
label="附件"
prop="materialList"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="success" href=""></el-link> <div
v-for="(accessory, index) in scope.row.matListInfo"
:key="index"
>
<a
:href="baseUrl + accessory.accessoryUrl"
target="_blank"
>{{ accessory.accessoryName }}</a
>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -421,7 +443,16 @@ ...@@ -421,7 +443,16 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="附件"> <el-table-column align="center" label="附件">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="success" href=""></el-link> <div
v-for="(accessory, index) in scope.row.trainingListInfo"
:key="index"
>
<a
:href="baseUrl + accessory.accessoryUrl"
target="_blank"
>{{ accessory.accessoryName }}</a
>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -458,9 +489,23 @@ ...@@ -458,9 +489,23 @@
label="发证机关" label="发证机关"
> >
</el-table-column> </el-table-column>
<el-table-column align="center" label="附件"> <el-table-column
align="center"
label="附件"
prop="awardList
"
>
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-link type="success" href=""></el-link> --> <div
v-for="(accessory, index) in scope.row.accListInfo"
:key="index"
>
<a
:href="baseUrl + accessory.accessoryUrl"
target="_blank"
>{{ accessory.accessoryName }}</a
>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -543,6 +588,15 @@ export default { ...@@ -543,6 +588,15 @@ export default {
tableSecondData: [], tableSecondData: [],
tableThirdData: [], tableThirdData: [],
tableForthData: [], tableForthData: [],
tableFirstDataInfo: [], //awardList
tableFirstDataInfoRes: [], //1
tableSecondDataInfo: [], //materialList
tableSecondDataInfoRes: [], //2
tableThirdDataInfo: [], //trainingList
tableThirdDataInfoRes: [], //3
tableForthDataInfo: [], //thesisList
tableForthDataInfoRes: [], //4
baseUrl: process.env.VUE_APP_BASE_API,
}; };
}, },
mounted() { mounted() {
...@@ -589,19 +643,47 @@ export default { ...@@ -589,19 +643,47 @@ export default {
const id = row.id; const id = row.id;
getFileTnfo(id).then((res) => { getFileTnfo(id).then((res) => {
this.form = res.data; this.form = res.data;
console.log(this.form, "131231212");
this.title = "基本信息查看"; this.title = "基本信息查看";
this.tableForthData = res.data.awardList;
// this.tableForth = res.data.awardList.forEach(function (item) {
// console.log(item);
// });
this.tableSecondData = res.data.materialList;
this.tableFirstData = res.data.thesisList; this.tableFirstData = res.data.thesisList;
this.tableSecondData = res.data.materialList;
this.tableThirdData = res.data.trainingList; this.tableThirdData = res.data.trainingList;
console.log(this.tableForth, " this.tableForth"); this.tableForthData = res.data.awardList;
console.log(this.tableSecond, " this.tableSecond"); // ----------------------------------------4
console.log(this.tableFirst, " this.tableFirst"); this.tableForthDataInfo = res.data.awardList.map((item) => {
console.log(this.tableThird, " this.tableThird"); item.accList = item.accessories;
return item;
});
this.tableForthDataInfoRes = this.tableForthDataInfo.map((val) => {
val.accListInfo = val.accList;
return val;
});
// ---------------------------------------2
this.tableSecondDataInfo = res.data.materialList.map((item) => {
item.accessoriesInfo = item.accessories;
return item;
});
this.tableSecondDataInfoRes = this.tableSecondDataInfo.map((val) => {
val.matListInfo = val.accessories;
return val;
});
// ---------------------------------------3
this.tableThirdDataInfo = res.data.trainingList.map((item) => {
item.accessoriesInfo = item.accessories;
return item;
});
this.tableThirdDataInfoRes = this.tableThirdDataInfo.map((val) => {
val.trainingListInfo = val.accessories;
return val;
});
// -----------------------------1
this.tableFirstDataInfo = res.data.thesisList.map((item) => {
item.accessoriesInfo = item.schoolAccessoryList;
return item;
});
this.tableFirstDataInfoRes = this.tableFirstDataInfo.map((val) => {
val.thesisListInfo = val.schoolAccessoryList;
return val;
});
}); });
}, },
...@@ -619,7 +701,52 @@ export default { ...@@ -619,7 +701,52 @@ export default {
this.check = false; this.check = false;
this.title = "基本信息修改"; this.title = "基本信息修改";
this.dialogVisible = true; this.dialogVisible = true;
this.form = row; // this.form = row;
const id = row.id;
getFileTnfo(id).then((res) => {
this.form = res.data;
this.title = "基本信息查看";
this.tableFirstData = res.data.thesisList;
this.tableSecondData = res.data.materialList;
this.tableThirdData = res.data.trainingList;
this.tableForthData = res.data.awardList;
// ----------------------------------------4
this.tableForthDataInfo = res.data.awardList.map((item) => {
item.accList = item.accessories;
return item;
});
this.tableForthDataInfoRes = this.tableForthDataInfo.map((val) => {
val.accListInfo = val.accList;
return val;
});
// ---------------------------------------2
this.tableSecondDataInfo = res.data.materialList.map((item) => {
item.accessoriesInfo = item.accessories;
return item;
});
this.tableSecondDataInfoRes = this.tableSecondDataInfo.map((val) => {
val.matListInfo = val.accessories;
return val;
});
// ---------------------------------------3
this.tableThirdDataInfo = res.data.trainingList.map((item) => {
item.accessoriesInfo = item.accessories;
return item;
});
this.tableThirdDataInfoRes = this.tableThirdDataInfo.map((val) => {
val.trainingListInfo = val.accessories;
return val;
});
// -----------------------------1
this.tableFirstDataInfo = res.data.thesisList.map((item) => {
item.accessoriesInfo = item.schoolAccessoryList;
return item;
});
this.tableFirstDataInfoRes = this.tableFirstDataInfo.map((val) => {
val.thesisListInfo = val.schoolAccessoryList;
return val;
});
});
}, },
//弹窗确定按钮 //弹窗确定按钮
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment