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

[fix] 基础资料模块 

按照万材要求：调整报销单页面表头的按钮布局
修改物料的操作栏按钮，引用$.table.dropdownToggle方法
修改报销单添加页面：解决页面布局错乱的问题
请购单子表列表页面去掉无用的搜索按钮，请购单子表按钮和其他页面保持一致
dev
liuxiaoxu 4 months ago
parent
3e2066edc3
commit
bea978cffe
2 changed files with 44 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html
  2. 23
      ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html

68
ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html
View File

@ -9,36 +9,44 @@
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-baseExpense-add">
<div class="col-xs-12">
<div class="col-xs-3" style="margin-left: 80px;">
<label class="col-sm-4 control-label is-required">部门：</label>
<div class="col-sm-8">
<input name="deptName" class="form-control" type="text" readonly required>
</div>
<div class="form-group">
<label class="col-sm-4 control-label is-required">部门：</label>
<div class="col-sm-8">
<input name="deptName" class="form-control" type="text" readonly required>
</div>
<div class="col-xs-3">
<label class="col-sm-4 control-label">岗位：</label>
<div class="col-sm-8">
<input name="postName" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">岗位：</label>
<div class="col-sm-8">
<input name="postName" class="form-control" type="text" readonly>
</div>
<div class="col-xs-3">
<label class="col-sm-4 control-label is-required">姓名：</label>
<div class="col-sm-8">
<input name="fullName" class="form-control" type="text" readonly required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label is-required">姓名：</label>
<div class="col-sm-8">
<input name="fullName" class="form-control" type="text" readonly required>
</div>
</div>
<div class="col-xs-10" style="padding-left: 96px;padding-top: 20px;">
<div class="form-group">
<label class="col-sm-3 control-label is-required">报销方式：</label>
<div class="col-sm-6">
<select id="add_expenseMethod" name="expenseMethod" onchange="handleExpenseMethod(this)" class="form-control" th:with="dictList=${@dict.getType('sys_base_expense_method')}" required>
<option th:each="dict : ${dictList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">备注：</label>
<div class="col-sm-8">
<textarea name="remark" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label is-required">报销方式：</label>
<div class="col-sm-8">
<select id="add_expenseMethod" name="expenseMethod" onchange="handleExpenseMethod(this)" class="form-control" th:with="dictList=${@dict.getType('sys_base_expense_method')}" required>
<option th:each="dict : ${dictList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div id="add_expenseMethodModal" class="container" style="display: none;margin-left: 150px;border: 1px dashed #ddd;padding-top: 10px;padding-bottom: 10px;">
<div class="col-xs-6">
<label class="col-sm-4 control-label is-required" style="text-align: left;padding-left: 0px;padding-right: 0px;">是否是委外/采购报销：</label>
@ -75,14 +83,6 @@
</div>
</div>
<input type="hidden" name="expenseDetailList" id="expenseDetailList">
<div class="col-xs-6" style="margin-left: 100px;padding-top: 10px;">
<div class="form-group">
<label class="col-sm-4 control-label">备注：</label>
<div class="col-sm-8">
<textarea name="remark" class="form-control"></textarea>
</div>
</div>
</div>
</form>
<div class="container" style="margin-top: 5px;">
<div class="form-row">
@ -116,9 +116,7 @@
getSelections();
var options = {
id:'bootstrap-sub-table-expense',
pagination: false,
showToggle: false,
showColumns: false,
showSearch: false,
showFooter: true,
model: "报销单数据",
columns: [

23
ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html
View File

@ -128,8 +128,6 @@
exportUrl: prefix + "/export",
detailUrl: prefix + "/detail/{id}",
modalName: "报销单",
height: 800,
// pageSize: 10,
sortable: true, // 是否启用排序
sortStable: true, // 设置为 true 将获得稳定的排序
fixedColumns: true, // 启用冻结列
@ -198,13 +196,13 @@
formatter: function (value, row, index) {
var actions = [];
if(row.auditStatus=="1" && row.useStatus=="1") {
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.expenseId + '\')"><i class="fa fa-remove"></i> 作废</a>');
actions.push('<a href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.expenseId + '\')"><i class="fa fa-remove"></i> 作废</a>');
}if(row.attrs == "2"){
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.expenseId + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
actions.push('<a href="javascript:void(0)" onclick="$.operate.edit(\'' + row.expenseId + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
}
// 有流程实例id
if(row.useStatus=="2" ){
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.expenseId + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
actions.push('<a href="javascript:void(0)" onclick="$.operate.restore(\'' + row.expenseId + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
}
// 有流程实例id
if (row.instanceId) {
@ -213,21 +211,22 @@
var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName)){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+ row.instanceTypeName +"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
actions.push('<a href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+ row.instanceTypeName +"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
}
}
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
actions.push('<a href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
actions.push('<a href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
}
if(row.auditStatus=="1" && row.managerAuditStatus=="1") {
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="exportExpense(\'' + row.expenseId + '\', \'' + row.expenseCode + '\')"><i class="fa fa-print"></i> 导出</a> ');
actions.push('<a href="javascript:void(0)" onclick="exportExpense(\'' + row.expenseId + '\', \'' + row.expenseCode + '\')"><i class="fa fa-print"></i> 导出</a> ');
}
if(row.auditStatus=="1" && row.financeAuditStatus=="3" && row.managerAuditStatus=="1") {
actions.push('<a class="btn btn-success btn-xs ' + comfrimExpenseFlag + '" href="javascript:void(0)" onclick="financialExpenseAmount(\'' + row.expenseId + '\')"><i class="fa fa-print"></i> 确认打款</a>');
actions.push('<a class="' + comfrimExpenseFlag + '" href="javascript:void(0)" onclick="financialExpenseAmount(\'' + row.expenseId + '\')"><i class="fa fa-print"></i> 确认打款</a>');
}
// 详情
actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.expenseId + '\')"><i class="fa fa-eye"></i> 详情</a> ');
return actions.join('');
actions.push('<a href="javascript:void(0)" onclick="$.operate.detail(\'' + row.expenseId + '\')"><i class="fa fa-eye"></i> 详情</a> ');
var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
}
}
],

Write Preview
Loading…
Cancel
Save