diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
index 4cb34676..93d0eab3 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
@@ -133,56 +133,56 @@
columns: [
{checkbox: true},
{title: '主键ID',field: 'id',visible: false},
+ {title: '料号',field: 'materialNo',},
+ {title: '物料名称',field: 'materialName',},
+ {title: '描述',field: 'describe',},
+ {title: '品牌',field: 'brand',},
+ {title: '半成品类型',field: 'processMethod',
+ formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}
+ },
+ {title: '单位',field: 'unit',
+ formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}
+ },
+ {title: '图片',field: 'photoUrl',
+ formatter: function(value, row, index) {return $.table.imageView(value);}
+ },
+ {title: '申请人',field: 'applyUserName',
+ formatter: function(value, row, index) {return '' + (value ? value : "-") + '';}
+ },
+ {title: '申请时间',field: 'applyTime',},
+ {title: '上次更新时间',field: 'updateTime',},
+ {title: '当前状态',field: 'taskName',align: 'center',
+ formatter: function(value, row, index) {return '' + value + '';}
+ },
{title: '流程实例ID',field: 'instanceId',visible: false},
{title: '流程提交实例ID',field: 'submitInstanceId',visible: false},
{title: '流程作废实例ID',field: 'cancelInstanceId',visible: false},
{title: '流程恢复实例ID',field: 'restoreInstanceId',visible: false},
{title: '流程实例类型',field: 'instanceTypeName',visible: false},
{title: '申请人ID',field: 'applyUser',visible: false},
- {title: '申请人',field: 'applyUserName',
- formatter: function(value, row, index) {return '' + (value ? value : "-") + '';}
- },
- {title: '申请时间',field: 'applyTime',},
{title: '当前任务ID',field: 'taskId',visible: false},
{title: '待办用户ID',field: 'todoUserId', visible: false},
- {title: '当前任务名称',field: 'taskName',align: 'center',
- formatter: function(value, row, index) {return '' + value + '';}
- },
- {title: '审核状态',field: 'auditStatus',
+ {title: '审核状态',field: 'auditStatus',visible: false,
formatter: function(value, row, index) {return $.table.selectDictLabel(auditStatusDatas, value);}
},
- {title: '使用状态',field: 'useStatus',
+ {title: '使用状态',field: 'useStatus',visible: false,
formatter: function(value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}
},
{title: '工程员',field: 'businessMembers',visible: false},
- {title: '料号',field: 'materialNo',},
- {title: '关联bom号',field: 'bomNo',},
- {title: '图片',field: 'photoUrl',
- formatter: function(value, row, index) {return $.table.imageView(value);}
- },
- {title: '物料名称',field: 'materialName',},
- {title: '物料类型',field: 'materialType',
+ {title: '关联bom号',field: 'bomNo',visible: false},
+ {title: '物料类型',field: 'materialType',visible: false,
formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}
},
- {title: '单位',field: 'unit',
- formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}
- },
- {title: '品牌',field: 'brand',},
- {title: '描述',field: 'describe',},
- {title: '利润率',field: '',hidden: roes},
+ {title: '利润率',field: '',hidden: roes,visible: false},
{title: '是否有技术团队',field: 'havaProductTem',visible: false,
formatter:function (value, row, index){return $.table.selectDictLabel(haveProductTem,value);}
},
{title: '技术团队id',field: 'productItem',visible: false,},
{title: '技术团队名称',field: 'itemName',visible: false},
- {title: '录入时间',field: 'createTime',},
- {title: '更新人',field: 'updateBy',},
- {title: '上次更新时间',field: 'updateTime',},
+ {title: '录入时间',field: 'createTime',visible: false},
+ {title: '更新人',field: 'updateBy',visible: false},
{title: '删除标志', field: 'delFlag',visible: false},
- {title: '半成品类型',field: 'processMethod',
- formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}
- },
- {title: '入库部门', field: 'warehouseDept',
+ {title: '入库部门', field: 'warehouseDept',visible: false,
formatter: function(value, row, index) {return $.table.selectDictLabel(warehouseDeptDatas, value);}
},
{title: '操作',align: 'center',