From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/static/js/pakStore/pakStore.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index cdfcffd..dd0f6cb 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -4,7 +4,7 @@
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})
@@ -148,6 +148,7 @@
// 鎻愬彇鐗╂枡
$(document).on('click','#mat-query', function () {
+ let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
matCodeLayerIdx = admin.open({
type: 2,
title: false,
@@ -157,6 +158,7 @@
shadeClose: true,
content: 'matQuery.html',
success: function(layero, index){
+ layer.close(loadIndex);
}
});
})
@@ -171,7 +173,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