|
|
@@ -398,8 +398,8 @@ export default {
|
|
|
this.getPantoneData(resolve, deptId);
|
|
|
}else if (this.fromType == 'colorWarning') {
|
|
|
// 调色预警
|
|
|
+ let deptId = tree ? tree.onlyId : null;
|
|
|
this.firstProp = 'onlyName';
|
|
|
- let deptId = tree ? tree.deptId : null;
|
|
|
this.getColorWarningData(resolve, deptId);
|
|
|
}
|
|
|
},
|
|
|
@@ -540,7 +540,8 @@ export default {
|
|
|
this.maskShow = false;
|
|
|
if (res.code == 200) {
|
|
|
res.data.forEach((val) => {
|
|
|
- if (val.isChildren && val.isChildren == 'true') val.hasChildren = true;
|
|
|
+ // 是否还有子级
|
|
|
+ if (val.empLevel < 3) val.hasChildren = true;
|
|
|
});
|
|
|
// 是否是子级
|
|
|
if (resolve) {
|