@@ -174,17 +174,19 @@
formatter: function(value, row, index) {
return $.table.selectDictLabel(materialTypeDatas, value);
}
- },
- {
- title: '操作',
- align: 'center',
- formatter: function(value, row, index) {
- var actions = [];
- actions.push('
编辑 ');
- actions.push('
删除');
- return actions.join('');
- }
- }]
+ }
+ // ,
+ // {
+ // title: '操作',
+ // align: 'center',
+ // formatter: function(value, row, index) {
+ // var actions = [];
+ // actions.push('
编辑 ');
+ // actions.push('
删除');
+ // return actions.join('');
+ // }
+ // }
+ ]
};
$.table.init(options);
});
diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/add.html
index fbc1e9eb..10281cf3 100644
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/add.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/add.html
@@ -387,6 +387,12 @@
validate: function (v) {
}
+ },
+ formatter: (value, row, index) => {
+ console.log(value)
+ if (value === null) {
+ return ''
+ }
}
},
{
@@ -399,6 +405,12 @@
validate: function (v) {
}
+ },
+ formatter: (value, row, index) => {
+ console.log(value)
+ if (value === null) {
+ return ''
+ }
}
},
{
@@ -411,6 +423,12 @@
validate: function (v) {
}
+ },
+ formatter: (value, row, index) => {
+ console.log(value)
+ if (value === null) {
+ return ''
+ }
}
}]
})
@@ -450,7 +468,7 @@
specificationModel: data[i].specificationModel,
materialType: data[i].materialType,
inventoryUnit: data[i].purchasingUnit,
- warehousingQuantity: data[i].warehousingQuantity,
+ warehousingQuantity: data[i].qualifiedQuantity,
unitPrice: data2[i].purchasePrice,
amountMoney: '',
description: data[i].purchaseExplain,
diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/edit.html
index ecb5fb46..0055fcb5 100644
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInFinishProduct/edit.html
@@ -346,11 +346,27 @@
},
{
field: 'description',
- title: '说明'
+ title: '说明',
+ editable: {
+ type: 'text',
+ title: '说明',
+ emptytext: '说明',
+ validate: function (v) {
+
+ }
+ }
},
{
field: 'batchNumber',
- title: '进货批号'
+ title: '进货批号',
+ editable: {
+ type: 'text',
+ title: '进货批号',
+ emptytext: '进货批号',
+ validate: function (v) {
+
+ }
+ }
},
{
field: 'manufacturerBatchNumber',
@@ -413,7 +429,7 @@
specificationModel: data[i].specificationModel,
materialType: data[i].materialType,
inventoryUnit: data[i].purchasingUnit,
- warehousingQuantity: data[i].warehousingQuantity,
+ warehousingQuantity: data[i].qualifiedQuantity,
unitPrice: data2[i].purchasePrice,
amountMoney: '',
description: data[i].purchaseExplain,
diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/add.html
index 97b2d56b..2e36d74e 100644
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/add.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/add.html
@@ -404,7 +404,7 @@
specificationModel: data[i].specificationModel,
typeMachine: data[i].typeMachine,
inventoryUnit: data[i].inventoryUnit,
- warehousingQuantity: data[i].warehousingQuantity,
+ warehousingQuantity: data[i].qualifiedQuantity,
description: data[i].description,
batchNumber: data[i].batchNumber,
storageLocation: ''
diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/edit.html
index c59de964..e9cf57e5 100644
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/edit.html
@@ -384,7 +384,7 @@
specificationModel: data[i].specificationModel,
typeMachine: data[i].typeMachine,
inventoryUnit: data[i].inventoryUnit,
- warehousingQuantity: data[i].warehousingQuantity,
+ warehousingQuantity: data[i].qualifiedQuantity,
description: data[i].description,
batchNumber: data[i].batchNumber,
storageLocation: ''
diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/add.html
index c2a57af6..bd9b19e0 100644
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/add.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/add.html
@@ -398,7 +398,7 @@
specificationModel: data[i].specificationModel,
materialType: data[i].materialType,
inventoryUnit: data[i].purchasingUnit,
- warehousingQuantity: data[i].warehousingQuantity,
+ warehousingQuantity: data[i].qualifiedQuantity,
description: data[i].purchaseExplain,
batchNumber: data[i].receiptBatchNumber,
manufacturerBatchNumber: data[i].manufacturerBatchNumber,
diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/edit.html
index bdb1a58c..382c0b56 100644
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRawMaterial/edit.html
@@ -294,15 +294,39 @@
},
{
field: 'warehousingQuantity',
- title: '合格数量'
+ title: '合格数量',
+ editable: {
+ type: 'text',
+ title: '合格数量',
+ emptytext: '合格数量',
+ validate: function (v) {
+
+ }
+ }
},
{
field: 'description',
- title: '说明'
+ title: '说明',
+ editable: {
+ type: 'text',
+ title: '说明',
+ emptytext: '说明',
+ validate: function (v) {
+
+ }
+ }
},
{
field: 'batchNumber',
- title: '进货批号'
+ title: '进货批号',
+ editable: {
+ type: 'text',
+ title: '进货批号',
+ emptytext: '进货批号',
+ validate: function (v) {
+
+ }
+ }
},
{
field: 'manufacturerBatchNumber',
@@ -355,7 +379,7 @@
specificationModel: data[i].specificationModel,
materialType: data[i].materialType,
inventoryUnit: data[i].purchasingUnit,
- warehousingQuantity: data[i].warehousingQuantity,
+ warehousingQuantity: data[i].qualifiedQuantity,
description: data[i].purchaseExplain,
batchNumber: data[i].receiptBatchNumber,
manufacturerBatchNumber: '',
diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/add.html
index 7eb65ed8..d14800ae 100644
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/add.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/add.html
@@ -399,7 +399,7 @@
specificationModel: data[i].specificationModel,
materialType: data[i].materialType,
inventoryUnit: data[i].purchasingUnit,
- warehousingQuantity: data[i].warehousingQuantity,
+ warehousingQuantity: data[i].qualifiedQuantity,
description: data[i].purchaseExplain,
batchNumber: data[i].receiptBatchNumber,
manufacturerBatchNumber: data[i].manufacturerBatchNumber,
diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/edit.html
index 73f92b56..5062ed32 100644
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInSubsidiary/edit.html
@@ -293,15 +293,39 @@
},
{
field: 'warehousingQuantity',
- title: '合格数量'
+ title: '合格数量',
+ editable: {
+ type: 'text',
+ title: '合格数量',
+ emptytext: '合格数量',
+ validate: function (v) {
+
+ }
+ }
},
{
field: 'description',
- title: '说明'
+ title: '说明',
+ editable: {
+ type: 'text',
+ title: '说明',
+ emptytext: '说明',
+ validate: function (v) {
+
+ }
+ }
},
{
field: 'batchNumber',
- title: '进货批号'
+ title: '进货批号',
+ editable: {
+ type: 'text',
+ title: '进货批号',
+ emptytext: '进货批号',
+ validate: function (v) {
+
+ }
+ }
},
{
field: 'manufacturerBatchNumber',
@@ -354,7 +378,7 @@
specificationModel: data[i].specificationModel,
materialType: data[i].materialType,
inventoryUnit: data[i].purchasingUnit,
- warehousingQuantity: data[i].warehousingQuantity,
+ warehousingQuantity: data[i].qualifiedQuantity,
description: data[i].purchaseExplain,
batchNumber: data[i].receiptBatchNumber,
manufacturerBatchNumber: '',
diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/warehousingStagnantMaterial.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/warehousingStagnantMaterial.html
index 9ef85600..1c617c57 100644
--- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/warehousingStagnantMaterial.html
+++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingStagnantMaterial/warehousingStagnantMaterial.html
@@ -58,7 +58,6 @@
var materialTypeDatas = [[${@dict.getType('ck_meterialt_type')}]];
var prefix = ctx + "storehouse/warehousingStagnantMaterial";
-
$(function() {
searchDetail();
});
@@ -125,7 +124,12 @@
},
{
field: 'inventoryQuantity',
- title: '库存数'
+ title: '库存数',
+ formatter: (value, row, index) => {
+ if (value !== null || value !== '') {
+ return parseFloat(value).toFixed(2)
+ }
+ }
}]
};
$.table.init(options);
@@ -179,7 +183,12 @@
},
{
field: 'inventoryQuantity',
- title: '库存数'
+ title: '库存数',
+ formatter: (value, row, index) => {
+ if (value !== null || value !== '') {
+ return parseFloat(value).toFixed(2)
+ }
+ }
}]
};
$.table.init(options);
diff --git a/ruoyi-admin/src/main/resources/templates/system/bom/add.html b/ruoyi-admin/src/main/resources/templates/system/bom/add.html
index 4ca7ff65..d658b5f8 100644
--- a/ruoyi-admin/src/main/resources/templates/system/bom/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/bom/add.html
@@ -55,46 +55,46 @@
+