From cfe822097221cb29ab54d2a06e0e0eca1b8225ad Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 15:08:06 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/prior/prior.js | 6 +++---
src/main/webapp/views/prior/prior_detail.html | 14 +++++++-------
src/main/java/zy/cloud/wms/manager/controller/TagController.java | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/TagController.java b/src/main/java/zy/cloud/wms/manager/controller/TagController.java
index 0808360..511d1f7 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/TagController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/TagController.java
@@ -141,13 +141,13 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<Tag> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
+ wrapper.like("uuid", condition).or().like("name", condition);
Page<Tag> page = tagService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Tag tag : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", tag.getId());
- map.put("value", tag.getId());
+ map.put("value", tag.getUuid() + "(" + tag.getName() + ")");
result.add(map);
}
return R.ok(result);
diff --git a/src/main/webapp/static/js/prior/prior.js b/src/main/webapp/static/js/prior/prior.js
index b6bf9f3..355bfbb 100644
--- a/src/main/webapp/static/js/prior/prior.js
+++ b/src/main/webapp/static/js/prior/prior.js
@@ -104,7 +104,7 @@
type: 2,
title: '鏂板',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['30%', top.detailHeight],
content: 'prior_detail.html',
success: function(layero, index){
layer.getChildFrame('#data-detail-submit-edit', index).hide();
@@ -190,7 +190,7 @@
type: 2,
title: '璇︽儏',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['30%', top.detailHeight],
shadeClose: true,
content: 'prior_detail.html',
success: function(layero, index){
@@ -209,7 +209,7 @@
type: 2,
title: '淇敼',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['30%', top.detailHeight],
content: 'prior_detail.html',
success: function(layero, index){
layer.getChildFrame('#data-detail-submit-save', index).hide();
diff --git a/src/main/webapp/views/prior/prior_detail.html b/src/main/webapp/views/prior/prior_detail.html
index 1ef8650..8f6d5e9 100644
--- a/src/main/webapp/views/prior/prior_detail.html
+++ b/src/main/webapp/views/prior/prior_detail.html
@@ -14,7 +14,7 @@
<!-- 璇︽儏 -->
<div id="data-detail" class="layer_self_wrap">
- <form id="detail" class="layui-form">
+ <form id="detail" class="layui-form" style="text-align: center">
<div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label"><span class="not-null">*</span>I銆�銆�D锛�</label>
<div class="layui-input-inline">
@@ -33,7 +33,7 @@
<input id="name" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label"><span class="not-null">*</span>鍏宠仈鍟嗗搧锛�</label>
<div class="layui-input-inline cool-auto-complete">
<input id="matId" class="layui-input" type="text" lay-verify="required|number" style="display: none">
@@ -57,7 +57,7 @@
<input id="maktx" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label"><span class="not-null">*</span>鍏宠仈璐т綅锛�</label>
<div class="layui-input-inline cool-auto-complete">
<input id="nodeId" class="layui-input" type="text" lay-verify="required|number" style="display: none">
@@ -75,13 +75,13 @@
<!-- <input id="nodeName" class="layui-input" type="text">-->
<!-- </div>-->
<!-- </div>-->
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label">瀹夊叏搴撳瓨锛�</label>
<div class="layui-input-inline">
<input id="safeQua" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label">浼� 鍏� 绾э細</label>
<div class="layui-input-inline">
<input id="prio" class="layui-input" type="text" lay-verify="number" >
@@ -93,7 +93,7 @@
<input id="barcode" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">鐘躲��銆�鎬侊細</label>
<div class="layui-input-inline">
<select id="status">
@@ -139,7 +139,7 @@
<input id="updateTime$" class="layui-input" type="text" autocomplete="off">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">澶囥��銆�娉細</label>
<div class="layui-input-inline">
<input id="memo" class="layui-input" type="text">
--
Gitblit v1.9.1