zy-crm.git - Gitblit

			@@ -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:

			@@ -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;

			/**

			@@ -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();

	src/main/java/com/zy/crm/common/model/SettleDto.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/crm/manager/entity/BusinessTrip.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/businessTrip/businessTrip_more.html	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史