From 501fde46aac0cd02a6b7fe61cddfe1d08cfe8d1e Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 07 四月 2022 17:00:34 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/itemManager/itemManager.js | 2 +-
src/main/webapp/views/itemManager/itemManager.html | 8 +++++++-
src/main/java/zy/cloud/wms/manager/entity/Item.java | 10 ++++++++++
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 16 ++++++++++++++++
4 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index d75ccbf..a316a07 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -32,6 +32,8 @@
private FlowStatusService flowStatusService;
@Autowired
private CstmrService cstmrService;
+ @Autowired
+ private ProjectStatusService projectStatusService;
@RequestMapping(value = "/item/{id}/auth")
@ManagerAuth
@@ -284,5 +286,19 @@
return R.ok();
}
+ @RequestMapping(value = "/progressRate/auth")
+ @ManagerAuth
+ public R queryProgressRate(String condition) {
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<ProjectStatus> projectStatuses = projectStatusService.selectList(null);
+ for (ProjectStatus projectStatus : projectStatuses) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", projectStatus.getId());
+ map.put("value", projectStatus.getStatusName());
+ result.add(map);
+ }
+
+ return R.ok(result);
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index ac5887c..a448111 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -400,6 +400,16 @@
// null // 澶囨敞
// );
+ public String getProgressRate$(){
+ ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
+ ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>()
+ .eq("id", this.progressRate));
+ if (!Cools.isEmpty(id)) {
+ return id.getStatusName();
+ }
+
+ return "";
+ }
public String getProjectStatus$(){
ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>().eq("id", this.projectStatus));
diff --git a/src/main/webapp/static/js/itemManager/itemManager.js b/src/main/webapp/static/js/itemManager/itemManager.js
index 903f289..dcb41b3 100644
--- a/src/main/webapp/static/js/itemManager/itemManager.js
+++ b/src/main/webapp/static/js/itemManager/itemManager.js
@@ -28,7 +28,7 @@
,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О', width: 130}
,{field: 'inUuid', align: 'center',title: '椤圭洰缂栧彿', hide: true}
// ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
- ,{field: 'progressRate', align: 'center',title: '杩涘害'}
+ ,{field: 'progressRate$', align: 'center',title: '杩涘害'}
,{field: 'planCarInfo', align: 'center', title: '棰勮杞﹁締澶у皬', width: 115}
,{field: 'planCarnumber', align: 'center', title: '棰勮杞﹁締鏁伴噺', width: 115}
// ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
diff --git a/src/main/webapp/views/itemManager/itemManager.html b/src/main/webapp/views/itemManager/itemManager.html
index 918ae40..a5fe793 100644
--- a/src/main/webapp/views/itemManager/itemManager.html
+++ b/src/main/webapp/views/itemManager/itemManager.html
@@ -148,7 +148,13 @@
<div class="layui-form-item">
<label class="layui-form-label">杩涘害: </label>
<div class="layui-input-block cool-auto-complete">
- <input id="projectStatus" class="layui-input" name="progressRate" placeholder="璇疯緭鍏ヨ繘搴�" lay-vertype="tips">
+ <input id="progressRate" class="layui-input" name="progressRate" placeholder="璇疯緭鍏ヨ繘搴�" style="display: none" lay-vertype="tips" >
+ <input id="progressRate$" name="progressRate$" 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="progressRateByprogressRate" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="progressRateByprogressRateSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
</div>
</div>
--
Gitblit v1.9.1