diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index d74beca2..021821de 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -123,8 +123,8 @@ token:
header: Authorization
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
- # 令牌有效期(默认30分钟)
- expireTime: 30
+ # 令牌有效期(默认60分钟)
+ expireTime: 60
# MyBatis配置
mybatis:
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/bid/impl/BizDeliveryOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/bid/impl/BizDeliveryOrderServiceImpl.java
index 855de522..fb4d5a4d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/bid/impl/BizDeliveryOrderServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/bid/impl/BizDeliveryOrderServiceImpl.java
@@ -98,7 +98,7 @@ public class BizDeliveryOrderServiceImpl implements IBizDeliveryOrderService {
public int ship(Long id) {
BizDeliveryOrder d = mapper.selectBizDeliveryOrderById(id);
if (d == null) throw new RuntimeException("发货单不存在");
- if (!"pending".equals(d.getDeliveryStatus()))
+ if (!"pending".equals(d.getDeliveryStatus()) && !"confirmed".equals(d.getDeliveryStatus()))
throw new RuntimeException("当前状态不允许发货确认");
return mapper.updateDeliveryStatus(id, "transit", null, null, "");
}
diff --git a/ruoyi-ui/src/assets/styles/theme-jd.scss b/ruoyi-ui/src/assets/styles/theme-jd.scss
index d48be6a1..e364cf1c 100644
--- a/ruoyi-ui/src/assets/styles/theme-jd.scss
+++ b/ruoyi-ui/src/assets/styles/theme-jd.scss
@@ -435,12 +435,12 @@ body {
/* 小按钮紧凑 */
.el-button--mini {
- padding: 5px 10px !important;
+ padding: 4px 7px !important;
font-size: 12px !important;
}
.el-button--small {
- padding: 7px 12px !important;
+ padding: 6px 10px !important;
font-size: 12px !important;
}
@@ -451,7 +451,6 @@ body {
border: 1px solid var(--border-gray) !important;
border-bottom: none !important;
font-size: 12px !important;
- table-layout: fixed !important;
/* 表头 */
thead th {
@@ -470,21 +469,21 @@ body {
td {
color: var(--text-dark) !important;
font-size: 12px !important;
- padding: 4px 6px !important;
+ padding: 3px 4px !important;
border-bottom: 1px solid var(--border-light) !important;
white-space: nowrap !important;
overflow: hidden !important;
text-overflow: ellipsis !important;
}
- /* cell 内部无换行 */
+ /* cell 内部(操作列允许换行) */
.cell {
white-space: nowrap !important;
overflow: hidden !important;
text-overflow: ellipsis !important;
- line-height: 1.4 !important;
- padding-left: 2px !important;
- padding-right: 2px !important;
+ line-height: 1.3 !important;
+ padding-left: 1px !important;
+ padding-right: 1px !important;
}
/* 行悬停 */
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 14dfffab..5e8b2074 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -12,14 +12,6 @@
FUANDE SMART QUOTATION PLATFORM
+{{ greeting }},{{ nickName }}!欢迎回来
+原料·研发·生产·销售·服务 全产业链数智运营
+