From e34c002fefc989c22c69918319a55394e72e50d3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 22 十二月 2023 09:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/webapp/static/js/locDetl/locDetl.js | 40 +++++++---------------------------------
1 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 7c9a734..dcc1056 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -5,11 +5,10 @@
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
-
- ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+ ,{field: 'specs', align: 'center',title: '閰嶇疆',hide: true}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
@@ -23,7 +22,9 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
+ ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
+ ,{field: 'payment$', align: 'center',title: '璐х墿鐘舵��', hide: false}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
@@ -58,11 +59,8 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/locDetl/list/auth',
page: true,
- limit: 20,
- where:{
- unreason: false
- },
- limits: [20, 30, 50, 100, 200, 500],
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
@@ -458,29 +456,6 @@
tableReload(false);
});
- //鏌ョ湅寮傚父鏁版嵁
- form.on('submit(unreason)', function (data) {
- pageCurr = 1;
-
- tableIns.reload({
- where: {
- unreason: true
- },
- page: {
- curr: pageCurr
- },
- done: function (res, curr, count) {
-
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
-
- limit(child);
- }
- });
- });
-
// 鏃堕棿閫夋嫨鍣�
layDate.render({
elem: '#modiTime\\$',
@@ -501,7 +476,6 @@
function tableReload(child) {
var searchData = {
- unreason: false
};
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
--
Gitblit v1.9.1