xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xd:58f100bc39671fb663c05541bac04e3a053d466a
Branches Tags
xd:main
..
compare: xd:88a1f50a6b086e1fdb7de3b491fec4037366a6d6
Branches Tags
xd:main

No commits in common. "58f100bc39671fb663c05541bac04e3a053d466a" and "88a1f50a6b086e1fdb7de3b491fec4037366a6d6" have entirely different histories.
58f100bc39 ... 88a1f50a6b

3 changed files with 26 additions and 2 deletions
Show Stats Expand all files Collapse all files

24
ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java
View File

@ -306,6 +306,18 @@ public class excelUtil {
wsheet.getSettings().setLeftMargin(0.6d); wsheet.getSettings().setLeftMargin(0.6d);
wsheet.getSettings().setRightMargin(0.2d); wsheet.getSettings().setRightMargin(0.2d);
HeaderFooter footer = new HeaderFooter();
footer.getCentre().append("第 ");
footer.getCentre().appendPageNumber();
footer.getCentre().append(" 页，共 ");
footer.getCentre().appendTotalPages();
footer.getCentre().append(" 页 ");
footer.getCentre().setFontName("ARIAL");
footer.getCentre().setFontSize(13);
wsheet.getSettings().setFooter(footer);
wsheet.getSettings().setPrintTitles(0, 8, 0, 7);
wwb.write(); wwb.write();
wwb.close(); wwb.close();
@ -610,6 +622,18 @@ public class excelUtil {
wsheet.getSettings().setLeftMargin(0.6d); wsheet.getSettings().setLeftMargin(0.6d);
wsheet.getSettings().setRightMargin(0.2d); wsheet.getSettings().setRightMargin(0.2d);
HeaderFooter footer = new HeaderFooter();
footer.getCentre().append("第 ");
footer.getCentre().appendPageNumber();
footer.getCentre().append(" 页，共 ");
footer.getCentre().appendTotalPages();
footer.getCentre().append(" 页 ");
footer.getCentre().setFontName("ARIAL");
footer.getCentre().setFontSize(13);
wsheet.getSettings().setFooter(footer);
wsheet.getSettings().setPrintTitles(0, 8, 0, 7);
wwb.write(); wwb.write();
wwb.close(); wwb.close();

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -110,7 +110,7 @@ token:
# 令牌密钥 # 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟） # 令牌有效期（默认30分钟）
expireTime: 120 expireTime: 60
# MyBatis配置 # MyBatis配置
mybatis: mybatis:

2
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -1206,7 +1206,7 @@ export default {
if(roles && roles.indexOf('SALES_MAN') !== -1 ){//营销经理默认查看待提交且按创建时间排序 单据 if(roles && roles.indexOf('SALES_MAN') !== -1 ){//营销经理默认查看待提交且按创建时间排序 单据
this.queryParams.orderByColumn = "a.create_time";//查询字段是表格中字段名字 this.queryParams.orderByColumn = "a.create_time";//查询字段是表格中字段名字
this.queryParams.isAsc = "desc";//动态取值排序顺序 this.queryParams.isAsc = "desc";//动态取值排序顺序
//this.queryParams.quotApprovalStatus = '0'; this.queryParams.quotApprovalStatus = '0';
} }
this.getList(); this.getList();
}, },