|
@@ -10,11 +10,12 @@
|
|
|
<div class="selectsBlock">
|
|
|
<span class="selectLabel">项目筛选</span>
|
|
|
<el-select v-model="pavalues.value" placeholder="我的项目">
|
|
|
+ <el-option label="所有项目" :value="0"></el-option>
|
|
|
<el-option
|
|
|
v-for="item in options"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
+ :key="item.courseId"
|
|
|
+ :label="item.title"
|
|
|
+ :value="item.courseId">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
@@ -22,11 +23,12 @@
|
|
|
<div class="selectsBlock">
|
|
|
<span class="selectLabel">部门</span>
|
|
|
<el-select v-model="pavalues.value1" placeholder="请选择">
|
|
|
+ <el-option label="所有部门" :value="0"></el-option>
|
|
|
<el-option
|
|
|
v-for="item in options1"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
@@ -34,11 +36,12 @@
|
|
|
<div class="selectsBlock">
|
|
|
<span class="selectLabel">分类</span>
|
|
|
<el-select v-model="pavalues.value2" placeholder="请选择">
|
|
|
+ <el-option label="所有分类" :value="0"></el-option>
|
|
|
<el-option
|
|
|
v-for="item in options2"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
@@ -46,11 +49,12 @@
|
|
|
<div class="selectsBlock">
|
|
|
<span class="selectLabel">负责人</span>
|
|
|
<el-select v-model="pavalues.value3" placeholder="请选择">
|
|
|
+ <el-option label="所有负责人" value=""></el-option>
|
|
|
<el-option
|
|
|
v-for="item in options3"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
+ :key="item.pro_leader"
|
|
|
+ :label="item.pro_leader"
|
|
|
+ :value="item.pro_leader">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
@@ -67,32 +71,32 @@
|
|
|
:header-cell-style="{ background: '#f2f2f2',color:'#000' }"
|
|
|
@selection-change="handleSelectionChange"
|
|
|
>
|
|
|
- <el-table-column
|
|
|
+ <!-- <el-table-column
|
|
|
type="selection"
|
|
|
min-width="20%">
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
<el-table-column
|
|
|
- prop="projectName"
|
|
|
+ prop="title"
|
|
|
label="项目名称"
|
|
|
align="center"
|
|
|
min-width="20%">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="projectPerson"
|
|
|
+ prop="pro_leader"
|
|
|
label="项目负责人"
|
|
|
align="center"
|
|
|
min-width="20%">
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
- prop="persons"
|
|
|
+ prop="course_student.length"
|
|
|
label="小组成员"
|
|
|
align="center"
|
|
|
min-width="15%">
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
- prop="date"
|
|
|
+ prop="endProjectTime"
|
|
|
label="结题时间"
|
|
|
align="center"
|
|
|
min-width="20%">
|
|
@@ -129,23 +133,11 @@
|
|
|
options2:[],
|
|
|
options3:[],
|
|
|
options4:[],
|
|
|
- tableData:[{
|
|
|
- projectName:'陆地游泳辅助器',
|
|
|
- projectPerson:'王多鱼',
|
|
|
- persons:'5',
|
|
|
- date:'2022年11月12日',
|
|
|
- },
|
|
|
- {
|
|
|
- projectName:'北极运冰',
|
|
|
- projectPerson:'王多鱼',
|
|
|
- persons:'5',
|
|
|
- date:'2022年11月12日',
|
|
|
- }
|
|
|
- ],
|
|
|
+ tableData:[],
|
|
|
pavalues:{
|
|
|
- value:'',
|
|
|
- value1:'',
|
|
|
- value2:'',
|
|
|
+ value:0,
|
|
|
+ value1:0,
|
|
|
+ value2:0,
|
|
|
value3:'',
|
|
|
value4:'',
|
|
|
|
|
@@ -159,7 +151,35 @@
|
|
|
handleSelectionChange(val) {
|
|
|
this.multipleSelection = val;
|
|
|
},
|
|
|
+ getData(){
|
|
|
+ this.ajax.get(this.$store.state.api+"/GetProjectIsEndProject",{
|
|
|
+ uid:this.$store.state.userInfo.userid,
|
|
|
+ pid:0,
|
|
|
+ cid:0,
|
|
|
+ tid:0,
|
|
|
+ leader:"",
|
|
|
+ page:1,
|
|
|
+ lim:10,
|
|
|
+ }).then(res=>{
|
|
|
+ console.log(res)
|
|
|
+ let data = res.data[0];
|
|
|
+ // console.log(data)
|
|
|
+ data.forEach(item=>item["course_student"] = JSON.parse(item['course_student']));
|
|
|
+ this.options = res.data[1]
|
|
|
+ this.options1 = res.data[2]
|
|
|
+ this.options2 = res.data[3]
|
|
|
+ this.options3 = res.data[4]
|
|
|
+ // data.course_student = JSON.parse(data.course_student)
|
|
|
+ this.tableData = data;
|
|
|
+ // console.log(res)
|
|
|
+ }).catch(err=>{
|
|
|
+ console.log(err)
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
+ },
|
|
|
+ mounted(){
|
|
|
+ this.getData()
|
|
|
}
|
|
|
}
|
|
|
</script>
|