From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs
---
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 55 ++++++++++++++-----------------------------------------
1 files changed, 14 insertions(+), 41 deletions(-)
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 6bbec39..e54f92e 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -51,12 +51,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="鐗╂枡鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_name" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
@@ -93,6 +93,17 @@
<script>
var pageCurr;
+ function getCol() {
+ var cols = [
+ {type: 'checkbox'}
+ ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ];
+ cols.push.apply(cols, detlCols);
+ cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
+ return cols;
+ }
+
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
@@ -109,25 +120,7 @@
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
- cols: [[
- {type: 'checkbox'}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
- // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
- // ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
- // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID', width:200}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
- // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'altme', align: 'center',title: '鍗曚綅'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
- // ,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
-
- ]],
+ cols: [getCol()],
request: {
pageName: 'curr',
pageSize: 'limit'
@@ -169,26 +162,6 @@
layer.msg("璇烽�夋嫨鏁版嵁");
return;
}
- var locNos = [];
- data.forEach(function(elem) {
- locNos.push(elem.locNo);
- });
- $.ajax({
- url: baseUrl+"/locDetl/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {locNos:locNos},
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200) {
- data = res.data;
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/";
- } else {
- layer.msg(res.msg)
- }
- }
- })
parent.addTableData(data);
break;
}
--
Gitblit v1.9.1