From 7102e9faca7b1cc6da94be325831c13d0301d7f6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 14:42:43 +0800
Subject: [PATCH] #
---
src/main/webapp/views/order/outLocDetlQuery1.html | 70 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/views/order/outLocDetlQuery1.html b/src/main/webapp/views/order/outLocDetlQuery1.html
index 4fc00cf..194c6b9 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>
<!-- 鏃ユ湡鑼冨洿 -->
@@ -189,10 +184,8 @@
<div class="ew-select-fixed">
<select class="order-sta-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>
+ {{# for(let i=0; i < d.staNos.length; i++) { }}
+ <option value="{{d.staNos[i]}}" {{d.staNos[i] == d.staNo ? 'selected' : ''}}>{{d.staNos[i]}}</option>
{{# } }}
{{# } }}
</select>
@@ -200,9 +193,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 +211,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 +221,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 +292,49 @@
}
});
+ conditionXmSelect = xmSelect.render({
+ el: '#condition',
+ style: {
+ width: '200px',
+ },
+ autoRow: true,
+ toolbar: {show: true},
+ filterable: true,
+ data: [
+ {
+ name: '鎴愬搧鏅鸿兘绔嬪簱',
+ value: '鎴愬搧鏅鸿兘绔嬪簱'
+ },
+ {
+ name: '鐗归噰鏅鸿兘绔嬪簱',
+ value: '鐗归噰鏅鸿兘绔嬪簱'
+ },
+ {
+ name: '鍗楅�氬欢閿嬬壒閲囩珛搴�',
+ value: '鍗楅�氬欢閿嬬壒閲囩珛搴�'
+ },
+ {
+ name: '鏄嗗北鍢夐┉鐗归噰绔嬪簱',
+ value: '鏄嗗北鍢夐┉鐗归噰绔嬪簱'
+ },
+ {
+ name: '瀹夊窘楦跨憺杈剧壒閲囩珛搴�',
+ value: '瀹夊窘楦跨憺杈剧壒閲囩珛搴�'
+ },
+ {
+ name: '涓婃捣閲戞櫤杈剧壒閲囩珛搴�',
+ value: '涓婃捣閲戞櫤杈剧壒閲囩珛搴�'
+ },
+ {
+ name: '娌堥槼缁у嘲鐗归噰绔嬪簱',
+ value: '娌堥槼缁у嘲鐗归噰绔嬪簱'
+ },
+ {
+ name: '娌堥槼寤跺嘲鐗归噰绔嬪簱',
+ value: '娌堥槼寤跺嘲鐗归噰绔嬪簱'
+ }
+ ]
+ })
// 鐩戝惉澶嶉�夋閫夋嫨浜嬩欢
table.on('checkbox(stockOut)', function(obj){
var data = obj.data;
@@ -485,7 +523,7 @@
let data = tableCache[index];
for (let i = 0; i < tableCache.length; i++) {
if (tableCache[i].locNo === data.locNo) {
- tableCache[i]['staNo'] = Number(obj.elem.value);
+ tableCache[i]['staNo'] = obj.elem.value;
}
}
obj.othis.children().find("input").css("color", "blue");
@@ -535,7 +573,7 @@
// 纭
form.on('submit(staBatchSelectConfirm)', function (obj) {
let loadIdx = layer.load(2);
- let batchSta = Number(obj.field.batchSta);
+ let batchSta = obj.field.batchSta;
let arr = [];
for (let j = 0; j < stoPreTabData.length; j++) {
for (let i = 0; i < tableCache.length; i++) {
--
Gitblit v1.9.1