From a055753d27e82a2cd1371f0241001ab6b8786069 Mon Sep 17 00:00:00 2001
From: zwl <zwl123>
Date: 星期日, 24 九月 2023 16:21:41 +0800
Subject: [PATCH] Changes
---
src/main/webapp/views/pakStore/locDetlQuery.html | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index ef7c53d..fbf49fc 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -47,6 +47,17 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="crnNo" class="layui-input" name="crnNo" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍫嗗灈鏈哄彿" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
@@ -54,6 +65,11 @@
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -95,8 +111,9 @@
function getCol() {
var cols = [
- {type: 'checkbox'}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ {type: 'checkbox', merge: ['locNo']}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+ // ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
@@ -106,13 +123,14 @@
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
- }).use(['table','laydate', 'form', 'admin'], function() {
+ }).use(['table','laydate', 'form', 'admin', 'tableMerge'], 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 tableMerge = layui.tableMerge;
// 鏁版嵁娓叉煋
locDetlTableIns = table.render({
@@ -121,6 +139,7 @@
url: baseUrl+'/stock/out/list/auth',
page: true,
limits: [16, 30, 50, 100, 200, 500],
+ limit: 16,
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
@@ -141,6 +160,7 @@
statusCode: 200
},
done: function(res, curr, count) {
+ tableMerge.render(this);
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -151,6 +171,21 @@
table.on('toolbar(stockOut)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
var data = checkStatus.data;
+ let tmp = []
+ data.forEach((item,index) => {
+ $.ajax({
+ url: baseUrl+"/stock/out/list/" + item.locNo + "/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ res.data.forEach((val,idx) => {
+ tmp.push(val)
+ })
+ }
+ })
+ })
+ data = tmp
switch(obj.event) {
case 'confirm':
if (data.length === 0){
--
Gitblit v1.9.1