From 3925d9587584b514d70bb79b4fd176c9d5db38c7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 八月 2023 12:53:03 +0800
Subject: [PATCH] #出差完善
---
src/main/webapp/views/businessTrip/businessTrip.html | 4
src/main/java/com/zy/crm/manager/entity/BusinessTrip.java | 57 ++++++++++-
src/main/java/com/zy/crm/common/model/SettleDto.java | 25 +++++
src/main/java/com/zy/crm/manager/controller/BusinessTripController.java | 64 ++++++++++++
src/main/java/com/zy/crm/manager/utils/TimeCalculatorUtils.java | 113 ++++++++++++++--------
src/main/webapp/static/js/businessTrip/businessTrip.js | 32 ++----
6 files changed, 223 insertions(+), 72 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 240f573..4f24367 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -178,4 +178,29 @@
return list;
}
+ public static List<SettleDto> initBusiness(User manager ,User user) {
+ List<SettleDto> list = new ArrayList<>();
+ for (int i = 0; i < 7; i++) {
+ SettleDto dto = new SettleDto();
+ dto.setStep(i);
+ switch (i) {
+ case 1:
+ dto.setTitle("鎻愪氦鍑哄樊");
+ dto.setUserId(user.getId());
+ dto.setUsername(user.getNickname());
+ list.add(dto);
+ break;
+ case 2:
+ dto.setTitle("閮ㄩ棬缁忕悊瀹℃牳");
+ dto.setUserId(manager.getId());
+ dto.setUsername(manager.getNickname());
+ list.add(dto);
+ break;
+ default:
+ break;
+ }
+ }
+ return list;
+ }
+
}
diff --git a/src/main/java/com/zy/crm/manager/controller/BusinessTripController.java b/src/main/java/com/zy/crm/manager/controller/BusinessTripController.java
index 48a9700..f76e35b 100644
--- a/src/main/java/com/zy/crm/manager/controller/BusinessTripController.java
+++ b/src/main/java/com/zy/crm/manager/controller/BusinessTripController.java
@@ -1,5 +1,6 @@
package com.zy.crm.manager.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -9,11 +10,14 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.crm.common.model.SettleDto;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.BusinessTrip;
import com.zy.crm.manager.service.BusinessTripService;
import com.zy.crm.manager.utils.CarNumberUtils;
import com.zy.crm.manager.utils.TimeCalculatorUtils;
+import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +28,8 @@
@Autowired
private BusinessTripService businessTripService;
+ @Autowired
+ private UserService userService;
@RequestMapping(value = "/businessTrip/{id}/auth")
@ManagerAuth
@@ -61,7 +67,9 @@
@RequestMapping(value = "/businessTrip/add/auth")
@ManagerAuth
public R add(BusinessTrip businessTrip) {
-
+ if (Cools.isEmpty(businessTrip) || null==businessTrip.getId()){
+ return R.error();
+ }
Date now = new Date();
//鍒ゆ柇杞︾墝鍙�
if (businessTrip.getBusinessTransportation()==5 || businessTrip.getBusinessTransportation()==4){
@@ -69,16 +77,38 @@
if (!carNumberBoolean){
return R.error("璇疯緭鍏ユ湁鏁堣溅鐗屽彿");
}
+ }else {
+ businessTrip.setCarNumber("鏃�");
}
businessTrip.setBusinessPeersId(System.currentTimeMillis());
-// businessTrip.setBusinessDuration(TimeCalculatorUtils.getDifferenceDayDouble(businessTrip.getBusinessStartTimeDay$(),businessTrip.getBusinessEndTimeDay$()));
- businessTrip.setBusinessTripDays(TimeCalculatorUtils.getDifferenceDayInt(businessTrip.getBusinessStartTime(),businessTrip.getBusinessEndTime()));
+
+ if (!TimeCalculatorUtils.CompareData(businessTrip.getBusinessStartTime(),businessTrip.getBusinessEndTime())){
+ return R.error("缁撴潫鏃堕棿搴斿ぇ浜庣瓑浜庡紑濮嬫椂闂�");
+ }
+
+ if (TimeCalculatorUtils.DifferenceYest(businessTrip.getBusinessStartTime(),businessTrip.getBusinessEndTime())!=0){
+ int month = TimeCalculatorUtils.DifferenceMonth(businessTrip.getBusinessStartTime(), businessTrip.getBusinessEndTime());
+ int yest = TimeCalculatorUtils.DifferenceYest(businessTrip.getBusinessStartTime(), businessTrip.getBusinessEndTime());
+ int i = month + yest * 12;
+ if (i>12){
+ return R.error("鍑哄樊鏃堕暱涓嶅彲瓒呰繃涓�骞�");
+ }
+ }
+
+ businessTrip.setBusinessDuration(TimeCalculatorUtils.DifferenceDayMorningAfternoon(businessTrip.getBusinessStartTime(),businessTrip.getBusinessEndTime(),businessTrip.getBusinessStartTimeDay(),businessTrip.getBusinessEndTimeDay()));
+ businessTrip.setBusinessTripDays(TimeCalculatorUtils.DifferenceDayInt(businessTrip.getBusinessStartTime(),businessTrip.getBusinessEndTime()));
businessTrip.setUserId(getUserId());
businessTrip.setDeptId(getDeptId());
businessTrip.setCreateTime(now);
businessTrip.setUserId(getUserId());
businessTrip.setUpdateTime(now);
+ businessTrip.setUpdateId(getUserId());
businessTrip.setStatus(0);
+ businessTrip.setSettle(1);
+
+ User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+
+ businessTrip.setSettleMsg(JSON.toJSONString(SettleDto.initBusiness(manager,getUser())));
businessTripService.insert(businessTrip);
return R.ok();
@@ -90,6 +120,34 @@
if (Cools.isEmpty(businessTrip) || null==businessTrip.getId()){
return R.error();
}
+ Date now = new Date();
+ //鍒ゆ柇杞︾墝鍙�
+ if (businessTrip.getBusinessTransportation()==5 || businessTrip.getBusinessTransportation()==4){
+ boolean carNumberBoolean = CarNumberUtils.isValidLicensePlate(businessTrip.getCarNumber());
+ if (!carNumberBoolean){
+ return R.error("璇疯緭鍏ユ湁鏁堣溅鐗屽彿");
+ }
+ }else {
+ businessTrip.setCarNumber("鏃�");
+ }
+ businessTrip.setBusinessPeersId(System.currentTimeMillis());
+
+ if (!TimeCalculatorUtils.CompareData(businessTrip.getBusinessStartTime(),businessTrip.getBusinessEndTime())){
+ return R.error("缁撴潫鏃堕棿搴斿ぇ浜庣瓑浜庡紑濮嬫椂闂�");
+ }
+
+ if (TimeCalculatorUtils.DifferenceYest(businessTrip.getBusinessStartTime(),businessTrip.getBusinessEndTime())!=0){
+ int month = TimeCalculatorUtils.DifferenceMonth(businessTrip.getBusinessStartTime(), businessTrip.getBusinessEndTime());
+ int yest = TimeCalculatorUtils.DifferenceYest(businessTrip.getBusinessStartTime(), businessTrip.getBusinessEndTime());
+ int i = month + yest * 12;
+ if (i>12){
+ return R.error("鍑哄樊鏃堕暱涓嶅彲瓒呰繃涓�骞�");
+ }
+ }
+ businessTrip.setBusinessDuration(TimeCalculatorUtils.DifferenceDayMorningAfternoon(businessTrip.getBusinessStartTime(),businessTrip.getBusinessEndTime(),businessTrip.getBusinessStartTimeDay(),businessTrip.getBusinessEndTimeDay()));
+ businessTrip.setBusinessTripDays(TimeCalculatorUtils.DifferenceDayInt(businessTrip.getBusinessStartTime(),businessTrip.getBusinessEndTime()));
+ businessTrip.setUpdateTime(now);
+ businessTrip.setUpdateId(getUserId());
businessTripService.updateById(businessTrip);
return R.ok();
}
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 6ff5444..c77c54f 100644
--- a/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java
+++ b/src/main/java/com/zy/crm/manager/entity/BusinessTrip.java
@@ -7,8 +7,12 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.crm.manager.utils.TimeCalculatorUtils;
+import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
+import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.DicService;
+import com.zy.crm.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -142,7 +146,7 @@
*/
@ApiModelProperty(value= "鍑哄樊鏃堕暱")
@TableField("business_duration")
- private Long businessDuration;
+ private Double businessDuration;
/**
* 鍑哄樊澶╂暟
@@ -280,7 +284,7 @@
public BusinessTrip() {}
- public BusinessTrip(String businessTripReasons, Integer businessTransportation, Integer businessReturn, String businessStartProvince, String businessStartCity, String businessStartDistrict, String businessStartTown, String businessStartAddr, String businessEndProvince, String businessEndCity, String businessEndDistrict, String businessEndTown, String businessEndAddr, Date businessStartTime, Date businessEndTime, Long businessDuration, Integer businessTripDays, String businessNotes, String businessPeers, Long businessPeersId, String carNumber, String kilometers, Long userId, Long deptId, Long hostId, Date createTime, Date updateTime, Long updateId, String form, Integer settle, String settleMsg, Integer status, Integer businessTripType, Integer businessStartTimeDay, Integer businessEndTimeDay) {
+ public BusinessTrip(String businessTripReasons, Integer businessTransportation, Integer businessReturn, String businessStartProvince, String businessStartCity, String businessStartDistrict, String businessStartTown, String businessStartAddr, String businessEndProvince, String businessEndCity, String businessEndDistrict, String businessEndTown, String businessEndAddr, Date businessStartTime, Date businessEndTime, Double businessDuration, Integer businessTripDays, String businessNotes, String businessPeers, Long businessPeersId, String carNumber, String kilometers, Long userId, Long deptId, Long hostId, Date createTime, Date updateTime, Long updateId, String form, Integer settle, String settleMsg, Integer status, Integer businessTripType, Integer businessStartTimeDay, Integer businessEndTimeDay) {
this.businessTripReasons = businessTripReasons;
this.businessTransportation = businessTransportation;
this.businessReturn = businessReturn;
@@ -382,6 +386,47 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public String getUpdateId$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateId);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUserId$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.userId);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getDeptId$(){
+ DeptService service = SpringUtils.getBean(DeptService.class);
+ Dept dept = service.selectById(this.deptId);
+ if (!Cools.isEmpty(dept)){
+ return String.valueOf(dept.getName());
+ }
+ return null;
+ }
+
+ public String getSettle$(){
+ if (null == this.settle){ return null; }
+ switch (this.settle){
+ case 1:
+ return "绛夊緟鎵瑰噯";
+ case 2:
+ return "瀹℃壒閫氳繃";
+ default:
+ return String.valueOf(this.settle);
+ }
+ }
+
+
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
@@ -432,9 +477,9 @@
if (null == this.businessStartTimeDay){ return null; }
switch (this.businessStartTimeDay){
case 1:
- return TimeCalculatorUtils.getYestMonthDay(this.businessStartTime)+ "涓婂崍";
+ return TimeCalculatorUtils.timeYestMonthDay(this.businessStartTime)+ "涓婂崍";
case 2:
- return TimeCalculatorUtils.getYestMonthDay(this.businessStartTime)+ "涓嬪崍";
+ return TimeCalculatorUtils.timeYestMonthDay(this.businessStartTime)+ "涓嬪崍";
default:
// return String.valueOf(this.status);
return "鏈煡";
@@ -445,9 +490,9 @@
if (null == this.businessEndTimeDay){ return null; }
switch (this.businessTransportation){
case 1:
- return TimeCalculatorUtils.getYestMonthDay(this.businessEndTime)+ "涓婂崍";
+ return TimeCalculatorUtils.timeYestMonthDay(this.businessEndTime)+ "涓婂崍";
case 2:
- return TimeCalculatorUtils.getYestMonthDay(this.businessEndTime)+ "涓嬪崍";
+ return TimeCalculatorUtils.timeYestMonthDay(this.businessEndTime)+ "涓嬪崍";
default:
// return String.valueOf(this.status);
return "鏈煡";
diff --git a/src/main/java/com/zy/crm/manager/utils/TimeCalculatorUtils.java b/src/main/java/com/zy/crm/manager/utils/TimeCalculatorUtils.java
index 3def1fc..880a559 100644
--- a/src/main/java/com/zy/crm/manager/utils/TimeCalculatorUtils.java
+++ b/src/main/java/com/zy/crm/manager/utils/TimeCalculatorUtils.java
@@ -10,8 +10,8 @@
public class TimeCalculatorUtils {
- public static int getTimeHour(){
- //濡備綍鑾峰彇褰撳墠鏃堕棿鐨勫皬鏃舵暟锛�24灏忔椂鍒讹級锛�
+ //鑾峰彇褰撳墠鏃堕棿鐨勫皬鏃舵暟锛�24灏忔椂鍒讹級锛�
+ public static int nowTimeHour(){
// 鑾峰彇褰撳墠鏃堕棿鎴�
long timestamp = System.currentTimeMillis();
@@ -30,7 +30,8 @@
return calendar.get(java.util.Calendar.HOUR_OF_DAY);
}
- public static int getTimeHour(Date date){
+ //鑾峰彇褰撳ぉ灏忔椂鏁帮紙24灏忔椂鍒讹級涓浗鍖椾含鏃堕棿锛�
+ public static int timeTimeHour(Date date){
// 鍒涘缓TimeZone瀵硅薄锛岃缃负涓浗鍖椾含鏃堕棿
TimeZone timeZone = TimeZone.getTimeZone("Asia/Shanghai");
@@ -43,14 +44,16 @@
return calendar.get(java.util.Calendar.HOUR_OF_DAY);
}
- public static Date getYesterday(Date date){
+ //鑾峰彇鍓嶄竴澶╃殑鏃ユ湡锛堟棩鏈熷ぉ鏁板噺涓�锛�
+ public static Date timeYesterday(Date date){
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.DAY_OF_MONTH, -1);
return calendar.getTime();
}
- public static String getYestMonthDay(Date date){
+ //鑾峰彇骞存湀鏃�
+ public static String timeYestMonthDay(Date date){
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
@@ -60,51 +63,79 @@
return year+"骞�"+month+"鏈�"+day+"鏃�";
}
- public static int getDifferenceDayInt(Date startDay,Date endDay){
- return getDifferenceDayLong(startDay,endDay).intValue();
+ //鑾峰彇骞�
+ public static int timeYest(Date date){
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+
+ return calendar.get(Calendar.YEAR);
}
- public static Long getDifferenceDayLong(Date startDay,Date endDay){
- LocalDate localDateA = dateToLocalDate(startDay);
- LocalDate localDateB = dateToLocalDate(endDay);
+ //鑾峰彇鏈�
+ public static int timeMonth(Date date){
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
- return getDifferenceDays(localDateA, localDateB);
+ return calendar.get(Calendar.MONTH) + 1;
}
- public static Long getDifferenceDayDouble(String startDay,String endDay){
- // 瀹氫箟鏃ユ湡瀛楃涓茬殑鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy骞碝鏈坉鏃hh:mm");
+ //鑾峰彇鏃�
+ public static int timeDay(Date date){
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+
+ return calendar.get(Calendar.DAY_OF_MONTH);
+ }
+ //鑾峰彇骞村樊寮�
+ public static int DifferenceYest(Date startDay,Date endDay){
+ int startYest = timeYest(startDay);
+ int endYest = timeYest(endDay);
+ return endYest-startYest;
+ }
+ //鑾峰彇鏈堝樊寮�
+ public static int DifferenceMonth(Date startDay,Date endDay){
+ int startMonth = timeMonth(startDay);
+ int endMonth = timeMonth(endDay);
+ return endMonth-startMonth;
+ }
+ //鑾峰彇澶╁樊寮�
+ public static int DifferenceDayInt(Date startDay,Date endDay){
+ return DifferenceDayLong(startDay,endDay).intValue();
+ }
+ //鑾峰彇澶╁樊寮�
+ public static Long DifferenceDayLong(Date startDay,Date endDay){
+
+ LocalDate a = LocalDate.of(timeYest(startDay), timeMonth(startDay), timeDay(startDay));
+ LocalDate b = LocalDate.of(timeYest(endDay), timeMonth(endDay), timeDay(endDay));
+
+ return ChronoUnit.DAYS.between(a, b)+1;
+ }
+ //鑾峰彇澶╁樊寮�
+ public static Double DifferenceDayMorningAfternoon(Date startDay,Date endDay,int startTime,int endTime){
+ double between = DifferenceDayLong(startDay, endDay).doubleValue();
+ if (startTime==2){
+ between = between-0.5;
+ }
+ if (endTime == 1){
+ between = between-0.5;
+ }
+ return between;
+ }
+
+ public static boolean CompareData(Date startDay,Date endDay){
// 灏嗘棩鏈熷瓧绗︿覆瑙ｆ瀽涓篖ocalDate瀵硅薄
- LocalDate dateA = LocalDate.parse(startDay, formatter);
- LocalDate dateB = LocalDate.parse(endDay, formatter);
+ LocalDate a = LocalDate.of(timeYest(startDay), timeMonth(startDay), timeDay(startDay));
+ LocalDate b = LocalDate.of(timeYest(endDay), timeMonth(endDay), timeDay(endDay));
- // 璁＄畻鏃ユ湡瀵硅薄涔嬮棿鐨勭浉闅斿ぉ鏁�
- return ChronoUnit.DAYS.between(dateA, dateB);
-
- }
-
- private static String getDatePart(String dateTime) {
- int index = dateTime.indexOf(" ");
- if (index != -1) {
- return dateTime.substring(0, index);
+ // 姣旇緝鏃ユ湡
+ if (a.isAfter(b)) {
+ return false;
+ } else if (a.isBefore(b)) {
+ return true;
+ } else {
+ return true;
}
- return dateTime;
}
- private static String getTimePart(String dateTime) {
- int index = dateTime.indexOf(" ");
- if (index != -1) {
- return dateTime.substring(index + 1);
- }
- return "";
- }
-
- private static LocalDate dateToLocalDate(Date date) {
- return date.toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDate();
- }
-
- private static long getDifferenceDays(LocalDate dateA, LocalDate dateB) {
- return ChronoUnit.DAYS.between(dateA, dateB);
- }
}
diff --git a/src/main/webapp/static/js/businessTrip/businessTrip.js b/src/main/webapp/static/js/businessTrip/businessTrip.js
index 6dc5bb3..18dabfd 100644
--- a/src/main/webapp/static/js/businessTrip/businessTrip.js
+++ b/src/main/webapp/static/js/businessTrip/businessTrip.js
@@ -27,38 +27,30 @@
// {type: 'checkbox'},
{field: 'id', align: 'center',title: 'ID',hide: true}
,{field: 'businessTripReasons', align: 'center',title: '鍑哄樊浜嬬敱',hide: false}
- ,{field: 'businessTransportation', align: 'center',title: '浜ら�氬伐鍏�',hide: false}
- ,{field: 'businessReturn', align: 'center',title: '鍗曠▼寰�杩�',hide: false}
- ,{field: 'businessStartProvince', align: 'center',title: '鍑哄彂鐪�',hide: true}
- ,{field: 'businessStartCity', align: 'center',title: '鍑哄彂甯�',hide: true}
- ,{field: 'businessStartDistrict', align: 'center',title: '鍑哄彂鍘�',hide: true}
- ,{field: 'businessStartTown', align: 'center',title: '鍑哄彂闀�',hide: true}
+ ,{field: 'businessTransportation$', align: 'center',title: '浜ら�氬伐鍏�',hide: false}
+ ,{field: 'businessReturn$', align: 'center',title: '鍗曠▼寰�杩�',hide: false}
,{field: 'businessStartAddr', align: 'center',title: '鍑哄彂鍦�', templet:function(d){return emptyShow(d.businessStartAddr)},hide: true}
,{field: 'businessStartAddr$', align: 'center',title: '鍑哄彂鍦�',hide: false}
- ,{field: 'businessEndProvince', align: 'center',title: '鐩殑鐪�',hide: true}
- ,{field: 'businessEndCity', align: 'center',title: '鐩殑甯�',hide: true}
- ,{field: 'businessEndDistrict', align: 'center',title: '鐩殑鍘�',hide: true}
- ,{field: 'businessEndTown', align: 'center',title: '鐩殑闀�',hide: true}
,{field: 'businessEndAddr', align: 'center',title: '鐩殑鍦�', templet:function(d){return emptyShow(d.businessEndAddr)},hide: true}
- ,{field: 'businessEndAddrr$', align: 'center',title: '鐩殑鍦�',hide: false}
- ,{field: 'businessStartTimeDay$', align: 'center',title: '鍑哄彂鏃ユ湡',hide: false}
- ,{field: 'businessEndTimeDay$', align: 'center',title: '缁撴潫鏃ユ湡',hide: false}
+ ,{field: 'businessEndAddr$', align: 'center',title: '鐩殑鍦�',hide: false}
+ ,{field: 'businessStartTimeDay$', align: 'center',title: '鍑哄彂鏃ユ湡',hide: false,width: 165}
+ ,{field: 'businessEndTimeDay$', align: 'center',title: '缁撴潫鏃ユ湡',hide: false,width: 165}
,{field: 'businessDuration', align: 'center',title: '鍑哄樊鏃堕暱',hide: false}
,{field: 'businessTripDays', align: 'center',title: '鍑哄樊澶╂暟',hide: false}
- ,{field: 'businessNotes', align: 'center',title: '鍑哄樊澶囨敞',hide: false}
,{field: 'businessPeers', align: 'center',title: '鍑鸿浜�',hide: false}
,{field: 'businessPeersId', align: 'center',title: '鍚岃浜篒D',hide: true}
,{field: 'carNumber', align: 'center',title: '鑷┚绉佸杞﹁溅鐗屽彿',hide: false}
,{field: 'kilometers', align: 'center',title: '鑷┚绉佸杞﹁绋嬫槑缁嗗強鍏噷鏁�',hide: false}
- ,{field: 'userId', align: 'center',title: '鍒涘缓浜�',hide: false}
- ,{field: 'deptId', align: 'center',title: '鎵�灞為儴闂�',hide: false}
+ ,{field: 'userId$', align: 'center',title: '鐢宠浜�',hide: false}
+ ,{field: 'deptId$', align: 'center',title: '鎵�灞為儴闂�',hide: false}
,{field: 'hostId', align: 'center',title: 'hostId',hide: true}
- ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false}
- ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false}
- ,{field: 'updateId', align: 'center',title: '鏇存柊浜哄憳ID',hide: true}
- ,{field: 'settle', align: 'center',title: '杩涘害',hide: false}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false,width: 125}
+ ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false,width: 125}
+ ,{field: 'updateId$', align: 'center',title: '鏇存柊浜哄憳',hide: false}
+ ,{field: 'settle$', align: 'center',title: '杩涘害',hide: false}
,{field: 'status$', align: 'center',title: '鐘舵��',hide: false}
,{field: 'businessTripType', align: 'center',title: '绫诲瀷',hide: true}
+ ,{field: 'businessNotes', align: 'center',title: '鍑哄樊澶囨敞',hide: false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/views/businessTrip/businessTrip.html b/src/main/webapp/views/businessTrip/businessTrip.html
index 7ecf9c7..a69a2be 100644
--- a/src/main/webapp/views/businessTrip/businessTrip.html
+++ b/src/main/webapp/views/businessTrip/businessTrip.html
@@ -207,7 +207,7 @@
</div>
</div>
<!--鑷┚-->
- <blockquote class="layui-elem-quote" style="margin-left: 30px;padding: 8px 15px;">鑷┚淇℃伅</blockquote>
+ <blockquote class="layui-elem-quote" style="margin-left: 30px;padding: 8px 15px;">鏃ユ湡淇℃伅</blockquote>
<div class="layui layui-row">
<div class="layui-col-md6">
<div class="layui-form-item">
@@ -248,7 +248,7 @@
</div>
<!--鍏跺畠-->
- <blockquote class="layui-elem-quote" style="margin-left: 30px;padding: 8px 15px;">琛岀▼淇℃伅</blockquote>
+ <blockquote class="layui-elem-quote" style="margin-left: 30px;padding: 8px 15px;">鍏跺畠淇℃伅</blockquote>
<div class="layui layui-row">
<div class="layui-col-md6">
<div class="layui-form-item">
--
Gitblit v1.9.1