diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java index 283c9779c..fe568987f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java @@ -219,6 +219,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl list = this.list(wrapper); List headCustomVOOneList = new LinkedList<>(); + List res = new ArrayList<>(); if (ObjectUtils.isNotEmpty(list)) { //列表表头一级 List oneList = list.stream() @@ -246,13 +247,11 @@ public class HeadCustomEOServiceImpl extends ServiceImpl res = new ArrayList<>(); - if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) { - res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag); - } else { - res = headCustomVOOneList; + if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) { + res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag); + } else { + res = headCustomVOOneList; + } } return res; } diff --git a/jero-web/src/mixins/header.js b/jero-web/src/mixins/header.js index af767cd05..d9fb79333 100644 --- a/jero-web/src/mixins/header.js +++ b/jero-web/src/mixins/header.js @@ -46,7 +46,6 @@ const DragHandler = { }, handleStart(e) { - console.log(e) this.dragging = true this.removeEvents() this.thWidth = this.$el.parentNode.getBoundingClientRect().width @@ -145,7 +144,7 @@ const ResizeHeaderOne = function(val, name ,minWidths) { ) } } - console.log(restProps,11) + let className = '' if ((restProps.attrs && restProps.attrs.colSpan && restProps.attrs.colSpan == 1) || (restProps.attrs && restProps.attrs.colSpan && restProps.attrs.colSpan > 0)){ className = ' second' @@ -160,7 +159,6 @@ const ResizeHeaderOne = function(val, name ,minWidths) { export const ResizeHeader = { methods: { drag(columns, name ,minWidths) { - console.log(minWidths) return { header: { // minWidths : 最小宽度 => [[需要设置的列,最小宽],[需要设置的列,最小宽],...] @@ -238,7 +236,6 @@ export const ResizeColumnProvide = { }, methods: { _resizeColumn(w, column) { - console.log(column) tableAll.forEach(item=>{ item.forEach((i)=>{ if(i === column && i.dataIndex === column.dataIndex){ diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 9eaaf7b45..0d3a69dbb 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -94,8 +94,8 @@ +
@@ -1524,6 +1524,9 @@ this.isRoleSwitching = false } } + console.log(this.formInlineRoleSwitching.roleSwitchingCode) + console.log(this.isRoleSwitching) + console.log(this.isDisplay) this.getList() // this.JLoading = false } else {