From 9c554729e527d8fe7771f4a9833e17e65a5d6d99 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 29 Oct 2024 14:11:39 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbom=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AA=97=E5=8F=A3=E6=AF=94=E4=BE=8B=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=86=85=E5=AE=B9=E6=B7=B7?= =?UTF-8?q?=E4=B9=B1=E9=97=AE=E9=A2=98=EF=BC=9B=20=E4=BF=AE=E6=94=B9bom?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=A4=B4=E7=9A=84?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E6=8C=89=E9=92=AE=E9=87=87=E7=94=A8?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=EF=BC=9B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80=EF=BC=8C=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=A0=8F=E5=BC=95=E7=94=A8$.table.dropdownToggle=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=9B=E5=9E=8B=E5=8F=B7=E5=92=8C=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8A=A0=E4=B8=8Atooltip=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E8=B6=85=E8=BF=875=E4=B8=AA=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/erp/bom/bom.html | 128 ++++++++---------- 1 file changed, 59 insertions(+), 69 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html index 84582330..b82885d0 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html @@ -1,11 +1,11 @@ - + + + + + + @@ -92,10 +92,10 @@ 添加 - + 导出 - + 导入 @@ -140,11 +140,8 @@ sortStable: true, // 设置为 true 将获得稳定的排序 modalName: "bom", detailView: true, - width: 800, fixedColumns: true, // 启用冻结列 - rightFixedColumns:1, fixedRightNumber: 1, // 冻结右列个数 - height: $(window).height() - 100, //指定父id列 onExpandRow : function(index, row, $detail) { $detail.html('

一阶

' + @@ -160,29 +157,57 @@ checkbox: true, }, { title: '主键ID',field: 'id',visible: false}, - { title: 'bom号',field: 'bomNo', sortable: true,width: 150}, - { title: '料号',field: 'materialNo', sortable: true,}, - { title: '物料名称',field: 'materialName', sortable: true,width: 100,}, - {title: '描述',field: 'describe',width:80, + + { 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: '当前任务ID',field: 'taskId',visible: false,}, + { title: '待办用户ID',field: 'todoUserId',visible: false,}, + { title: '审核状态',field: 'auditStatus',visible: false, + formatter: function(value, row, index) { + return $.table.selectDictLabel(auditStatusDatas, value); + } + }, + { title: '使用状态',field: 'useStatus',visible: false, + formatter: function(value, row, index) { + return $.table.selectDictLabel(useStatusDatas, value); + } + }, + { title: 'bom号',field: 'bomNo', sortable: true,align: 'center',}, + { title: '料号',field: 'materialNo', sortable: true,align: 'center',}, + { title: '物料名称',field: 'materialName', sortable: true,align: 'center', + formatter: function(value, row, index) { + return $.table.tooltip(value, 5, "open"); + } }, - { title: '品牌',field: 'brand', sortable: true,width: 70,}, - {title: '加工方式',field: 'processMethod',width: 120, + {title: '描述',field: 'describe',align: 'center', + formatter: function(value, row, index) { + return $.table.tooltip(value, 5, "open"); + } + }, + {title: '型号',field: 'materialModel',align: 'center', + }, + { title: '品牌',field: 'brand', align: 'center',sortable: true,}, + {title: '加工方式',field: 'processMethod',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);; } }, - { title: '单位',field: 'unit',align: 'center',width: 50, + { title: '单位',field: 'unit',align: 'center', }, - { title: '图片',field: 'photoUrl',align: 'center',width: 50, + { title: '图片',field: 'photoUrl',align: 'center', formatter: function(value, row, index) {return $.table.imageView(value); } }, - { title: '申请人',field: 'applyUserName',width: 80, + { title: '申请人',field: 'applyUserName',align: 'center', formatter: function(value, row, index) {return '' + (value ? value : "-") + '';} }, - { title: '申请时间',field: 'applyTime',sortable: true,width: 100,}, - { title: '录入时间',field: 'createTime',sortable: true,width: 100,}, - {title: '上次更新时间',field: 'updateTime',width: 120,}, - { title: '当前状态',field: 'taskName',align: 'center',width: 120, + { title: '申请时间',field: 'applyTime',align: 'center',sortable: true,}, + { title: '录入时间',field: 'createTime',align: 'center',sortable: true,}, + {title: '上次更新时间',field: 'updateTime',align: 'center',}, + { title: '当前状态',field: 'taskName',align: 'center', formatter: function(value, row, index) { if(row.auditStatus!="1"&&value != "未启动"){ return '' + value + ''; @@ -193,60 +218,24 @@ 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: '当前任务ID',field: 'taskId',visible: false,}, - { title: '待办用户ID',field: 'todoUserId',visible: false,}, - { title: '审核状态',field: 'auditStatus',visible: false, - formatter: function(value, row, index) { - return $.table.selectDictLabel(auditStatusDatas, value); - } - }, - { title: '使用状态',field: 'useStatus',visible: false, - formatter: function(value, row, index) { - return $.table.selectDictLabel(useStatusDatas, value); - } - }, - { title: '工程员',field: 'engineer', visible: false}, - { title: '物料类型',field: 'materialType',visible: false, - formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}}, - { title: '加工方式',field: 'processMethod',visible: false, - formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);} - }, - { title: '父级id',field: 'parentId',visible:false }, - {title: '层级',field: 'level', visible:false, - formatter: function(value, row, index) { - return $.table.selectDictLabel(levelDatas, value); - } - }, - { - field: 'sortNo', - title: '排序', - visible: false - }, { title: '操作', align: 'center', - width: 120, formatter: function(value, row, index) { var actions = []; // 审核状态-审核通过 使用状态-是 未发起作废流程 if(row.auditStatus=="1" && row.useStatus=="1" && !row.cancelInstanceId){ // 作废 - actions.push(' 作废'); + actions.push(' 作废'); // 编辑 - actions.push(' 编辑 '); + actions.push(' 编辑 '); }else{ - actions.push(' 编辑 '); + actions.push(' 编辑 '); } // 已作废 if(row.useStatus=="2" && !row.restoreInstanceId){ // 恢复 - actions.push(' 恢复 '); + actions.push(' 恢复 '); } // 有流程实例id if (row.instanceId) { @@ -255,17 +244,18 @@ var todoUserIdList = row.todoUserId.split(","); if(todoUserIdList.includes(loginName)){ var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; - actions.push(' '+nodeName+' '); + actions.push(' '+nodeName+' '); } } // 审批历史 - actions.push(' 审批历史 '); + actions.push(' 审批历史 '); // 进度查看 - actions.push(' 进度查看 '); + actions.push(' 进度查看 '); } // 详情 - actions.push(' 详情 '); - return actions.join(''); + actions.push(' 详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }], rowStyle: function (row, index) {