From 1b941effd3153c45a2b50f5462b54a7f64a3411d Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 13 九月 2022 16:30:21 +0800
Subject: [PATCH] ##
---
src/main/webapp/static/js/projectPlan/projectPlan.js | 2
src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java | 13 ++++++
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 12 +++++-
src/main/webapp/views/projectPlan/projectPlan.html | 39 +++++++++++++------
src/main/java/zy/cloud/wms/system/controller/DeptController.java | 13 ++++++
5 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
index 304eccd..9dca124 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -118,8 +118,16 @@
return R.error();
}
- if (projectPlan.getDelay() < 0){
- throw new CoolException("寤舵湡澶╂暟涓嶅彲涓鸿礋鏁�");
+
+// if (projectPlan.getDelay() < 0){
+// throw new CoolException("寤舵湡澶╂暟涓嶅彲涓鸿礋鏁�");
+// }
+ Date endTime = projectPlan.getEndTime();
+ Date realEndTime = projectPlan.getRealEndTime();
+ //濡傛灉瀹為檯缁撴潫鏃堕棿澶т簬棰勮鏃堕棿
+ if (realEndTime.getTime() > endTime.getTime() ){
+ long day = (realEndTime.getTime() - endTime.getTime()) / 1000 / 60 / 60 / 24;
+ projectPlan.setDelay((int) day);
}
projectPlan.setModifyTime(new Date());
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
index 30099b0..54a2dc7 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
@@ -43,6 +43,8 @@
import com.baomidou.mybatisplus.annotations.TableName;
import zy.cloud.wms.manager.service.FlowStatusService;
import zy.cloud.wms.manager.service.ItemService;
+import zy.cloud.wms.system.entity.Dept;
+import zy.cloud.wms.system.service.DeptService;
import java.io.Serializable;
@@ -425,4 +427,15 @@
}
return null;
}
+
+ public String getDutyDepartment$(){
+ DeptService bean = SpringUtils.getBean(DeptService.class);
+ Dept id1 = bean.selectOne(new EntityWrapper<Dept>()
+ .eq("id", this.dutyDepartment));
+ if (id1 != null){
+ return id1.getName();
+ }else {
+ return "";
+ }
+ }
}
diff --git a/src/main/java/zy/cloud/wms/system/controller/DeptController.java b/src/main/java/zy/cloud/wms/system/controller/DeptController.java
index 9ab0c7f..e3bc8ff 100644
--- a/src/main/java/zy/cloud/wms/system/controller/DeptController.java
+++ b/src/main/java/zy/cloud/wms/system/controller/DeptController.java
@@ -131,4 +131,17 @@
return R.ok();
}
+ @RequestMapping("/dutyDepartment/auth")
+ public R dutyDeaprtment(){
+ List<Map<String,Object>> result = new ArrayList<>();
+ List<Dept> depts = deptService.selectList(null);
+ for (Dept dept : depts) {
+ Map<String,Object> content = new HashMap<>();
+ content.put("id",dept.getId());
+ content.put("value",dept.getName());
+ result.add(content);
+ }
+ return R.ok(result);
+ }
+
}
diff --git a/src/main/webapp/static/js/projectPlan/projectPlan.js b/src/main/webapp/static/js/projectPlan/projectPlan.js
index c4adcfa..e2bc492 100644
--- a/src/main/webapp/static/js/projectPlan/projectPlan.js
+++ b/src/main/webapp/static/js/projectPlan/projectPlan.js
@@ -44,7 +44,7 @@
,{field: 'delay', align: 'center',title: '寤舵湡澶╂暟', width:90}
,{field: 'delayReason', align: 'center',title: '寤舵湡鍘熷洜'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{field: 'dutyDepartment', align: 'center',title: '璐ｄ换閮ㄩ棬'}
+ ,{field: 'dutyDepartment$', align: 'center',title: '璐ｄ换閮ㄩ棬'}
,{field: 'dutyMan', align: 'center',title: '璐ｄ换浜�', width:80}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:70}
]],
diff --git a/src/main/webapp/views/projectPlan/projectPlan.html b/src/main/webapp/views/projectPlan/projectPlan.html
index 10611b7..ee29cc0 100644
--- a/src/main/webapp/views/projectPlan/projectPlan.html
+++ b/src/main/webapp/views/projectPlan/projectPlan.html
@@ -185,18 +185,36 @@
</div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">寤舵湡澶╂暟: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="delay" placeholder="璇疯緭鍏ュ欢鏈熷ぉ鏁�" type="number" oninput="if(value>100)value=0;if(value<0)value=0">-->
+<!-- </div>-->
+<!-- </div>-->
+
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">璐ｄ换閮ㄩ棬: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="dutyDepartment" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label">寤舵湡澶╂暟: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="delay" placeholder="璇疯緭鍏ュ欢鏈熷ぉ鏁�" type="number" oninput="if(value>100)value=0;if(value<0)value=0">
+ <label class="layui-form-label layui-form-required">璐ｄ换閮ㄩ棬: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input id="dutyDepartment" class="layui-input" name="dutyDepartment" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�" style="display: none" lay-vertype="tips" lay-verify="required">
+ <input id="dutyDepartment$" name="dutyDepartment$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="dutyDepartmentBydutyDepartment" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="dutyDepartmentBydutyDepartmentSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
</div>
</div>
-
-
<div class="layui-form-item">
- <label class="layui-form-label">璐ｄ换閮ㄩ棬: </label>
+ <label class="layui-form-label">寤舵湡鍘熷洜: </label>
<div class="layui-input-block">
- <input class="layui-input" name="dutyDepartment" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�">
+ <input class="layui-input" name="delayReason" placeholder="璇疯緭鍏ュ欢鏈熷師鍥�">
</div>
</div>
@@ -226,12 +244,7 @@
<input class="layui-input" name="realEndTime" id="realEndTime" placeholder="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">寤舵湡鍘熷洜: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="delayReason" placeholder="璇疯緭鍏ュ欢鏈熷師鍥�">
- </div>
- </div>
+
<div class="layui-form-item">
<label class="layui-form-label">璐ｄ换浜�: </label>
<div class="layui-input-block">
--
Gitblit v1.9.1