Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

# Conflicts:
#	fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -191,7 +191,7 @@
                      </div>
                 </template>
             </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>
             <el-table-column prop="inchargerName" label="项目经理" sortable="custom" min-width="150">
@@ -254,6 +254,14 @@
                 </div>
             </template>
             </el-table-column>
+            <!-- 研究中心 -->
+            <el-table-column prop="associateDegreeNames" :label="centerNameDegree" min-width="190" v-if="user.timeType.isCro == 1" sortable="custom">
+                <template slot-scope="scope">
+                    <div>
+                        {{scope.row.associateDegreeNames}}
+                    </div>
+                </template>
+            </el-table-column>
             <!-- 级别 -->
             <el-table-column :prop="user.timeType.projectLevelState == 1 ? 'levelName' : 'level'" label="级别" min-width="190"   v-if="user.company.packageProject == 1">
                 <template slot-scope="scope">
@@ -1145,7 +1153,8 @@ a {
                 departmentList: [],
                 deptId: [],
                 contractAmountOld: 0,
-                contractAmountReasonShow: false
+                contractAmountReasonShow: false,
+                centerNameDegree: ''
             };
         },
         // 过滤器
@@ -1376,7 +1385,7 @@ a {
                 console.log(this.addForm)
             },
             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' || prop == 'associateDegreeNames'){
                     this.sortOrder = order
                     this.sortProp = prop
                     this.getList()
@@ -2862,6 +2871,10 @@ a {
                         parameter.sortProp = 'status'
                     }else if(this.sortProp == 'currentStage'){
                         parameter.sortProp = 'current_stage_name'
+                    }else if(this.sortProp == 'departmentName'){
+                        parameter.sortProp = 'dept_id'
+                    }else if(this.sortProp == 'associateDegreeNames'){
+                        parameter.sortProp = 'associate_degrees'
                     }
 
                     if(this.sortOrder == 'descending'){
@@ -2891,6 +2904,7 @@ a {
                             }
                             list[i].userNames = str;
                         }
+                        this.centerNameDegree = res.data.degrees
                         this.showColumnWidth = this.showColumn(list)
                         this.list = list;
                         this.total = res.data.total;