From 7e0fe9378b0a4180d0bd1d74f6744285ebacdfdb Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期五, 11 七月 2025 12:48:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/srjtasrs' into srjtasrs
---
src/main/webapp/static/js/locDetl/locDetl.js | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 5e624fb..d0ab093 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -34,13 +34,15 @@
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
];
// cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
+
)
return cols;
}
@@ -391,6 +393,8 @@
var data = {
// id: $('#id').val(),
locNo: $('#locNo').val(),
+ batch: $('#batch').val(),
+ danger: $('#danger').val(),
matnr: $('#matnr').val(),
lgnum: $('#lgnum').val(),
tbnum: $('#tbnum').val(),
--
Gitblit v1.9.1