合并分支 'dev_2nd_20230213' 到 'master'

Dev 2nd 20230213

查看合并请求 laws-nio/laws-weilai!289

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<HeadCustomEOMapper, Hea
         wrapper.in(HeadCustomEO::getCreateBy, loginUser.getUsername()).in(HeadCustomEO::getModuleFlag, moduleFlag);
         List<HeadCustomEO> list = this.list(wrapper);
         List<HeadCustomVO> headCustomVOOneList = new LinkedList<>();
+        List<HeadCustomVO> res = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(list)) {
             //列表表头一级
             List<HeadCustomEO> oneList = list.stream()
@@ -246,13 +247,11 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
                 getHeadCustomVO(cut, headCustomEO, headCustomVO);
                 headCustomVOOneList.add(headCustomVO);
             }
-        }
+            if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) {
-
+                res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag);
-        List<HeadCustomVO> res = new ArrayList<>();
+            } else {
-        if ("法规清单".equals(moduleFlag) || "虚拟清单详情".equals(moduleFlag) || "维护清单".equals(moduleFlag)) {
+                res = headCustomVOOneList;
-            res = checkDefaultHead(headCustomVOOneList, cut, moduleFlag);
+            }
-        } else {
-            res = headCustomVOOneList;
         }
         return res;
     }

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){

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -94,8 +94,8 @@
         </a-row>
       </a-form>
     </div>
+<!--    v-if="(isRoleSwitching && !isDisplay) ||  (!isDisplay && roleSwitchingList.length > 1) || isDisplay"-->
     <div class="table-operator"
-         v-if="(isRoleSwitching && !isDisplay) ||  (!isDisplay && roleSwitchingList.length > 1) || isDisplay"
          style="overflow:hidden;margin-bottom: 20px">
       <div style="float: right;margin-top: 1px; margin-left: 20px">
         <a-popconfirm :visible="customizevisible" overlayClassName='popconfirmmize' placement="bottomRight" >
@@ -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 {