From b1cbb59d39cea44d35110d95e54fbd86d4a12e13 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 01 八月 2025 12:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/webapp/static/js/pakStore/pakStore.js | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 9a189f5..166c63e 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -1,10 +1,10 @@
-var admin;
+var matCodeLayerIdx;
var initCountVal = 0;
var matCodeData = [];
function getCol() {
var cols = [
{fixed: 'left', field: 'anfme', title: '鏁伴噺锛堝繀濉級', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
- {field: 'batch', title: '鎵瑰彿锛堥�夊～锛�', align: 'center', edit:'text', width: 200, style:'color: block;font-weight: bold'}
+ {field: 'batch', title: '绠卞彿锛堥�夊～锛�', align: 'center', edit:'text', width: 200, style:'color: block;font-weight: bold'}
];
cols.push.apply(cols, matCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80})
@@ -18,7 +18,7 @@
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
- admin = layui.admin;
+ var admin = layui.admin;
tableIns = table.render({
elem: '#chooseData',
@@ -84,6 +84,7 @@
layer.msg("璇烽�夋嫨鍏ュ簱绔�", {icon: 2});
return;
}
+ console.log(matCodeData)
$.ajax({
url: baseUrl+"/full/store/put/start",
headers: {'token': localStorage.getItem('token')},
@@ -146,24 +147,26 @@
})
}
+ // 鎻愬彇鐗╂枡
+ $(document).on('click','#mat-query', function () {
+ let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+ matCodeLayerIdx = admin.open({
+ type: 2,
+ title: false,
+ closeBtn: false,
+ maxmin: false,
+ area: ['90%', '85%'],
+ shadeClose: true,
+ content: 'matQuery.html',
+ success: function(layero, index){
+ layer.close(loadIndex);
+ }
+ });
+ })
});
-// 鎻愬彇鐗╂枡
-var matCodeLayerIdx;
-function getMat() {
- matCodeLayerIdx = admin.open({
- type: 2,
- title: false,
- closeBtn: false,
- maxmin: false,
- area: ['90%', '85%'],
- shadeClose: true,
- content: 'matQuery.html',
- success: function(layero, index){
- }
- });
-}
+
// 鎵爜
function focusMat(el) {
@@ -171,7 +174,7 @@
return
}
$.ajax({
- url: baseUrl + "/matCode/" + el.value + "/auth",
+ url: baseUrl + "/mat/" + el.value + "/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
--
Gitblit v1.9.1