From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/webapp/views/order/outLocDetlQuery1.html | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/views/order/outLocDetlQuery1.html b/src/main/webapp/views/order/outLocDetlQuery1.html
index 4fc00cf..838d585 100644
--- a/src/main/webapp/views/order/outLocDetlQuery1.html
+++ b/src/main/webapp/views/order/outLocDetlQuery1.html
@@ -126,14 +126,9 @@
<input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="brand" placeholder="鐢熶骇绾�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="sku" placeholder="绛夌骇" autocomplete="off">
+ <div class="layui-input-inline" style="margin-right: 100px;">
+ <div id="condition" name="condition">
+
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
@@ -200,9 +195,10 @@
</script>
<script>
+ var conditionXmSelect;
function getCol() {
var cols = [
- {type: 'checkbox', merge: ['locNo']}
+ {type: 'checkbox'}
, {field: 'locNo', align: 'center', title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
// ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
@@ -217,7 +213,7 @@
}).extend({
notice: 'notice/notice',
})
- .use(['table', 'notice', 'laydate', 'form', 'admin', 'tableMerge'], function () {
+ .use(['table', 'notice', 'laydate', 'form', 'admin', 'tableMerge','xmSelect'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -227,6 +223,7 @@
var tableMerge = layui.tableMerge;
var notice = layui.notice;
var dataSource = [];
+ var xmSelect = layui.xmSelect;
$('#matnr').val(parent.matnR);
$('#anfme').val(parent.anfme);
@@ -297,6 +294,25 @@
}
});
+ conditionXmSelect = xmSelect.render({
+ el: '#condition',
+ style: {
+ width: '200px',
+ },
+ autoRow: true,
+ toolbar: {show: true},
+ filterable: true,
+ data: [
+ {
+ name: '鎴愬搧鏅鸿兘绔嬪簱',
+ value: '鎴愬搧鏅鸿兘绔嬪簱'
+ },
+ {
+ name: '鐗归噰鏅鸿兘绔嬪簱',
+ value: '鐗归噰鏅鸿兘绔嬪簱'
+ }
+ ]
+ })
// 鐩戝惉澶嶉�夋閫夋嫨浜嬩欢
table.on('checkbox(stockOut)', function(obj){
var data = obj.data;
--
Gitblit v1.9.1