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

[fix] 生产管理 

制程类别明细列表页面、工序明细列表页面、成品SOP列表页面、生产订单列表页面、生产入库单列表页面、物料退检单列表页面，操作栏目按照全局统一样式进行调整
dev
liuxiaoxu 2 months ago
parent
b24a539e37
commit
45051ebff6
6 changed files with 31 additions and 39 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. 5
      ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html
  2. 9
      ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/materialReturnInspection.html
  3. 16
      ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
  4. 15
      ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html
  5. 16
      ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html
  6. 9
      ruoyi-admin/src/main/resources/templates/system/sop/sop.html

5
ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html
View File

@ -45,7 +45,7 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="erp:inboundOrder:export"> <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="erp:inboundOrder:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
@ -167,7 +167,8 @@
title: '操作', align: 'center',formatter: function(value, row, index) { title: '操作', align: 'center',formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="storageMakeDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> '); actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="storageMakeDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
} }
] ]

9
ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/materialReturnInspection.html
View File

@ -56,7 +56,7 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:materialReturnInspection:add"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:materialReturnInspection:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="erp:materialReturnInspection:export"> <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="erp:materialReturnInspection:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
@ -127,10 +127,11 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> '); actions.push('<a href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
}] }]
}; };

16
ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
View File

@ -261,38 +261,38 @@
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> '); // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
//详情页面 工程审核为详情页面 //详情页面 工程审核为详情页面
// actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> '); // actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'详情\',\'' + prefix+"/detail/"+row.id + '\')"><i class="fa fa-info"></i>详情</a> '); actions.push('<a href="javascript:void(0)" onclick="$.modal.open(\'详情\',\'' + prefix+"/detail/"+row.id + '\')"><i class="fa fa-info"></i>详情</a> ');
// 评审 // 评审
if(row.makeStatus == '0'){ if(row.makeStatus == '0'){
actions.push('<a class="btn btn-success btn-xs ' + reviewFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'部门评审\',\'' + prefix+"/bmps/"+row.id + '\')"><i class="fa fa-edit"></i>评审</a> '); actions.push('<a class=" ' + reviewFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'部门评审\',\'' + prefix+"/bmps/"+row.id + '\')"><i class="fa fa-edit"></i>评审</a> ');
} }
// 部门主管确认 // 部门主管确认
if(row.deptLeaderConfirmStatus == '0'){ if(row.deptLeaderConfirmStatus == '0'){
actions.push('<a class="btn btn-success btn-xs ' + confirmFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'部门主管确认\',\'' + prefix+"/bmzgqr/"+row.id + '\')"><i class="fa fa-edit"></i>确认时间</a> '); actions.push('<a class=" ' + confirmFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'部门主管确认\',\'' + prefix+"/bmzgqr/"+row.id + '\')"><i class="fa fa-edit"></i>确认时间</a> ');
} }
// 工程审核 // 工程审核
if(row.makeStatus == '2'){ if(row.makeStatus == '2'){
actions.push('<a class="btn btn-success btn-xs ' + engineerFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'工程审核\',\'' + prefix+"/gcsh/"+row.id + '\')"><i class="fa fa-edit"></i>工程审核</a> '); actions.push('<a class=" ' + engineerFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'工程审核\',\'' + prefix+"/gcsh/"+row.id + '\')"><i class="fa fa-edit"></i>工程审核</a> ');
} }
// 采购审核：生产状态-待采购审核，采购上级确认状态-已确认 // 采购审核：生产状态-待采购审核，采购上级确认状态-已确认
if(row.makeStatus == '7'&&row.purchaseStatus == '1'){ if(row.makeStatus == '7'&&row.purchaseStatus == '1'){
actions.push('<a class="btn btn-success btn-xs ' + purchaseFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'采购审核\',\'' + prefix+"/cgsh/"+row.id + '\')"><i class="fa fa-edit"></i>采购审核</a> '); actions.push('<a class="' + purchaseFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'采购审核\',\'' + prefix+"/cgsh/"+row.id + '\')"><i class="fa fa-edit"></i>采购审核</a> ');
} }
// 领料 // 领料
if((row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5') && if((row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5') &&
(row.eceiptStatus == '7' || row.eceiptStatus == '8')){ (row.eceiptStatus == '7' || row.eceiptStatus == '8')){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'添加领料单\',\'' + prefix+"/addpick/"+row.id + '\')"><i class="fa fa-edit"></i>领料</a> '); actions.push('<a href="javascript:void(0)" onclick="$.modal.open(\'添加领料单\',\'' + prefix+"/addpick/"+row.id + '\')"><i class="fa fa-edit"></i>领料</a> ');
} }
// 委外计划 // 委外计划
if((row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5') && if((row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5') &&
(row.eceiptStatus == '3' || row.eceiptStatus == '4'|| row.eceiptStatus == '5'|| row.eceiptStatus == '6'|| row.eceiptStatus == '7' (row.eceiptStatus == '3' || row.eceiptStatus == '4'|| row.eceiptStatus == '5'|| row.eceiptStatus == '6'|| row.eceiptStatus == '7'
|| row.eceiptStatus == '8')){ || row.eceiptStatus == '8')){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'添加委外计划\',\'' + prefix+"/addOutsourcePlan/"+row.id + '\')"><i class="fa fa-edit"></i>委外计划</a> '); actions.push('<a href="javascript:void(0)" onclick="$.modal.open(\'添加委外计划\',\'' + prefix+"/addOutsourcePlan/"+row.id + '\')"><i class="fa fa-edit"></i>委外计划</a> ');
} }
// 委内入库 对应生产中 // 委内入库 对应生产中
if(row.makeStatus == '4' || row.makeStatus == '5'){ if(row.makeStatus == '4' || row.makeStatus == '5'){
// actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'创建委内入库单\',\'' + prefix+"/addProcessInbound/"+row.id + '\')">委内入库</a> '); // actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'创建委内入库单\',\'' + prefix+"/addProcessInbound/"+row.id + '\')">委内入库</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'创建生产入库和设备履历设置\',\'' + prefix+"/addProduceInbound/"+row.id + '\')"><i class="fa fa-edit"></i>生产入库</a> '); actions.push('<a href="javascript:void(0)" onclick="$.modal.open(\'创建生产入库和设备履历设置\',\'' + prefix+"/addProduceInbound/"+row.id + '\')"><i class="fa fa-edit"></i>生产入库</a> ');
} }

