From 75259b538d0d6bfc9cecb7d879764c379acf4252 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 21 十一月 2022 15:12:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 8 ++++++++
src/main/webapp/static/js/plan/plan.js | 4 +++-
src/main/webapp/views/plan/plan.html | 16 ++++++----------
src/main/java/com/zy/crm/manager/entity/Plan.java | 4 ++--
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 27ce18e..8a47c4f 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -63,6 +63,14 @@
@RequestMapping(value = "/plan/add/auth")
@ManagerAuth
public R add(Plan plan) {
+ Long hostId = getHostId();
+ if (planService.selectByUuid(hostId, plan.getUuid()) != null) {
+ throw new CoolException("瑙勫垝鍗曞凡瀛樺湪");
+ }
+ plan.setHostId(hostId);
+ plan.setUuid(planService.getUuid(hostId)); // 瑙勫垝鍗曚唬鍙�
+ plan.setDeptId(getDeptId()); // 鎵�灞為儴闂�
+ plan.setUserId(getUserId()); // 鎵�灞炰汉鍛�
plan.setCreateBy(getUserId());
plan.setCreateTime(new Date());
diff --git a/src/main/java/com/zy/crm/manager/entity/Plan.java b/src/main/java/com/zy/crm/manager/entity/Plan.java
index 142cb76..24ccfdf 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -96,7 +96,7 @@
*/
@ApiModelProperty(value= "鐢宠鏃ユ湡")
@TableField("apple_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
private Date appleTime;
/**
@@ -130,7 +130,7 @@
*/
@ApiModelProperty(value= "瀹屾垚鏃堕棿")
@TableField("finish_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
private Date finishTime;
/**
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 2dabb60..3db4077 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -245,12 +245,14 @@
});
layDateRender();
form.on('submit(editSubmit)', function (data) {
+ console.log(data.field);
+ data.field.planType = planType.id;
data.field.orderId = orderSel.getValue()[0] ? orderSel.getValue()[0].value : null;
data.field.cstmrId = cstmrSel.getValue()[0] ? cstmrSel.getValue()[0].value : null;
data.field.planNeed = planNeedSel.getValue()[0] ? planNeedSel.getValue()[0].value : null;
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/plan/"+(mData?'update':'add')+"/auth",
+ url: baseUrl+"/plan/add/auth",
headers: {'token': localStorage.getItem('token')},
data: data.field,
method: 'POST',
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index ebba1ce..4af9e85 100644
--- a/src/main/webapp/views/plan/plan.html
+++ b/src/main/webapp/views/plan/plan.html
@@ -141,16 +141,17 @@
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
- <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <div id="detail" lay-filter="detail" class="layui-form admin-form model-form">
<input name="id" type="hidden">
+ <!--鍩烘湰淇℃伅-->
<blockquote class="layui-elem-quote" style="margin-left: 30px;padding: 8px 15px;">鍩烘湰淇℃伅</blockquote>
<div class="layui-row">
<div class="layui-col-md6">
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鍞墠瑙勫垝鍗曞悕绉�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="name" placeholder="璇疯緭鍏ヨ鍒掑崟鍚嶇О" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="name" autocomplete="off" placeholder="璇疯緭鍏ヨ鍒掑崟鍚嶇О" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
@@ -210,16 +211,10 @@
</select>
</div>
</div>
-
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">娉ㄩ噴: </label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input class="layui-input" name="memo" placeholder="璇疯緭鍏ユ敞閲�">-->
-<!-- </div>-->
-<!-- </div>-->
</div>
</div>
+ <!--涓�у寲淇℃伅-->
<blockquote class="layui-elem-quote" style="margin-left: 30px;padding: 8px 15px;">涓�у寲淇℃伅</blockquote>
<div class="layui-row">
<div class="layui-col-md6">
@@ -228,6 +223,7 @@
</div>
</div>
+ <!--鍞墠瑙勫垝-->
<blockquote class="layui-elem-quote" style="margin-left: 30px;padding: 8px 15px;">鍞墠瑙勫垝</blockquote>
<div class="layui-row">
<div class="layui-col-md6">
@@ -286,7 +282,7 @@
<button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
</div>
- </form>
+ </div>
</script>
</html>
--
Gitblit v1.9.1