From 8ce9378a4b062fbaace1661a9af9e17b67424f9d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 八月 2023 16:51:08 +0800
Subject: [PATCH] #出差审批完善
---
src/main/java/com/zy/crm/manager/entity/BusinessTrip.java | 3 +++
src/main/webapp/views/businessTrip/businessTrip_more.html | 20 +++-----------------
src/main/java/com/zy/crm/common/model/SettleDto.java | 1 +
3 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/model/SettleDto.java b/src/main/java/com/zy/crm/common/model/SettleDto.java
index ca8fc04..eef0c43 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -189,6 +189,7 @@
dto.setUserId(user.getId());
dto.setUsername(user.getNickname());
dto.setMsg(user.getNickname()+"鎻愪氦鍑哄樊鐢宠");
+ dto.setTime(DateUtils.convert(new Date()));
list.add(dto);
break;
case 2:
diff --git a/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java b/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java
index 3e7f25a..5ff25c8 100644
--- a/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java
+++ b/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.zy.crm.manager.utils.TimeCalculatorUtils;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
@@ -131,6 +132,7 @@
@ApiModelProperty(value= "鍑哄彂鏃ユ湡")
@TableField("business_start_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date businessStartTime;
/**
@@ -139,6 +141,7 @@
@ApiModelProperty(value= "缁撴潫鏃ユ湡")
@TableField("business_end_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date businessEndTime;
/**
diff --git a/src/main/webapp/views/businessTrip/businessTrip_more.html b/src/main/webapp/views/businessTrip/businessTrip_more.html
index 30f7d32..d257a8b 100644
--- a/src/main/webapp/views/businessTrip/businessTrip_more.html
+++ b/src/main/webapp/views/businessTrip/businessTrip_more.html
@@ -22,20 +22,6 @@
background-color: #fff;
box-shadow: 0 -1px 2px 0 rgba(0, 0, 0, .05);
}
-
- .card-body-item {
- display: inline-block;
- border-right: 1px solid #e0e0e0;
- width: 250px;
- padding: 0 30px 0 10px;
- }
- .header-desc {
- overflow:hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- -o-text-overflow:ellipsis;
- }
-
</style>
<!-- 姝ｆ枃寮�濮� -->
<form class="layui-form" id="formAdvForm" lay-filter="formAdvForm" style="height: 100%">
@@ -46,7 +32,7 @@
<div>
<i class="layui-icon" style="font-size: 20px;color: #1890ff;font-weight: bold"></i>
<span id="form-name" style="margin: 0 6px;font-size: 18px;font-weight: bold;letter-spacing: 1px"></span>
- <span style="opacity: .5;font-size: small;margin-left: 5px">鎶ラ攢瀹℃壒</span>
+ <span style="opacity: .5;font-size: small;margin-left: 5px">鍑哄樊鐢宠</span>
</div>
</div>
<div class="layui-card-body" style="padding: 30px 20px">
@@ -168,8 +154,8 @@
// 琛ュ厖html
$('#customizeBox').html(businessTrip.formHtml);
// 璁惧鏄庣粏
- form.val('formAdvForm', businessTrip);
- top.convertDisabled($('#formAdvForm :input'), true);
+ // form.val('formAdvForm', businessTrip);
+ // top.convertDisabled($('#formAdvForm :input'), true);
// 璺熻繘浜�
// initFollowers(businessTrip.id);
layDateRender();
--
Gitblit v1.9.1