15
ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html
View File

@ -52,12 +52,6 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:procedure:add"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:procedure:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:procedure:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:procedure:remove">-->
<!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>-->
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:procedure:export">--> <!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:procedure:export">-->
<!-- <i class="fa fa-download"></i> 导出--> <!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>--> <!-- </a>-->
@ -104,10 +98,11 @@
{field: 'updateTime', title: '上次更新时间'}, {field: 'updateTime', title: '上次更新时间'},
{title: '操作',align: 'center',formatter: function(value, row, index) { {title: '操作',align: 'center',formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-primary btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> '); actions.push('<a href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
} }
] ]

16
ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html
View File

@ -31,12 +31,6 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:processCategory:add"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:processCategory:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:processCategory:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:processCategory:remove">
<i class="fa fa-remove"></i> 删除
</a>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:processCategory:export">--> <!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:processCategory:export">-->
<!-- <i class="fa fa-download"></i> 导出--> <!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>--> <!-- </a>-->
@ -63,7 +57,6 @@
showColumns: false, showColumns: false,
fixedColumns: true, // 启用冻结列 fixedColumns: true, // 启用冻结列
fixedRightNumber: 1, // 冻结右列个数 fixedRightNumber: 1, // 冻结右列个数
height: $(window).height() - 100,
modalName: "制程类别明细", modalName: "制程类别明细",
columns: [ columns: [
{checkbox: true}, {checkbox: true},
@ -79,10 +72,11 @@
{field: 'updateTime',title: '上次更新时间'}, {field: 'updateTime',title: '上次更新时间'},
{title: '操作',align: 'center',formatter: function(value, row, index) { {title: '操作',align: 'center',formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="#" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> '); actions.push('<a class="' + editFlag + '" href="#" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
} }
] ]

9
ruoyi-admin/src/main/resources/templates/system/sop/sop.html
View File

@ -213,11 +213,12 @@
}, },
{title: '操作',align: 'center',formatter: function(value, row, index) { {title: '操作',align: 'center',formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-primary btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-remove"></i>详情</a>'); actions.push('<a href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-remove"></i>详情</a>');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
} }
] ]

Write Preview
Loading…
Cancel
Save