root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[fix] 

仓库管理 出库单
修改生产领料出库页面和详情页面，设置列居中，添加字典注解，添加型号字段；
修改销售订单出库页面和详情页面，设置列居中，添加字典注解，添加型号字段；
dev
王晓迪 3 months ago
parent
4137d5d9ab
commit
ca590975a4
4 changed files with 110 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/makeOutWarehouse.html
  2. 32
      ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/makeOutWarehouseDetail.html
  3. 35
      ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html
  4. 35
      ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html

32
ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/makeOutWarehouse.html
View File

@ -59,7 +59,8 @@
var warehouseOutOrder = [[${warehouseOutOrder}]]; var warehouseOutOrder = [[${warehouseOutOrder}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "warehouse/warehouseOutOrder"; var prefix = ctx + "warehouse/warehouseOutOrder";
$("#form-makeOutWarehouse-edit").validate({ $("#form-makeOutWarehouse-edit").validate({
focusCleanup: true focusCleanup: true
@ -111,9 +112,7 @@
showToggle: false, showToggle: false,
showColumns: false, showColumns: false,
pagination: false, // 设置不分页 pagination: false, // 设置不分页
columns: [{ columns: [
checkbox: true
},
{ {
title: '出库单详情ID', title: '出库单详情ID',
field: 'outOrderDetailId', field: 'outOrderDetailId',
@ -128,41 +127,57 @@
{ {
title: '料号', title: '料号',
field: 'materialNo', field: 'materialNo',
align: 'center',
}, },
{ {
title: '图片', title: '图片',
align: 'center',
field: 'materialPhotourl', field: 'materialPhotourl',
}, },
{ {
title: '物料名称', title: '物料名称',
align: 'center',
field: 'materialName', field: 'materialName',
}, },
{ {
title: '物料类型', title: '物料类型',
align: 'center',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
}, },
{ {
title: '描述', title: '描述',
align: 'center',
field: 'materialDescribe', field: 'materialDescribe',
}, },
{
title: '型号',
align: 'center',
field: 'materialModel',
},
{ {
title: '品牌', title: '品牌',
align: 'center',
field: 'materialBrand', field: 'materialBrand',
}, },
{ {
title: '单位', title: '单位',
align: 'center',
field: 'materialUnit', field: 'materialUnit',
}, },
{ {
title: '加工方式', title: '加工方式',
align: 'center',
field: 'materialProcessMethod', field: 'materialProcessMethod',
}, formatter: function(value, row, index) {
{ return $.table.selectDictLabel(processMethodDatas, value);
title: '订单数量', }
field: 'makeNum',
}, },
{ {
title: '已出库数', title: '已出库数',
align: 'center',
field: 'hasOutOrderSum', field: 'hasOutOrderSum',
}, },
{ {
@ -171,6 +186,7 @@
}, },
{ {
title: '实际出库数', title: '实际出库数',
align: 'center',
field: 'actualOutOrderSum', field: 'actualOutOrderSum',
editable: { editable: {
validate: function(value) { validate: function(value) {

32
ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/makeOutWarehouseDetail.html
View File

@ -58,6 +58,8 @@
var warehouseOutOrder = [[${warehouseOutOrder}]]; var warehouseOutOrder = [[${warehouseOutOrder}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "warehouse/warehouseOutOrder"; var prefix = ctx + "warehouse/warehouseOutOrder";
$("#form-makeOutWarehouse-edit").validate({ $("#form-makeOutWarehouse-edit").validate({
@ -110,9 +112,7 @@
showToggle: false, showToggle: false,
showColumns: false, showColumns: false,
pagination: false, // 设置不分页 pagination: false, // 设置不分页
columns: [{ columns: [
checkbox: true
},
{ {
title: '出库单详情ID', title: '出库单详情ID',
field: 'outOrderDetailId', field: 'outOrderDetailId',
@ -127,49 +127,67 @@
{ {
title: '料号', title: '料号',
field: 'materialNo', field: 'materialNo',
align: 'center',
}, },
{ {
title: '图片', title: '图片',
align: 'center',
field: 'materialPhotourl', field: 'materialPhotourl',
}, },
{ {
title: '物料名称', title: '物料名称',
align: 'center',
field: 'materialName', field: 'materialName',
}, },
{ {
title: '物料类型', title: '物料类型',
align: 'center',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
}, },
{ {
title: '描述', title: '描述',
align: 'center',
field: 'materialDescribe', field: 'materialDescribe',
}, },
{
title: '型号',
align: 'center',
field: 'materialModel',
},
{ {
title: '品牌', title: '品牌',
align: 'center',
field: 'materialBrand', field: 'materialBrand',
}, },
{ {
title: '单位', title: '单位',
align: 'center',
field: 'materialUnit', field: 'materialUnit',
}, },
{ {
title: '加工方式', title: '加工方式',
align: 'center',
field: 'materialProcessMethod', field: 'materialProcessMethod',
}, formatter: function(value, row, index) {
{ return $.table.selectDictLabel(processMethodDatas, value);
title: '订单数量', }
field: 'makeNum',
}, },
{ {
title: '已出库数', title: '已出库数',
align: 'center',
field: 'hasOutOrderSum', field: 'hasOutOrderSum',
}, },
{ {
title: '申请出库数', title: '申请出库数',
align: 'center',
field: 'applyOutOrderSum', field: 'applyOutOrderSum',
}, },
{ {
title: '实际出库数', title: '实际出库数',
align: 'center',
field: 'actualOutOrderSum', field: 'actualOutOrderSum',
} }
] ]

35
ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html
View File

@ -103,7 +103,8 @@
var warehouseOutOrder = [[${warehouseOutOrder}]]; var warehouseOutOrder = [[${warehouseOutOrder}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "warehouse/warehouseOutOrder"; var prefix = ctx + "warehouse/warehouseOutOrder";
@ -194,54 +195,78 @@
{ {
title: '料号', title: '料号',
align: 'center',
field: 'materialNo', field: 'materialNo',
}, },
{
title: '图片',
field: 'materialPhotourl',
},
{ {
title: '物料名称', title: '物料名称',
align: 'center',
field: 'materialName', field: 'materialName',
}, },
{
title: '图片',
align: 'center',
field: 'materialPhotourl',
},
{ {
title: '物料类型', title: '物料类型',
align: 'center',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{
title: '型号',
align: 'center',
field: 'materialModel',
}, },
{ {
title: '描述', title: '描述',
align: 'center',
field: 'materialDescribe', field: 'materialDescribe',
}, },
{ {
title: '品牌', title: '品牌',
align: 'center',
field: 'materialBrand', field: 'materialBrand',
}, },
{ {
title: '单位', title: '单位',
align: 'center',
field: 'materialUnit', field: 'materialUnit',
}, },
{ {
title: '加工方式', title: '加工方式',
align: 'center',
field: 'materialProcessMethod', field: 'materialProcessMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
}, },
{ {
title: '订单数量', title: '订单数量',
align: 'center',
field: 'makeNum', field: 'makeNum',
}, },
{ {
title: '已出库数', title: '已出库数',
align: 'center',
field: 'hasOutOrderSum', field: 'hasOutOrderSum',
}, },
{ {
title: '申请出库数', title: '申请出库数',
align: 'center',
field: 'applyOutOrderSum', field: 'applyOutOrderSum',
}, },
{ {
title: '准备出库数', title: '准备出库数',
align: 'center',
field: 'prepareOutOrderSum', field: 'prepareOutOrderSum',
}, },
{ {
title: '实际出库数', title: '实际出库数',
align: 'center',
field: 'actualOutOrderSum', field: 'actualOutOrderSum',
editable: { editable: {
validate: function(value) { validate: function(value) {

35
ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html
View File

@ -103,6 +103,8 @@
var warehouseOutOrder = [[${warehouseOutOrder}]]; var warehouseOutOrder = [[${warehouseOutOrder}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "warehouse/warehouseOutOrder"; var prefix = ctx + "warehouse/warehouseOutOrder";
@ -195,53 +197,78 @@
{ {
title: '料号', title: '料号',
field: 'materialNo', field: 'materialNo',
}, align: 'center',
{
title: '图片',
field: 'materialPhotourl',
}, },
{ {
title: '物料名称', title: '物料名称',
align: 'center',
field: 'materialName', field: 'materialName',
}, },
{
title: '图片',
field: 'materialPhotourl',
align: 'center',
},
{ {
title: '物料类型', title: '物料类型',
align: 'center',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{
title: '型号',
align: 'center',
field: 'materialModel',
}, },
{ {
title: '描述', title: '描述',
align: 'center',
field: 'materialDescribe', field: 'materialDescribe',
}, },
{ {
title: '品牌', title: '品牌',
align: 'center',
field: 'materialBrand', field: 'materialBrand',
}, },
{ {
title: '单位', title: '单位',
align: 'center',
field: 'materialUnit', field: 'materialUnit',
}, },
{ {
title: '加工方式', title: '加工方式',
align: 'center',
field: 'materialProcessMethod', field: 'materialProcessMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
}, },
{ {
title: '订单数量', title: '订单数量',
align: 'center',
field: 'makeNum', field: 'makeNum',
}, },
{ {
title: '已出库数', title: '已出库数',
align: 'center',
field: 'hasOutOrderSum', field: 'hasOutOrderSum',
}, },
{ {
title: '申请出库数', title: '申请出库数',
align: 'center',
field: 'applyOutOrderSum', field: 'applyOutOrderSum',
}, },
{ {
title: '准备出库数', title: '准备出库数',
align: 'center',
field: 'prepareOutOrderSum', field: 'prepareOutOrderSum',
}, },
{ {
title: '实际出库数', title: '实际出库数',
align: 'center',
field: 'actualOutOrderSum', field: 'actualOutOrderSum',
} }
] ]

Write Preview
Loading…
Cancel
Save