From 71d838e032d13a46a07917f5606862496220ea74 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 一月 2024 08:35:35 +0800
Subject: [PATCH] # 入库拣货功能添加
---
src/main/webapp/static/js/order/order.js | 66 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index afa749e..f6a94a8 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -152,8 +152,6 @@
var data = obj.data;
var layEvent = obj.event;
-
-
if (layEvent === 'edit') {
showEditModel(data);
} else if (layEvent === 'del') {
@@ -190,23 +188,24 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
-
+ // {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ // {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ //
// {field: 'batch', title: '鎵瑰彿'},
+ {field: 'batch', title: '鎵规'},
+ {field: 'brand', title: '鐗屽彿'},
+ {field: 'fingerMeltingMin', title: '鏈�灏忕啍鎸�'},
+ {field: 'fingerMeltingMax', title: '鏈�澶х啍鎸�'},
+ {field: 'fusingPointMin', title: '鏈�灏忕啍鐐�'},
+ {field: 'fusingPointMax', title: '鏈�澶х啍鐐�'},
+ {field: 'yellownessMin', title: '鏈�灏忛粍搴�'},
+ {field: 'yellownessMax', title: '鏈�澶ч粍搴�'},
+ {field: 'opacityMin', title: '鏈�灏忎笉閫忔槑搴�'},
+ {field: 'opacityMax', title: '鏈�澶т笉閫忔槑搴�'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
- // {field: 'unit', title: '鍗曚綅'},
- // {
- // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
- // return util.toDateString(d.createTime);
- // }, width: 180
- // },
- // {field: 'inQty', title: '宸插叆搴撻噺'},
- // {field: 'color', title: '棰滆壊'},
- // {field: 'specs', title: '瑙勬牸'},
- {field: 'weight', title: '閲嶉噺'}
+
]],
request: {
pageName: 'curr',
@@ -261,10 +260,18 @@
let nList = admin.util.deepClone(xxDataList);
console.log(nList);
for (let xi = 0; xi < nList.length; xi++) {
- if (nList[xi].anfme <= 0){
- layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
+ if(!nList[xi].anfme){
+ layer.msg('鏄庣粏鏁伴噺涓嶅悎娉�', {icon: 2});
return false;
}
+ if (nList[xi].anfme <= 0){
+ layer.msg('鏄庣粏鏁伴噺涓嶅悎娉�', {icon: 2});
+ return false;
+ }
+ // if (nList[xi].batch == null || nList[xi].batch == ""){
+ // layer.msg('鎵规涓嶅悎娉�', {icon: 2});
+ // return false;
+ // }
if (nList[xi].anfme < nList[xi].workQty){
layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2});
return false;
@@ -309,14 +316,24 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'specs', title: '瑙勬牸'},
- {field: 'weight', title: '閲嶉噺', edit: true},
- {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ // {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ // {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
+ // {field: 'specs', title: '瑙勬牸'},
+ {field: 'batch', title: '鎵规', edit: true},
+ {field: 'brand', title: '鐗屽彿', edit: true},
+ {field: 'fingerMeltingMin', title: '鏈�灏忕啍鎸�', edit: true},
+ {field: 'fingerMeltingMax', title: '鏈�澶х啍鎸�', edit: true},
+ {field: 'fusingPointMin', title: '鏈�灏忕啍鐐�', edit: true},
+ {field: 'fusingPointMax', title: '鏈�澶х啍鐐�', edit: true},
+ {field: 'yellownessMin', title: '鏈�灏忛粍搴�', edit: true},
+ {field: 'yellownessMax', title: '鏈�澶ч粍搴�', edit: true},
+ {field: 'opacityMin', title: '鏈�灏忎笉閫忔槑搴�', edit: true},
+ {field: 'opacityMax', title: '鏈�澶т笉閫忔槑搴�', edit: true},
+
+ {field: 'anfme', title: '閲嶉噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
// {field: 'payment', title: '璐х墿鐘舵��',align: 'center', templet: '#payment'},
- {field: 'qty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
+ {field: 'qty', title: '浣滀笟閲嶉噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
{field: 'memo', title: '澶囨敞' , edit: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
@@ -427,6 +444,9 @@
// 鏄剧ず娣诲姞鏄庣粏琛ㄥ崟寮圭獥
function showEditModel2(exp) {
+ xxDataList.push({});
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ return;
admin.open({
type: 1,
offset: '150px',
--
Gitblit v1.9.1