From 0916bb4ea987c0599b6af6bb8dd251a071770e05 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 23 十月 2025 14:32:15 +0800
Subject: [PATCH] 通用下拉选择框值从视图获取
---
src/main/webapp/static/js/pla/plaDetl.js | 94 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 81 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 5e25d4e..c95b607 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -17,7 +17,7 @@
,{field: 'pakinTime$', title: '鍏ュ簱鏃堕棿', align: 'center' , sort:true}
,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜',hide:true,edit:true}
,{field: 'brand', align: 'center',title: '鐗屽彿',edit:true}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿',edit:true, width: 150, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',edit:true, sort:true}
,{field: 'packageNo', align: 'center',title: '鍖呰鍙�',edit:true, sort:true}
,{field: 'proDate', align: 'center',title: '鐢熶骇鏃ユ湡',edit:true, width: 100}
,{field: 'weight', align: 'center',title: '閲嶉噺KG',edit:true,totalRow:true}
@@ -53,21 +53,23 @@
,{field: 'workshop', align: 'center',title: '鐢熶骇杞﹂棿',hide:true,edit:true}
,{field: 'line', align: 'center',title: '鐢熶骇绾�',hide:true,edit:true}
,{field: 'weightAnfme', align: 'center',title: '鍓╀綑閲嶉噺锛圞G锛�',edit:true,totalRow:true}
- ,{field: 'qtyAnfme', align: 'center',title: '寰呭嚭搴撻噸閲忥紙KG锛�',hide:true}
+ ,{field: 'qtyAnfme', align: 'center',title: '寰呭嚭搴撻噸閲忥紙KG锛�',hide:true,edit:true}
,{field: 'status', align: 'center',title: '鐘舵��', templet: setState ,edit:true}
,{field: 'stockFreeze', align: 'center',title: '搴撳瓨鍐荤粨', templet: '#stockFreezeTpl'}
,{field: 'stockFreezeBy', align: 'center',title: '鎿嶄綔浜哄憳',hide:true}
,{field: 'stockFreezeDate$', align: 'center',title: '鎿嶄綔鏃ユ湡',hide:true}
,{align: 'center', title: '娴佽浆鏄庣粏', toolbar: '#tbLook'}
- ,{field: 'createTime$', title: '鍒涘缓鏃堕棿', align: 'center' , sort:true}
- ,{field: 'newBrand', align: 'center',title: '鍏宠仈鐗屽彿',edit:true}
- ,{field: 'newBatch', align: 'center',title: '鍏宠仈鎵瑰彿',edit:true, width: 150, sort:true}
- ,{field: 'newPackageNo', align: 'center',title: '鍏宠仈鍖呰鍙�',edit:true, sort:true}
+ ,{field: 'createTime$', title: '鍒涘缓鏃堕棿', align: 'center' , sort:true,hide:true}
+ ,{field: 'newBrand', align: 'center',title: '鍏宠仈鐗屽彿',edit:true,hide:true}
+ ,{field: 'newBatch', align: 'center',title: '鍏宠仈鎵瑰彿',edit:true, width: 150, sort:true,hide:true}
+ ,{field: 'newPackageNo', align: 'center',title: '鍏宠仈鍖呰鍙�',edit:true, sort:true,hide:true}
// ,{field: 'orderNo', align: 'center',title: '鍗曞彿', hide:true}
// ,{field: 'pakoutTime', align: 'center',title: '鍑哄簱鏃堕棿', hide:true}
// ,{field: 'orderWeight', align: 'center',title: '閲嶉噺', hide:true}
// ,{field: 'handlerBy', align: 'center',title: '缁忓姙浜�', hide:true}
- // ,{field: 'transfer', align: 'center',title: '娴佽浆褰㈠紡', hide:true}
+ ,{field: 'transfer', align: 'center',title: '閫�璐ф爣璇�', hide:true}
+ ,{field: 'modifyUser', align: 'center',title: '閫�璐т汉', hide:true}
+ ,{field: 'createUser', align: 'center',title: '閫�璐у娉�', hide:true}
// ,{field: 'customer', align: 'center',title: '瀹㈡埛鍚嶇О', hide:true}
// ,{field: 'allocate', align: 'center',title: '璋冩嫧鍒�', hide:true}
// ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
@@ -93,7 +95,7 @@
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin', 'dropdown'], function() {
+}).use(['table','laydate', 'form', 'admin', 'xmSelect', 'dropdown'], function() {
var dropdown = layui.dropdown;
var table = layui.table;
var $ = layui.jquery;
@@ -101,6 +103,33 @@
laydate = layui.laydate;
var form = layui.form;
admin = layui.admin;
+
+ // 妯℃嫙浠庡悗绔帴鍙ｈ幏鍙栨暟鎹�
+ $.ajax({
+ url: baseUrl + "/pla/dropdownValues/list",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ var data = res.data
+
+ if (data.owner && Array.isArray(data.owner)) {
+ data.owner.forEach(function(item) {
+ $('#ownerSelect').append(new Option(item, item));
+ });
+ }
+
+ if (data.workshop && Array.isArray(data.workshop)) {
+ data.workshop.forEach(function(item) {
+ $('#workshopSelect').append(new Option(item, item));
+ });
+ }
+
+ // 閲嶆柊娓叉煋 LayUI 琛ㄥ崟
+ form.render('select');
+ }
+ }
+ });
// 鏃ユ湡鏃堕棿鑼冨洿
laydate.render({
@@ -123,8 +152,8 @@
return $(window).height() - otherHeight - 100; // 杩斿洖 number 绫诲瀷
},
//height: 'full',
- limit: 16,
- limits: [16, 50, 100, 200, 500,2000,5000,10000],
+ limit: 500,
+ limits: [16, 50, 100, 200, 500,],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
@@ -201,6 +230,36 @@
});
}
});
+
+ // 娓叉煋鐗╂枡閫夋嫨
+ var matXmSelect = xmSelect.render({
+ el: '#mat',
+ style: {
+ width: '270px',
+ },
+ autoRow: true,
+ toolbar: { show: true },
+ filterable: true,
+ remoteSearch: true,
+ remoteMethod: function(val, cb, show){
+ $.ajax({
+ url: baseUrl+"/pla/batch/all/get/kv",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ condition: val
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ cb(res.data)
+ } else {
+ cb([]);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ }
+ })
// 澶嶉�夋浜嬩欢
table.on('checkbox(plaDetl)', function(obj){
@@ -559,6 +618,10 @@
if(customValue !== undefined){
searchData['type'] = customValue
}
+ if(searchData.select){
+ searchData.batch = searchData.select;
+ searchData.select = null;
+ }
(child ? parent.tableIns : tableIns).reload({
where: searchData,
page: {
@@ -744,7 +807,7 @@
for(var i=0; i<data.length; i++){
if(data[i].LAY_CHECKED){
- if(data[i].status === "鏆傚叆搴�" || data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"|| data[i].weightAnfme <= data[i].qtyAnfme){
+ if(data[i].status === "鏆傚叆搴�" || data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"|| data[i].weightAnfme < data[i].qtyAnfme){
layer.msg("閫変腑鐨勬槑缁嗚繕鏈叆搴撴垨鑰呭凡鍏ㄩ儴鍑哄簱鎴栬�呮病鏈夊墿浣欏彲鍑洪噸閲忥紝璇烽噸鏂伴�夋嫨");
return;
}
@@ -755,10 +818,15 @@
layer.msg("閫変腑鐨勬槑缁嗕腑鍚湁澶氱鐗屽彿锛岃閲嶆柊閫夋嫨");
return;
}
- if(data[i].stockFreeze === 0){
- layer.msg("閫変腑鐨勬槑缁嗕腑鍚湁鍐荤粨鐨勫簱瀛橈紝璇疯В鍐诲悗鎿嶄綔");
+ //if (data[i].zpalletType == null && data[i].packageType == null && data[i].massState == null) {
+ if (typeof data[i].massState === 'undefined' || data[i].massState === null || data[i].massState.trim().length === 0){
+ layer.msg("璐ㄩ噺鎸囨爣鏈笂浼�");
return;
}
+ // if(data[i].stockFreeze === 0){
+ // layer.msg("閫変腑鐨勬槑缁嗕腑鍚湁鍐荤粨鐨勫簱瀛橈紝璇疯В鍐诲悗鎿嶄綔");
+ // return;
+ // }
dataSave.push(data[i]);
}else {
dataOld.push(data[i]);
--
Gitblit v1.9.1