From c36c0562f48f671d36aae11505e7ecc83b9fd042 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 10:26:30 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/result/KeyValueVo.java | 15 +++++
src/main/webapp/static/js/ioWorks/matQuery.js | 119 +++++++++++++++++++++++++++++++++++----
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 31 ++++++++++
src/main/webapp/static/css/img/icon_date.png | 0
src/main/webapp/views/order/matQuery.html | 14 ++--
5 files changed, 158 insertions(+), 21 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index 9e38fa4..a18c83d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -14,8 +14,10 @@
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.entity.param.*;
+import zy.cloud.wms.manager.entity.result.KeyValueVo;
import zy.cloud.wms.manager.service.*;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -183,6 +185,21 @@
return R.ok().add(cstmrs);
}
+ // 鑾峰彇鎵�鏈夊鎴� [閿�煎鐗圿
+ @RequestMapping("/cstmr/all/get/kv")
+ @ManagerAuth
+ public R getCstmrDataKV() {
+ List<Cstmr> cstmrs = cstmrService.selectList(new EntityWrapper<Cstmr>().eq("status", 1).orderBy("create_time", false));
+ List<KeyValueVo> valueVos = new ArrayList<>();
+ for (Cstmr cstmr : cstmrs) {
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(cstmr.getName());
+ vo.setValue(cstmr.getId());
+ valueVos.add(vo);
+ }
+ return R.ok().add(valueVos);
+ }
+
// 鑾峰彇鎵�鏈夐」鐩�
@RequestMapping("/item/all/get")
@ManagerAuth
@@ -190,5 +207,19 @@
List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false));
return R.ok().add(items);
}
+ // 鑾峰彇鎵�鏈夐」鐩�
+ @RequestMapping("/item/all/get/kv")
+ @ManagerAuth
+ public R getItemDataKV() {
+ List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false));
+ List<KeyValueVo> valueVos = new ArrayList<>();
+ for (Item item : items) {
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(item.getName());
+ vo.setValue(item.getId());
+ valueVos.add(vo);
+ }
+ return R.ok().add(valueVos);
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/result/KeyValueVo.java b/src/main/java/zy/cloud/wms/manager/entity/result/KeyValueVo.java
new file mode 100644
index 0000000..76ab4e3
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/result/KeyValueVo.java
@@ -0,0 +1,15 @@
+package zy.cloud.wms.manager.entity.result;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2021/4/13
+ */
+@Data
+public class KeyValueVo {
+
+ private String name;
+
+ private Long value;
+
+}
diff --git a/src/main/webapp/static/css/img/icon_date.png b/src/main/webapp/static/css/img/icon_date.png
new file mode 100644
index 0000000..5a50673
--- /dev/null
+++ b/src/main/webapp/static/css/img/icon_date.png
Binary files differ
diff --git a/src/main/webapp/static/js/ioWorks/matQuery.js b/src/main/webapp/static/js/ioWorks/matQuery.js
index c5b84d4..851d800 100644
--- a/src/main/webapp/static/js/ioWorks/matQuery.js
+++ b/src/main/webapp/static/js/ioWorks/matQuery.js
@@ -13,7 +13,7 @@
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
notice: 'notice/notice',
-}).use(['table','laydate', 'form', 'admin', 'notice'], function() {
+}).use(['table','laydate', 'form', 'admin', 'notice', 'xmSelect'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -21,6 +21,7 @@
var notice = layui.notice;
var layDate = layui.laydate;
var admin = layui.admin;
+ var xmSelect = layui.xmSelect;
tableIns = table.render({
elem: '#chooseData',
@@ -86,44 +87,114 @@
// 瀹㈡埛
var cstmrData;
+ // $.ajax({
+ // url: baseUrl+"/work/cstmr/all/get",
+ // headers: {'token': localStorage.getItem('token')},
+ // method: 'POST',
+ // async: false,
+ // success: function (res) {
+ // if (res.code === 200){
+ // cstmrData = res;
+ // } else {
+ // layer.msg(res.msg, {icon: 2})
+ // }
+ // }
+ // });
+ // var tpl2 = $('#cstmrSelectTpl').html();
+ // var template2 = Handlebars.compile(tpl2);
+ // var html2 = template2(cstmrData);
+ // $("#cstmr").html(html2);
+ // 鍗曢��
$.ajax({
- url: baseUrl+"/work/cstmr/all/get",
+ url: baseUrl+"/work/cstmr/all/get/kv",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
async: false,
success: function (res) {
if (res.code === 200){
- cstmrData = res;
+ cstmrData = res.data;
} else {
layer.msg(res.msg, {icon: 2})
}
}
});
- var tpl2 = $('#cstmrSelectTpl').html();
- var template2 = Handlebars.compile(tpl2);
- var html2 = template2(cstmrData);
- $("#cstmr").html(html2);
+ xmSelect.render({
+ el: '#cstmr',
+ radio: true,
+ clickClose: true,
+ filterable: true,
+ create: function(val, arr){
+ if(arr.length === 0){
+ return {
+ name: val,
+ value: val
+ }
+ }
+ },
+ model: {
+ icon: 'hidden',
+ label: {
+ type: 'text',
+ }
+ },
+ data: cstmrData
+ })
// 椤圭洰
var itemData;
+ // $.ajax({
+ // url: baseUrl+"/work/item/all/get",
+ // headers: {'token': localStorage.getItem('token')},
+ // method: 'POST',
+ // async: false,
+ // success: function (res) {
+ // if (res.code === 200){
+ // itemData = res;
+ // } else {
+ // layer.msg(res.msg, {icon: 2});
+ // }
+ // }
+ // });
+ // var tpl3 = $('#itemSelectTpl').html();
+ // var template3 = Handlebars.compile(tpl3);
+ // var html3 = template3(itemData);
+ // $("#item").html(html3);
$.ajax({
- url: baseUrl+"/work/item/all/get",
+ url: baseUrl+"/work/item/all/get/kv",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
async: false,
success: function (res) {
if (res.code === 200){
- itemData = res;
+ itemData = res.data;
} else {
- layer.msg(res.msg, {icon: 2})
+ layer.msg(res.msg, {icon: 2});
}
}
});
- var tpl3 = $('#itemSelectTpl').html();
- var template3 = Handlebars.compile(tpl3);
- var html3 = template3(itemData);
- $("#item").html(html3);
+ xmSelect.render({
+ el: '#item',
+ radio: true,
+ clickClose: true,
+ filterable: true,
+ create: function(val, arr){
+ if(arr.length === 0){
+ return {
+ name: val,
+ value: val
+ }
+ }
+ },
+ model: {
+ icon: 'hidden',
+ label: {
+ type: 'text',
+ }
+ },
+ data: itemData
+ })
+ // 寮圭獥
layer.close(index);
if (success) {
admin.open({
@@ -148,6 +219,26 @@
}
});
+
+ // // 澶氶��
+ // var demo1 = xmSelect.render({
+ // el: '#demo1',
+ // filterable: true,
+ // create: function(val, arr){
+ // if(arr.length === 0){
+ // return {
+ // name: val,
+ // value: val
+ // }
+ // }
+ // },
+ // data: [
+ // {name: '寮犱笁', value: 1, selected: true},
+ // {name: '鏉庡洓', value: 2},
+ // {name: '鐜嬩簲', value: 3, disabled: true},
+ // ]
+ // })
+
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(chooseData)', function(obj){
var data = obj.data;
diff --git a/src/main/webapp/views/order/matQuery.html b/src/main/webapp/views/order/matQuery.html
index 262fc13..2b6d24a 100644
--- a/src/main/webapp/views/order/matQuery.html
+++ b/src/main/webapp/views/order/matQuery.html
@@ -168,21 +168,21 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鍗曟嵁鏃ユ湡:</label>
<div class="layui-input-block">
- <input id="orderTime" name="orderTime" placeholder="璇疯緭鍏ュ鎴风紪鍙�" class="layui-input" lay-verify="required" autocomplete="off">
+ <input id="orderTime" name="orderTime" placeholder="璇疯緭鍏ュ崟鎹棩鏈�" class="layui-input icon-date" lay-verify="required" autocomplete="off">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰缂栧彿:</label>
+ <label class="layui-form-label layui-form-required">椤圭洰:</label>
<div class="layui-input-block">
- <select id="item" name="item" lay-verType="tips" lay-verify="required" required lay-search="">
- </select>
+ <div id="item" name="item" lay-verType="tips" lay-verify="required" required lay-search="">
+ </div>
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">瀹㈡埛缂栧彿:</label>
+ <label class="layui-form-label layui-form-required">瀹㈡埛:</label>
<div class="layui-input-block">
- <select id="cstmr" name="cstmr" lay-verType="tips" lay-verify="required" required lay-search="">
- </select>
+ <div id="cstmr" name="cstmr" lay-verType="tips" lay-verify="required" required lay-search="">
+ </div>
</div>
</div>
<div class="layui-form-item cool-button-contain">
--
Gitblit v1.9.1