合并分支 'dev_2nd_20230213' 到 'master'

Dev 2nd 20230213

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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java

@@ -264,7 +264,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
         //编号，标题，操作
         boolean hasBH = false;
         boolean hasBT = false;
-        boolean hasCZ = false;
+//        boolean hasCZ = false;
         for (HeadCustomVO hcVO : headCustomVOOneList) {
             if ("编号".equals(hcVO.getTitle()) || "Number".equals(hcVO.getTitle())) {
                 hasBH = true;
@@ -273,7 +273,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
                 hasBT = true;
             }
             if ("操作".equals(hcVO.getTitle())) {
-                hasCZ = true;
+                headCustomVOOneList.remove(hcVO);
             }
         }
         if (!hasBH) {
@@ -299,17 +299,17 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
             res.add(bt);
         }
         res.addAll(headCustomVOOneList);
-        if (!hasCZ) {
+//        if (!hasCZ) {
-            HeadCustomVO cz = new HeadCustomVO();
+//            HeadCustomVO cz = new HeadCustomVO();
-            cz.setDataIndex("operation");
+//            cz.setDataIndex("operation");
-            if (CutEnum.CN.getValue().equals(cut)) {
+//            if (CutEnum.CN.getValue().equals(cut)) {
-                cz.setTitle("操作");
+//                cz.setTitle("操作");
-            } else {
+//            } else {
-                cz.setTitle("Operation");
+//                cz.setTitle("Operation");
-            }
+//            }
-            cz.setFixed("right");
+//            cz.setFixed("right");
-            res.add(cz);
+//            res.add(cz);
-        }
+//        }
         return res;
     }
 
@@ -329,9 +329,9 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
             if ("标题".equals(headCustomEO.getHeadFieldCn())) {
                 headCustomVO.setFixed("left");
             }
-            if ("操作".equals(headCustomEO.getHeadFieldCn())) {
+//            if ("操作".equals(headCustomEO.getHeadFieldCn())) {
-                headCustomVO.setFixed("right");
+//                headCustomVO.setFixed("right");
-            }
+//            }
         }
         return headCustomVO;
     }

jero-web/src/common/lang/en-us.js

@@ -1376,7 +1376,7 @@ module.exports = {
   Updateparametercolumn:'Update The Parameter Column',
   columnfirst:'Reference the parameter column first',
   columnforced:'Confirm a forced retraction?',
-  customize:'Customize the header',
+  customize:'List setting',
   customColumn:'Custom column',
 
 }

jero-web/src/common/lang/zh-cn.js

@@ -1477,6 +1477,6 @@ module.exports = {
   brand:'品牌',
   allsubitemsitem:'该项目下拥有子项目，是否全部删除',
   contactTheFounder:'联系作者',
-  customize:'自定义表头',
+  customize:'列表设置',
   customColumn:'自定义列',
 }

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -1996,9 +1996,9 @@ popconfirmmize {
 //font-weight: bold;
 //background: #f3f6f6;
 //}
-.ant-table-row-cell-ellipsis{
+//.ant-table-row-cell-ellipsis{
-  padding: 0!important;
+//  padding: 0!important;
-}
+//}
 .second{
   padding: 0!important;
 }

jero-web/src/views/system/modules/UserModal.vue

@@ -483,17 +483,11 @@
       handleSubmitOk() {
         this.confirmLoading = true
         let selectedRole = JSON.parse(JSON.stringify(this.selectedRole))
-        if(this.dutyTerritories){
-          let dutyTerritorie = JSON.parse(JSON.stringify(this.dutyTerritories))
-        }
-        if(this.brands){
-          let brand = JSON.parse(JSON.stringify(this.brands))
-        }
         let param = {
           ids: this.userId,
           selectedroles: selectedRole.join(','),
-          dutyTerritories: this.dutyTerritories ? dutyTerritorie.join(',') : '',
+          dutyTerritories: this.dutyTerritories ? this.dutyTerritories.join(',') : '',
-          brands: this.brands ? brand.join(',') : ''
+          brands: this.brands ? this.brands.join(',') : ''
         }
         postAction('/sys/user/setRole', param).then((res) => {
           if (res.success) {
@@ -643,6 +637,8 @@
         this.userDepartModel = { userId: '', departIdList: [] }
         this.checkedDepartNames = []
         this.checkedDepartNameString = ''
+        this.dutyTerritories = []
+        this.brands = []
         this.checkedDepartKeys = []
         this.selectedDepartKeys = []
         this.resultDepartOptions = []