|
@@ -191,7 +191,7 @@
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="departmentName" label="所属部门" width="200"></el-table-column>
|
|
|
|
|
|
+ <el-table-column prop="departmentName" label="所属部门" sortable="custom" width="200"></el-table-column>
|
|
<el-table-column prop="projectMainName" label="主项目" sortable="custom" min-width="250" v-if="user.timeType.mainProjectState == '1'">
|
|
<el-table-column prop="projectMainName" label="主项目" sortable="custom" min-width="250" v-if="user.timeType.mainProjectState == '1'">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column prop="inchargerName" label="项目经理" sortable="custom" min-width="150">
|
|
<el-table-column prop="inchargerName" label="项目经理" sortable="custom" min-width="150">
|
|
@@ -1365,7 +1365,7 @@ a {
|
|
console.log(this.addForm)
|
|
console.log(this.addForm)
|
|
},
|
|
},
|
|
tableSort({column, prop, order}){
|
|
tableSort({column, prop, order}){
|
|
- if(prop == 'inchargerName' || prop == 'customerName' || prop == 'projectCode' || prop == 'categoryName' || prop == 'projectName' || prop == 'status' || prop == 'currentStage'){
|
|
|
|
|
|
+ if(prop == 'inchargerName' || prop == 'customerName' || prop == 'projectCode' || prop == 'categoryName' || prop == 'projectName' || prop == 'status' || prop == 'currentStage' || prop == 'departmentName'){
|
|
this.sortOrder = order
|
|
this.sortOrder = order
|
|
this.sortProp = prop
|
|
this.sortProp = prop
|
|
this.getList()
|
|
this.getList()
|
|
@@ -2851,6 +2851,8 @@ a {
|
|
parameter.sortProp = 'status'
|
|
parameter.sortProp = 'status'
|
|
}else if(this.sortProp == 'currentStage'){
|
|
}else if(this.sortProp == 'currentStage'){
|
|
parameter.sortProp = 'current_stage_name'
|
|
parameter.sortProp = 'current_stage_name'
|
|
|
|
+ }else if(this.sortProp == 'departmentName'){
|
|
|
|
+ parameter.sortProp = 'dept_id'
|
|
}
|
|
}
|
|
|
|
|
|
if(this.sortOrder == 'descending'){
|
|
if(this.sortOrder == 'descending'){
|