From 89c7b3a61b7e182cb420a8ae0bee8b983f1311c6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 三月 2022 11:08:40 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/out.js | 14 +++++--
src/main/webapp/views/order/out.html | 47 +++++++++++++++++++++++
src/main/java/com/zy/common/model/LocDto.java | 5 ++
src/main/java/com/zy/asrs/controller/OutController.java | 2
4 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 9f10466..49d5e1c 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -92,7 +92,7 @@
}
}
if (issued > 0) {
- LocDto locDto = new LocDto("缂鸿揣", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
}
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 970d523..1786388 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -57,4 +57,9 @@
return this.matnr + "锛�" + this.maktx + "锛�";
}
+ public void setLack(boolean lack) {
+ this.lack = lack;
+ this.locNo = "缂鸿揣";
+ }
+
}
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 0337c36..1de0d0a 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -151,7 +151,7 @@
table.render({
elem: '#stoPreTab',
data: res.data,
- height: 432,
+ height: 450,
page: false,
limit: Number.MAX_VALUE,
cellMinWidth: 100,
@@ -161,14 +161,16 @@
{field: 'title', title: '鍟嗗搧', align: 'center', width: 350},
{field: 'batch', title: '鎵瑰彿', merge: ['title'], align: 'center'},
// {field: 'anfme', title: '鎬绘暟閲�', merge: ['title'], align: 'center', style: 'font-weight: bold', width: 90},
- {field: 'locNo', title: '璐т綅', align: 'center', width: 90},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ {field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
+ {field: 'staNo', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
// {field: 'remQty', title: '浣欓噺', align: 'center', width: 80},
// {field: 'total', title: '鎬婚噺', align: 'center', width: 90},
]],
- done: function () {
+ done: function (res) {
tableMerge.render(this);
- $('.layui-table-body.layui-table-main').css("overflow", "auto")
+ $('.layui-table-body.layui-table-main').css("overflow", "auto");
+
}
});
@@ -183,6 +185,10 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
}
});
+ form.on('select(tbBasicTbStaNos)', function (data) {
+ alert("ajax璇锋眰锛�" + JSON.stringify(data))
+ return false;
+ });
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index a00a8e6..cae77ac 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -21,6 +21,31 @@
margin: 0 !important;
}
+ .layui-table-view .layui-table-cell .layui-select-title .layui-input {
+ height: 28px;
+ line-height: 28px;
+ }
+
+ .layui-table-view [lay-size="lg"] .layui-table-cell .layui-select-title .layui-input {
+ height: 40px;
+ line-height: 40px;
+ }
+
+ .layui-table-view [lay-size="lg"] .layui-table-cell .layui-select-title .layui-input {
+ height: 40px;
+ line-height: 40px;
+ }
+
+ .layui-table-view [lay-size="sm"] .layui-table-cell .layui-select-title .layui-input {
+ height: 20px;
+ line-height: 20px;
+ }
+
+ .layui-table-view [lay-size="sm"] .layui-table-cell .layui-btn-xs {
+ height: 18px;
+ line-height: 18px;
+ }
+
/* 鏉冮檺鎺у埗 */
#btn-pakoutPreview {
display: none;
@@ -137,6 +162,27 @@
</div>
</script>
+<script type="text/html" id="tbBasicTbStaNos">
+ <div class="ew-select-fixed">
+ <select lay-filter="tbBasicTbStaNos">
+ {{#if (d.staNos!=null) {}}
+ {{# for(let i=0; i<d.staNos.length; i++) { }}
+ <option value="{{d.staNos[i]}}">{{d.staNos[i]}}</option>
+ {{# } }}
+ {{# } }}
+ </select>
+ </div>
+</script>
+
+<script type="text/html" id="locNoTpl">
+ <span name="locNo"
+ {{# if( d.lack === false){ }}
+ class="layui-badge layui-badge-green" >{{d.locNo}}</span>
+ {{# } else { }}
+ class="layui-badge layui-badge-red" >缂鸿揣</span>
+ {{# } }}
+</script>
+
<!-- 琛屾牱寮� -->
<script type="text/html" id="orderNoTpl">
<span name="orderNo" class="layui-badge layui-badge-gray">{{d.orderNo}}</span>
@@ -232,6 +278,7 @@
</div>
</form>
</script>
+
</body>
</html>
--
Gitblit v1.9.1