|
|
@@ -147,7 +147,7 @@
|
|
|
</el-table-column>
|
|
|
|
|
|
<!-- 项目阶段 -->
|
|
|
- <el-table-column prop="inchargerName" label="项目阶段" sortable="custom" min-width="150" width="220" v-if="user.company.packageProject == 1">
|
|
|
+ <el-table-column prop="currentStage" label="项目阶段" sortable="custom" min-width="150" width="220" v-if="user.company.packageProject == 1">
|
|
|
<template slot-scope="scope">
|
|
|
<span style="display: inline-block; width: 150px">
|
|
|
<el-select v-model="phaseProjectValie" v-if="scope.row.index + ',' + scope.column.index == currentCell" :ref="scope.row.index + ',' + scope.column.index" filterable placeholder="请选择项目阶段" size="mini" @blur="hideSelect" @change="selectChange">
|
|
|
@@ -1049,7 +1049,7 @@ a {
|
|
|
console.log(this.addForm)
|
|
|
},
|
|
|
tableSort({column, prop, order}){
|
|
|
- if(prop == 'inchargerName' || prop == 'customerName' || prop == 'projectCode' || prop == 'categoryName' || prop == 'projectName' || prop == 'status'){
|
|
|
+ if(prop == 'inchargerName' || prop == 'customerName' || prop == 'projectCode' || prop == 'categoryName' || prop == 'projectName' || prop == 'status' || prop == 'currentStage'){
|
|
|
this.sortOrder = order
|
|
|
this.sortProp = prop
|
|
|
this.getList()
|
|
|
@@ -2421,6 +2421,8 @@ a {
|
|
|
parameter.sortProp = 'project_name'
|
|
|
}else if(this.sortProp == 'status'){
|
|
|
parameter.sortProp = 'status'
|
|
|
+ }else if(this.sortProp == 'currentStage'){
|
|
|
+ parameter.sortProp = 'current_stage'
|
|
|
}
|
|
|
|
|
|
if(this.sortOrder == 'descending'){
|
ggooalice