Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java

@@ -81,4 +81,7 @@ public class LawsMonthlyReportTitleTemplateEO implements Serializable {
 
     //排序
     private int sort;
+
+    @TableField(exist = false)
+    private String key;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java

@@ -220,6 +220,10 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl<Law
 	public List<LawsMonthlyReportTitleTemplateEO> getPageInfo(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEOTemp, HttpServletRequest req) {
 		QueryWrapper<LawsMonthlyReportTitleTemplateEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEOTemp, req.getParameterMap());
 		List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = this.list(queryWrapper);
+		for (LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO : lawsMonthlyReportTitleTemplateEOS) {
+			//前端需要的特殊数据格式
+			lawsMonthlyReportTitleTemplateEO.setKey(lawsMonthlyReportTitleTemplateEO.getId());
+		}
 		List<LawsMonthlyReportTitleTemplateEO> parentList = lawsMonthlyReportTitleTemplateEOS.stream()
 				.filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
 		Collections.sort(parentList, new Comparator<LawsMonthlyReportTitleTemplateEO>() {

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

@@ -725,6 +725,29 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             this.dataSource = res.result || []
+            if (this.dataSource.length == 0) {
+              this.$nextTick(() => {
+                let anttablebody = document.getElementsByClassName('ant-table-body')
+                let antfixedLeft = document.querySelectorAll('.ant-table-fixed-left .ant-table-body-inner')
+                let antfixedRight = document.querySelectorAll('.ant-table-fixed-right .ant-table-body-inner')
+                anttablebody[0].classList.add('ant-table-body-one')
+                antfixedLeft[0].classList.add('antfixedLeft')
+                antfixedRight[0].classList.add('antfixedRight')
+              })
+            } else {
+              let anttablebody = document.getElementsByClassName('ant-table-body-one')
+              let antfixedLeft = document.getElementsByClassName('antfixedLeft')
+              let antfixedRight = document.getElementsByClassName('antfixedRight')
+              if (anttablebody && anttablebody.length > 0) {
+                anttablebody[0].classList.remove('ant-table-body-one')
+              }
+              if (antfixedLeft && antfixedLeft.length > 0) {
+                antfixedLeft[0].classList.remove('antfixedLeft')
+              }
+              if (antfixedRight && antfixedRight.length > 0) {
+                antfixedRight[0].classList.remove('antfixedRight')
+              }
+            }
             this.loading = false
           } else {
             this.loading = false
@@ -1030,6 +1053,37 @@
   ::v-deep .ant-table-body {
     background: transparent!important;
   }
+
+  ::v-deep .ant-table-fixed-header .ant-table-body-inner {
+    overflow: visible;
+  }
+
+  ::v-deep .ant-table-body {
+    padding-bottom: 7px;
+  }
+
+  ::v-deep .ant-table-body-inner {
+    padding-bottom: 16px;
+  }
+
+  ::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar {
+    /*height: 0;*/
+    width: 0;
+  }
+
+  ::v-deep .ant-table-body-one {
+    padding-bottom: 0!important;
+  }
+
+  ::v-deep .antfixedLeft {
+    padding-bottom: 0!important;
+    overflow: scroll!important;
+  }
+
+  ::v-deep .antfixedRight {
+    padding-bottom: 0!important;
+    overflow: scroll!important;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {

jero-web/src/views/processCenter/processForm/processDetails/index.vue

@@ -7,7 +7,7 @@
         </div>
         <!--        <span class="flow-chart-title">{{ $route.params.processNumber }}  {{ $route.params.processTypeName }}  流程图</span>-->
       </div>
-      <div class="flow-group" style="margin-top: 30px;overflow: auto;">
+      <div class="flow-group" style="margin-top: 30px;overflow: auto;text-align: center">
         <img :src="processStep" class="process-img">
       </div>
     </div>

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

@@ -1507,9 +1507,32 @@
         getAction(this.url.list, query).then((res) => {
           this.getRoleByUserId()
           if (res.success) {
-            this.dataSource = res.result
+            this.dataSource = res.result || []
             this.loading = false
             this.JLoading = false
+            if (this.dataSource.length == 0) {
+              this.$nextTick(() => {
+                let anttablebody = document.getElementsByClassName('ant-table-body')
+                let antfixedLeft = document.querySelectorAll('.ant-table-fixed-left .ant-table-body-inner')
+                let antfixedRight = document.querySelectorAll('.ant-table-fixed-right .ant-table-body-inner')
+                anttablebody[0].classList.add('ant-table-body-one')
+                antfixedLeft[0].classList.add('antfixedLeft')
+                antfixedRight[0].classList.add('antfixedRight')
+              })
+            } else {
+              let anttablebody = document.getElementsByClassName('ant-table-body-one')
+              let antfixedLeft = document.getElementsByClassName('antfixedLeft')
+              let antfixedRight = document.getElementsByClassName('antfixedRight')
+              if (anttablebody && anttablebody.length > 0) {
+                anttablebody[0].classList.remove('ant-table-body-one')
+              }
+              if (antfixedLeft && antfixedLeft.length > 0) {
+                antfixedLeft[0].classList.remove('antfixedLeft')
+              }
+              if (antfixedRight && antfixedRight.length > 0) {
+                antfixedRight[0].classList.remove('antfixedRight')
+              }
+            }
           } else {
             this.JLoading = false
             this.loading = false
@@ -2052,7 +2075,7 @@
               commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + this.formInlineComment.commentContent,
               projectLibraryId: this.$route.query.id
             }
-            this.rejectCauseAdd(this.formInlineComment.commentContent,ids)
+            this.rejectCauseAdd(this.formInlineComment.commentContent, ids)
             this.confirmLoadingComment = true
             let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
             this.updateStatusBatch(1, selectedRowKeys)
@@ -2067,14 +2090,14 @@
           }
         })
       },
-      rejectCauseAdd(rejectCause,ids) {
+      rejectCauseAdd(rejectCause, ids) {
         let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         let query = {
-          rejectUserId:this.userInfo().id,
+          rejectUserId: this.userInfo().id,
-          rejectTime:rejectTime,
+          rejectTime: rejectTime,
-          rejectCause:rejectCause,
+          rejectCause: rejectCause,
-          projectLawsInventoryId:ids.join(','),
+          projectLawsInventoryId: ids.join(','),
-          rejectType:'0',
+          rejectType: '0'
         }
         postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
 
@@ -2413,6 +2436,58 @@
   ::v-deep .ant-table-body {
     background: transparent !important;
   }
+
+  ::v-deep .ant-table-body::-webkit-scrollbar {
+    z-index: 10000000;
+  }
+
+  /*::v-deep .ant-table .ant-table-fixed-left {*/
+  /*  height: auto !important;*/
+  /*  bottom: 8px !important;*/
+  /*}*/
+
+  /*::v-deep .ant-table .ant-table-fixed-right {*/
+  /*  height: auto !important;*/
+  /*  bottom: 8px !important;*/
+  /*}*/
+
+  ::v-deep .ant-table-fixed-header .ant-table-body-inner {
+    overflow: visible;
+  }
+
+  /*::v-deep .ant-table-fixed-left .ant-table-body-inner {*/
+  /*  overflow-y: scroll;*/
+  /*}*/
+
+  /*::v-deep .ant-table-fixed-right .ant-table-body-inner {*/
+  /*  overflow-y: scroll;*/
+  /*}*/
+  ::v-deep .ant-table-body {
+    padding-bottom: 7px;
+  }
+
+  ::v-deep .ant-table-body-inner {
+    padding-bottom: 16px;
+  }
+
+  ::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar {
+    /*height: 0;*/
+    width: 0;
+  }
+
+  ::v-deep .ant-table-body-one {
+    padding-bottom: 0!important;
+  }
+
+  ::v-deep .antfixedLeft {
+    padding-bottom: 0!important;
+    overflow: scroll!important;
+  }
+
+  ::v-deep .antfixedRight {
+    padding-bottom: 0!important;
+    overflow: scroll!important;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {