From 4c4aaf2b178a090b96c3c754b964a7016743ea4d Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Sun, 2 Oct 2022 17:52:17 +0800
Subject: [PATCH] =?UTF-8?q?ERP=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../storeHouseInventoryList.js | 30 ++++----
.../storeHouseInventoryList.html | 10 +--
.../template/json/activitiNameKey.json | 74 +++++++++----------
3 files changed, 51 insertions(+), 63 deletions(-)
diff --git a/erp/src/main/resources/template/js/storeHouseInventory/storeHouseInventoryList.js b/erp/src/main/resources/template/js/storeHouseInventory/storeHouseInventoryList.js
index 3c238379d..c0006b04f 100644
--- a/erp/src/main/resources/template/js/storeHouseInventory/storeHouseInventoryList.js
+++ b/erp/src/main/resources/template/js/storeHouseInventory/storeHouseInventoryList.js
@@ -54,29 +54,28 @@ layui.config({
limit: 8,
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
- { field: 'name', title: '商品名称', rowspan: '2', align: 'left', width: 150, templet: function (d) {
- return '' + d.name + '';
+ { field: 'materialName', title: '商品名称', rowspan: '2', align: 'left', width: 150, templet: function (d) {
+ return '' + d.materialName + '';
}},
- { field: 'model', title: '型号', rowspan: '2', align: 'left', width: 150 },
- { field: 'categoryName', title: '所属类型', rowspan: '2', align: 'center', width: 100 },
- { field: 'typeName', title: '商品来源', rowspan: '2', align: 'left', width: 100 },
- { title: '库存', colspan: '3', align: 'center', width: 80},
+ { field: 'materialModel', title: '型号', rowspan: '2', align: 'left', width: 150 },
+ { field: 'materialCategoryName', title: '所属类型', rowspan: '2', align: 'center', width: 100 },
+ { field: 'materialTypeName', title: '商品来源', rowspan: '2', align: 'left', width: 100 },
+ { title: '库存', colspan: '4', align: 'center', width: 80},
{ field: 'id', title: '盘点历史', rowspan: '2', align: 'center', width: 80, templet: function (d) {
return '盘点历史';
}},
- { field: 'unitName', title: '单位', rowspan: '2', align: 'center', width: 80},
{ field: 'enabled', title: '状态', rowspan: '2', align: 'center', width: 60, templet: function (d) {
if(d.enabled == '0'){
return "禁用";
} else if (d.enabled == '1'){
return "启用";
}
- }},
- { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }
+ }}
],[
- { field: 'allTock', title: '总库存', align: 'center', width: 80},
- { field: 'initialTock', title: '初始库存', align: 'center', width: 80},
- { field: 'stockNum', title: '可盘点库存', align: 'center', width: 120, edit: 'text'}
+ { field: 'unitName', title: '规格', align: 'center', width: 80 },
+ { field: 'allTock', title: '总库存', align: 'center', width: 80 },
+ { field: 'initialTock', title: '初始库存', align: 'center', width: 80 },
+ { field: 'stockNum', title: '可盘点库存', align: 'center', width: 120, edit: 'text' }
]],
done: function(json) {
matchingLanguage();
@@ -147,7 +146,6 @@ layui.config({
}
form.render();
-
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
refreshloadTable();
@@ -195,10 +193,8 @@ layui.config({
function getTableParams() {
return {
- materialName: $("#materialName").val(),
- model: $("#model").val(),
- categoryId: isNull($("#categoryId").val()) ? "" : $("#categoryId").attr("categoryId"),
- typeNum: $("#typeNum").val(),
+ categoryId: isNull($("#categoryId").val()) ? "" : $("#categoryId").attr("categoryId"),
+ typeFrom: $("#typeFrom").val(),
enabled: $("#enabled").val(),
depotId: $("#depotId").val()
};
diff --git a/erp/src/main/resources/template/tpl/storeHouseInventory/storeHouseInventoryList.html b/erp/src/main/resources/template/tpl/storeHouseInventory/storeHouseInventoryList.html
index ec83fdc06..ae8b4414d 100644
--- a/erp/src/main/resources/template/tpl/storeHouseInventory/storeHouseInventoryList.html
+++ b/erp/src/main/resources/template/tpl/storeHouseInventory/storeHouseInventoryList.html
@@ -26,14 +26,6 @@
-
-
-
-
-
-
-
-
@@ -41,7 +33,7 @@
-