From faecccbe46a1f85b5d9b18fce12e02764faba78e Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 09 六月 2021 12:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/static/js/locNormal/locNormalIn.js | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/locNormal/locNormalIn.js b/src/main/webapp/static/js/locNormal/locNormalIn.js
index 36a3723..51b1a51 100644
--- a/src/main/webapp/static/js/locNormal/locNormalIn.js
+++ b/src/main/webapp/static/js/locNormal/locNormalIn.js
@@ -17,11 +17,11 @@
];
var locNormalColsSelf = [
{field: 'mnemonic', align: 'center',title: '鐢熶骇鍗曞彿', edit: 'text'}
+ ,{field: 'supplier', align: 'center',title: '閫氱煡鍗曞彿', edit: 'text'}
,{field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О', width: 400}
,{field: 'lgnum', align: 'center',title: '瑙勬牸'}
,{field: 'type', align: 'center',title: '鐗╂枡绫诲埆'}
- ,{field: 'supplier', align: 'center',title: '閫氱煡鍗曞彿', edit: 'text'}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'altme', align: 'center',title: '鍗曚綅', hide: true}
];
@@ -89,6 +89,10 @@
layer.msg("璇疯緭鍏ョ敓浜у崟鍙�");
return;
}
+ // if (matCodeData[i].supplier == null || matCodeData[i].supplier == '' || matCodeData[i].supplier == undefined) {
+ // layer.msg("璇疯緭鍏ラ�氱煡鍗曞彿");
+ // return;
+ // }
}
// 鍒ゆ柇搴撳尯鏄惁涓虹┖
var warehouse = $('#putSiteSelect').val();
--
Gitblit v1.9.1