|
|
@@ -253,7 +253,7 @@ export default {
|
|
253
|
253
|
computed: {
|
|
254
|
254
|
// 查获排名表格列配置
|
|
255
|
255
|
captureRankColumns() {
|
|
256
|
|
-
|
|
|
256
|
+
|
|
257
|
257
|
const deptLabel = this.isStationType ? '大队' : this.isBrigadeType ? '主管' : this.isDepartmentType ? '班组' : this.isTeamsType ? '姓名' : '';
|
|
258
|
258
|
|
|
259
|
259
|
return [
|
|
|
@@ -792,19 +792,22 @@ export default {
|
|
792
|
792
|
}
|
|
793
|
793
|
|
|
794
|
794
|
const { scopedType = "", scopedId } = processedParams ? processedParams : { scopedType: "", scopedId: "" }
|
|
|
795
|
+
|
|
795
|
796
|
let otherParams = {
|
|
796
|
|
- ...(scopedType == 'MANAGER'||scopedType=='BRIGADE' ? { brigadeId: scopedId } : {}),
|
|
797
|
|
- ...(scopedType == 'DEPARTMENT' ? { departmentId: scopedId } : {}),
|
|
|
797
|
+ ...(scopedType == 'BRIGADE' ? { brigadeId: scopedId } : {}),
|
|
|
798
|
+ ...(scopedType == 'MANAGER' ? { departmentId: scopedId } : {}),
|
|
798
|
799
|
...(scopedType == 'TEAMS' ? { teamId: scopedId } : {}),
|
|
799
|
800
|
...(scopedType == 'USER' ? { userId: scopedId } : {})
|
|
800
|
801
|
}
|
|
801
|
|
-
|
|
|
802
|
+
|
|
802
|
803
|
if (scopedType != 'TEAMS') {
|
|
803
|
804
|
delete otherParams.teamId;
|
|
804
|
805
|
}
|
|
805
|
806
|
if (scopedType != 'USER') {
|
|
806
|
807
|
delete otherParams.userId;
|
|
807
|
808
|
}
|
|
|
809
|
+ delete processedParams.scopedType;
|
|
|
810
|
+ delete processedParams.scopedId;
|
|
808
|
811
|
|
|
809
|
812
|
return { ...processedParams, ...otherParams }
|
|
810
|
813
|
},
|