From 746bc3009489b5fe644666cbed138582726f498a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 07 四月 2021 08:13:59 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locDetl/locDetl.html | 14
src/main/webapp/static/layuiadmin/tpl/locChart.html | 58 ++++++
src/main/webapp/views/locStatis/locStatis.html | 4
src/main/resources/mapper/LocDetlMapper.xml | 10
src/main/webapp/static/js/mat/mat.js | 221 +++++++++++------------
src/main/webapp/static/css/tree.css | 6
src/main/webapp/views/mat/mat.html | 107 +++++++++++
src/main/webapp/static/js/locStatis/locStatis.js | 51 +++--
src/main/webapp/static/css/common.css | 5
src/main/webapp/static/js/locDetl/locDetl.js | 8
src/main/java/zy/cloud/wms/manager/controller/MatController.java | 11
src/main/webapp/static/js/ioWorks/stockIn.js | 1
src/main/resources/mapper/MatMapper.xml | 2
src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java | 17 +
src/main/resources/application.yml | 2
15 files changed, 356 insertions(+), 161 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
index 1d9eb87..70c85fd 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java
@@ -14,7 +14,9 @@
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.LocDetl;
+import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.service.LocDetlService;
+import zy.cloud.wms.manager.service.MatService;
import java.util.ArrayList;
import java.util.HashMap;
@@ -26,6 +28,8 @@
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/locDetl/queryDetl/auth")
@ManagerAuth
@@ -55,6 +59,11 @@
if (Cools.isEmpty(nodeId)) {
nodeId = getOriginNode().getId();
param.put("node_id", String.valueOf(nodeId));
+ }
+ Object tagId = param.get("tag_id");
+ if (Cools.isEmpty(tagId)) {
+ tagId = getOriginTag().getId();
+ param.put("tag_id", String.valueOf(tagId));
}
if (!Cools.isEmpty(param.get("update_time"))){
String val = String.valueOf(param.get("update_time"));
@@ -148,4 +157,12 @@
return R.ok();
}
+ @RequestMapping(value = "/locDetl/chart/auth", method = RequestMethod.POST)
+ @ManagerAuth
+ public R chart(@RequestParam String matnr) {
+ Mat mat = matService.selectByMatnr(matnr);
+ List<LocDetl> locDetls = locDetlService.findOfSort(matnr);
+ return R.ok(matnr + (mat==null?"": " - " + mat.getMaktx())).add(locDetls);
+ }
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/MatController.java b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
index 6f05bf6..365eee8 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
@@ -25,10 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class MatController extends BaseController {
@@ -83,6 +80,10 @@
@RequestMapping(value = "/mat/add/auth")
@ManagerAuth
public R add(Mat mat) {
+ mat.setCreateBy(getUserId());
+ mat.setCreateTime(new Date());
+ mat.setUpdateBy(getUserId());
+ mat.setUpdateTime(new Date());
matService.insert(mat);
return R.ok();
}
@@ -93,6 +94,8 @@
if (Cools.isEmpty(mat) || null==mat.getId()){
return R.error();
}
+ mat.setUpdateBy(getUserId());
+ mat.setUpdateTime(new Date());
matService.updateById(mat);
return R.ok();
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 334741f..750fc4a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -53,4 +53,4 @@
endpoint: http://oss-cn-hangzhou.aliyuncs.com
asrs:
- baseUrl: http://192.168.110.56:8080/htwms
+ baseUrl: http://localhost:8081/htwms
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 3bf1b0d..a2f2421 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -54,8 +54,11 @@
mld.*
FROM man_loc_detl mld
LEFT JOIN man_node mn ON mld.node_id = mn.id
+ LEFT JOIN man_mat mm ON mld.matnr = mm.matnr
+ LEFT JOIN man_tag mt ON mm.tag_id = mt.id
WHERE 1=1
- AND (CHARINDEX(#{node_id}, ','+mn.path+',') > 0 OR mn.id = #{node_id})
+ AND (CHARINDEX(','+#{node_id}+',', ','+mn.path+',') > 0 OR mn.id = #{node_id})
+ AND (CHARINDEX(','+#{tag_id}+',', ','+mt.path+',') > 0 OR mt.id = #{tag_id})
<include refid="locDetlCondition"></include>
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -65,8 +68,11 @@
count(1)
FROM man_loc_detl mld
LEFT JOIN man_node mn ON mld.node_id = mn.id
+ LEFT JOIN man_mat mm ON mld.matnr = mm.matnr
+ LEFT JOIN man_tag mt ON mm.tag_id = mt.id
WHERE 1=1
- AND (CHARINDEX(#{node_id}, ','+mn.path+',') > 0 OR mn.id = #{node_id})
+ AND (CHARINDEX(','+#{node_id}+',', ','+mn.path+',') > 0 OR mn.id = #{node_id})
+ AND (CHARINDEX(','+#{tag_id}+',', ','+mt.path+',') > 0 OR mt.id = #{tag_id})
<include refid="locDetlCondition"></include>
</select>
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index cc2280a..0ed2811 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -37,7 +37,7 @@
FROM man_mat mm
LEFT JOIN man_tag mt ON mm.tag_id = mt.id
WHERE 1=1
- AND (CHARINDEX(#{tagId}, ','+mt.path+',') > 0 OR mt.id = #{tagId})
+ AND (CHARINDEX(','+#{tagId}+',', ','+mt.path+',') > 0 OR mt.id = #{tagId})
<if test="matnr != null and matnr != ''">
and mm.matnr like concat('%',#{matnr},'%')
</if>
diff --git a/src/main/webapp/static/css/common.css b/src/main/webapp/static/css/common.css
index 8255275..ec30bf6 100644
--- a/src/main/webapp/static/css/common.css
+++ b/src/main/webapp/static/css/common.css
@@ -249,3 +249,8 @@
line-height: 1;
color: #ed4014;
}
+
+.admin-form {
+ padding: 25px 30px 0 0 !important;
+ margin: 0 !important;
+}
diff --git a/src/main/webapp/static/css/tree.css b/src/main/webapp/static/css/tree.css
index 48e93e8..9e5ac19 100644
--- a/src/main/webapp/static/css/tree.css
+++ b/src/main/webapp/static/css/tree.css
@@ -8,9 +8,9 @@
border-top: none;
padding: 10px 5px;
overflow: auto;
- height: -webkit-calc(100vh - 125px);
- height: -moz-calc(100vh - 125px);
- height: calc(100vh - 145px);
+ height: -webkit-calc(100vh - 100px);
+ height: -moz-calc(100vh - 100px);
+ height: calc(100vh - 100px);
}
.layui-tree-entry .layui-tree-txt {
padding: 0 5px;
diff --git a/src/main/webapp/static/js/ioWorks/stockIn.js b/src/main/webapp/static/js/ioWorks/stockIn.js
index bbba770..eed7ff0 100644
--- a/src/main/webapp/static/js/ioWorks/stockIn.js
+++ b/src/main/webapp/static/js/ioWorks/stockIn.js
@@ -231,7 +231,6 @@
done: function (data) {
$('.ew-tree-table-box').css('height', '100%');
insTb.expandAll();
- tbDataList = data;
}
});
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 90c2011..a6e87f7 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -23,10 +23,10 @@
,{field: 'locNo', align: 'center',title: '璐т綅', templet: '#locNoTpl'}
// ,{field: 'nodeId$', align: 'center',title: '鎵�灞炶揣浣�',event: 'nodeId', style: 'cursor:pointer'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
- ,{field: 'anfme', align: 'center',title: '搴撳瓨浣欓噺'}
+ ,{field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
- ,{field: 'name', align: 'center',title: '鍚嶇О'}
+ ,{field: 'name', align: 'center',title: '鍚嶇О', hide: true}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '鍨嬪彿', hide: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true}
@@ -36,7 +36,7 @@
,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'custName', align: 'center',title: '瀹㈡埛鍚嶇О', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
- ,{field: 'count', align: 'center',title: '鏁伴噺'}
+ ,{field: 'count', align: 'center',title: '鏁伴噺', hide: true}
,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true}
,{field: 'status$', align: 'center',title: '鐘舵��', hide: true}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',event: 'createBy', style: 'cursor:pointer'}
@@ -45,7 +45,7 @@
// ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/locStatis/locStatis.js b/src/main/webapp/static/js/locStatis/locStatis.js
index bffdc77..15e7678 100644
--- a/src/main/webapp/static/js/locStatis/locStatis.js
+++ b/src/main/webapp/static/js/locStatis/locStatis.js
@@ -1,3 +1,4 @@
+
var pageCurr;
function getCol() {
var cols = [
@@ -7,9 +8,38 @@
arrRemove(detlCols, "field", "anfme")
arrRemove(detlCols, "field", "zpallet")
cols.push.apply(cols, detlCols);
- // cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
- // )
+ cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150});
return cols;
+}
+
+function right(data){
+ top.popupRight = top.layui.admin.popupRight({
+ id: 'LAY_adminPopupLayer_LOCCHART'
+ , area: '550px'
+ , success: function(layero, index){
+ var result = null;
+ $.ajax({
+ url: baseUrl + "/locDetl/chart/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {matnr: data.matnr},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ result = res;
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ top.layui.view(this.id).render('locChart', {res: result});
+ }
+ , end: function () {
+ $(".layui-laypage-btn")[0].click();
+ }
+ });
}
layui.use(['table','laydate', 'form'], function(){
@@ -97,22 +127,7 @@
switch (obj.event) {
// 璇︽儏
case 'detail':
- layer.open({
- type: 2,
- title: '璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: 'locDetl_detail.html',
- success: function(layero, index){
- setFormVal(layer.getChildFrame('#detail', index), data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- }
- });
+ right(data);
break;
}
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 2233719..bace985 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -1,11 +1,48 @@
var pageCurr;
var printMatCodeNos = [];
-layui.use(['table','laydate', 'form'], function(){
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'treeTable', 'admin', 'xmSelect'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
+ var admin = layui.admin;
+ var treeTable = layui.treeTable;
+ var xmSelect = layui.xmSelect;
+
+ // 鍟嗗搧鍒嗙被鏁版嵁
+ var insTb = treeTable.render({
+ elem: '#tag',
+ url: baseUrl+'/tag/list/auth',
+ headers: {token: localStorage.getItem('token')},
+ tree: {
+ iconIndex: 2, // 鎶樺彔鍥炬爣鏄剧ず鍦ㄧ鍑犲垪
+ isPidData: true, // 鏄惁鏄痠d銆乸id褰㈠紡鏁版嵁
+ idName: 'id', // id瀛楁鍚嶇О
+ pidName: 'parentId' // pid瀛楁鍚嶇О
+ },
+ cols: [[
+ {type: 'checkbox'}
+ ,{type: 'numbers'}
+ ,{field: 'name', align: 'left',title: '鍚嶇О', minWidth: 150}
+ ,{field: 'type$', align: 'center',title: '绫诲瀷'}
+ ,{field: 'leading', align: 'center',title: '璐熻矗浜�'}
+ ,{field: 'img', align: 'center',title: '鍥剧墖', hide: true}
+ ,{field: 'sort', align: 'center',title: '鎺掑簭', hide: true}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ]],
+ done: function (data) {
+ $('.ew-tree-table-box').css('height', '100%');
+ insTb.expandAll();
+ }
+ });
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -108,18 +145,7 @@
var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
case 'addData':
- layer.open({
- type: 2,
- title: '鏂板',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- content: 'mat_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-edit', index).hide();
- clearFormVal(layer.getChildFrame('#detail', index));
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- }
- });
+ showEditModel()
break;
case 'deleteData':
var data = checkStatus.data;
@@ -232,46 +258,77 @@
}
});
break;
- // 璇︽儏
- case 'detail':
- layer.open({
- type: 2,
- title: '璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: 'mat_detail.html',
- success: function(layero, index){
- setFormVal(layer.getChildFrame('#detail', index), data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- }
- });
- break;
// 缂栬緫
case 'edit':
- layer.open({
- type: 2,
- title: '淇敼',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- content: 'mat_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-save', index).hide();
- setFormVal(layer.getChildFrame('#detail', index), data, false);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
- top.convertDisabled(layer.getChildFrame('#id', index), true);
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- }
- });
+ showEditModel(data)
break;
}
});
+
+ /* 鏄剧ず琛ㄥ崟寮圭獥 */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '鏉冮檺',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ // 鍥炴樉琛ㄥ崟鏁版嵁
+ form.val('detail', mData);
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(editSubmit)', function (data) {
+ data.field.tagId = insXmSel.getValue('valueStr');
+ if (isEmpty(data.field.tagId)) {
+ layer.msg('鍒嗙被涓嶈兘涓虹┖', {icon: 2});
+ return false;
+ }
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/mat/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ $(".layui-laypage-btn")[0].click();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ // 娓叉煋涓嬫媺鏍�
+ var insXmSel = xmSelect.render({
+ el: '#tagSel',
+ height: '250px',
+ data: insTb.options.data,
+ initValue: mData ? [mData.tagId] : [],
+ model: {label: {type: 'text'}},
+ prop: {
+ name: 'name',
+ value: 'id'
+ },
+ radio: true,
+ clickClose: true,
+ tree: {
+ show: true,
+ indent: 15,
+ strict: false,
+ expandedKeys: true
+ }
+ });
+ // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
// 妯℃澘閫夋嫨
form.on('radio(selectTemplateRadio)', function (data) {
@@ -315,74 +372,6 @@
}
})
})
-
- // 鏁版嵁淇濆瓨鍔ㄤ綔
- form.on('submit(save)', function () {
- if (banMsg != null){
- layer.msg(banMsg);
- return;
- }
- method("add");
- });
-
- // 鏁版嵁淇敼鍔ㄤ綔
- form.on('submit(edit)', function () {
- method("update")
- });
-
- function method(name){
- var index = layer.load(1, {
- shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
- });
- var data = {
-// id: $('#id').val(),
- id: $('#id').val(),
- uuid: $('#uuid').val(),
- nodeId: $('#nodeId').val(),
- tagId: $('#tagId').val(),
- matnr: $('#matnr').val(),
- maktx: $('#maktx').val(),
- name: $('#name').val(),
- specs: $('#specs').val(),
- model: $('#model').val(),
- batch: $('#batch').val(),
- unit: $('#unit').val(),
- barcode: $('#barcode').val(),
- docId: $('#docId').val(),
- docNum: $('#docNum').val(),
- custName: $('#custName').val(),
- itemNum: $('#itemNum').val(),
- count: $('#count').val(),
- weight: $('#weight').val(),
- status: $('#status').val(),
- createBy: $('#createBy').val(),
- createTime: top.strToDate($('#createTime\\$').val()),
- updateBy: $('#updateBy').val(),
- updateTime: top.strToDate($('#updateTime\\$').val()),
- memo: $('#memo').val(),
-
- };
- $.ajax({
- url: baseUrl+"/mat/"+name+"/auth",
- headers: {'token': localStorage.getItem('token')},
- data: top.reObject(data),
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- parent.layer.closeAll();
- parent.$(".layui-laypage-btn")[0].click();
- $("#data-detail :input").each(function () {
- $(this).val("");
- });
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- layer.close(index);
- }
- })
- }
// 澶嶉�夋浜嬩欢
form.on('checkbox(detailCheckbox)', function (data) {
diff --git a/src/main/webapp/static/layuiadmin/tpl/locChart.html b/src/main/webapp/static/layuiadmin/tpl/locChart.html
new file mode 100644
index 0000000..de2950d
--- /dev/null
+++ b/src/main/webapp/static/layuiadmin/tpl/locChart.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <style>
+ .cool-divider {
+ margin: 0 8px;
+ display: inline-block;
+ height: .9em;
+ width: 1px;
+ vertical-align: middle;
+ position: relative;
+ top: -.06em;
+ box-sizing: border-box;
+ -webkit-tap-highlight-color: transparent;
+ margin-top: 5px !important;
+ margin-bottom: 5px !important;
+ background: #c8d1dabd;
+ }
+ </style>
+</head>
+<body>
+
+<script type="text/html" template id="TPL_businessUser">
+ <div class="layui-card">
+ <div class="layui-card-header">鍟嗗搧 <div class="cool-divider"></div> <span>{{d.params.res.msg}}</span></div>
+ <div class="layui-card-body">
+ <table class="layui-table" lay-skin="line">
+ <colgroup>
+ <col/>
+ <col/>
+ </colgroup>
+ <thead>
+ <tr>
+ <td align="center">璐т綅鍚嶇О</td>
+ <td align="center">璐т綅鏁伴噺</td>
+ </tr>
+ </thead>
+ <tbody id="locChartList">
+ {{# layui.each(d.params.res.data, function(index, item){ }}
+ <tr>
+ <td align="center"><span class="layui-text">{{item.locNo}}</span></td>
+ <td align="center"><span style="font-weight: bold">{{item.anfme}}</span></td>
+ </tr>
+ {{# }); }}
+ </tbody>
+ </table>
+ </div>
+ </div>
+</script>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 57c581e..f385353 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -40,7 +40,7 @@
</head>
<body>
-<div class="layui-fluid" style="padding-bottom: 0;">
+<div class="layui-fluid" style="padding-bottom: 0;margin-bottom: 30px">
<!-- 宸� -->
<div class="layui-row layui-col-space15">
<div class="layui-col-md3">
@@ -90,6 +90,9 @@
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
</div>
</div>
<table class="layui-hide" id="locDetl" lay-filter="locDetl"></table>
@@ -101,7 +104,7 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
@@ -111,7 +114,7 @@
</script>
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+<!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>-->
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -119,9 +122,8 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/locDetl/locDetl.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/nodeTree.js" charset="utf-8"></script>
-
-<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+<script type="text/javascript" src="../../static/js/tagTree.js" charset="utf-8"></script>
+<!--<script type="text/javascript" src="../../static/js/nodeTree.js" charset="utf-8"></script>-->
</body>
</html>
diff --git a/src/main/webapp/views/locStatis/locStatis.html b/src/main/webapp/views/locStatis/locStatis.html
index 2bdd8e0..ea0e94f 100644
--- a/src/main/webapp/views/locStatis/locStatis.html
+++ b/src/main/webapp/views/locStatis/locStatis.html
@@ -40,7 +40,9 @@
<button class="layui-btn" lay-event="exportAll" style="margin-top: -0px">瀵煎嚭鍏ㄩ儴</button>
</div>
</script>
-
+<script type="text/html" id="operate">
+ <a lay-event="detail" style="font-family: 'Bahnschrift' !important;color: #1890ff;cursor: pointer">璐т綅搴撳瓨</a>
+</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 3cad3f0..9e2666a 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -7,6 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<link rel="stylesheet" href="../../static/css/tree.css" media="all">
@@ -43,8 +44,6 @@
background-color: #eeda7c;
color: #24292e;
}
-
-
.template-preview {
height: 200px;
display: inline-block;
@@ -103,6 +102,9 @@
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
</div>
</div>
<table class="layui-hide" id="mat" lay-filter="mat"></table>
@@ -126,8 +128,7 @@
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
-<!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="edit">淇敼</a>
<button class="layui-btn layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
</script>
@@ -227,6 +228,104 @@
<div id="box" style="display: block"></div>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form">
+ <input name="id" type="hidden">
+ <input name="uuid" type="hidden">
+ <input name="nodeId" type="hidden">
+ <input name="tag_id" type="hidden">
+ <input name="model" type="hidden">
+ <input name="name" type="hidden">
+ <input name="batch" type="hidden">
+ <input name="docId" type="hidden">
+ <input name="docNum" type="hidden">
+ <input name="custName" type="hidden">
+ <input name="itemNum" type="hidden">
+ <input name="count" type="hidden">
+ <input name="weight" type="hidden">
+ <input name="weight" type="hidden">
+ <input name="status" type="hidden">
+ <input name="createBy" type="hidden">
+ <input name="updateTime$" type="hidden">
+ <input name="updateBy" type="hidden">
+ <div class="layui-row">
+
+ <div class="layui-col-md6">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍒嗙被</label>
+ <div class="layui-input-block">
+ <div id="tagSel" class="ew-xmselect-tree"></div>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曚綅</label>
+ <div class="layui-input-block">
+ <input name="unit" placeholder="璇疯緭鍏ュ崟浣�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">瑙勬牸</label>
+ <div class="layui-input-block">
+ <input name="specs" placeholder="璇疯緭鍏ヨ鏍�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+ </div>
+ </div>
+
+ </div>
+
+ <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 name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍟嗗搧鍚嶇О</label>
+ <div class="layui-input-block">
+ <input name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏉＄爜</label>
+ <div class="layui-input-block">
+ <input name="barcode" placeholder="璇疯緭鍏ユ潯鐮�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="status" lay-vertype="tips" lay-verify="required" required="">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="1">姝ｅ父</option>
+ <option value="0">绂佺敤</option>
+ </select>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <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>
+</script>
+
<!-- 鍒濆鍖栨墦鍗版ā鏉跨殑鏉″舰鐮� -->
<script type="text/javascript">
$('.template-barcode').attr("src", baseUrl+"/mac/code/auth?type=1¶m=123");
--
Gitblit v1.9.1