Merge branch 'main' of http://jialcheerful.club:3000/xd/JNBusiness

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

@@ -306,18 +306,6 @@ public class excelUtil {
             wsheet.getSettings().setLeftMargin(0.6d);
             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.close();
@@ -622,18 +610,6 @@ public class excelUtil {
             wsheet.getSettings().setLeftMargin(0.6d);
             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.close();

ruoyi-admin/src/main/resources/application.yml

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

ruoyi-ui/src/views/quot/quot/index.vue

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