From 6fd6fd0b4e90a816989632506934bdfdb431f47f Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 30 七月 2025 22:38:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/webapp/static/js/agvLocDetl/locDetl.js | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/agvLocDetl/locDetl.js b/src/main/webapp/static/js/agvLocDetl/locDetl.js
index d408a1d..c9730cb 100644
--- a/src/main/webapp/static/js/agvLocDetl/locDetl.js
+++ b/src/main/webapp/static/js/agvLocDetl/locDetl.js
@@ -55,6 +55,8 @@
// cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
+ ,{field: 'proddate$', align: 'center',title: '鐢熶骇鏃ユ湡', hide:false}
+ ,{field: 'deadline$', align: 'center',title: '鍒版湡鏃ユ湡', hide:false}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'stockFreeze', align: 'center',title: '搴撳瓨鍐荤粨', templet: '#stockFreezeTpl'}
)
@@ -79,7 +81,8 @@
page: true,
limit: 20,
where:{
- unreason: false
+ unreason: false,
+ expired: false
},
limits: [20, 30, 50, 100, 200, 500],
even: true,
@@ -402,6 +405,29 @@
method("add");
});
+ form.on('submit(expired)', function (data) {
+ pageCurr = 1;
+
+ tableIns.reload({
+ where: {
+ expired: true,
+ unreason: false
+ },
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+
+ limit(child);
+ }
+ });
+ });
+
// 鏁版嵁淇敼鍔ㄤ綔
form.on('submit(edit)', function () {
method("update")
@@ -484,7 +510,8 @@
tableIns.reload({
where: {
- unreason: true
+ unreason: true,
+ expired:false
},
page: {
curr: pageCurr
@@ -539,7 +566,8 @@
function tableReload(child) {
var searchData = {
- unreason: false
+ unreason: false,
+ expired: false
};
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
--
Gitblit v1.9.1