Browse Source

[feat] 报销管理页面字段调整,业务绩效团队添加

dev
zhangsiqi 6 months ago
parent
commit
5e6560a378
  1. 2
      ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java
  2. 6
      ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
  3. 8
      ruoyi-admin/src/main/resources/templates/financial/expense/expense.html
  4. 55
      ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html
  5. 3
      ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html
  6. 1
      ruoyi-admin/src/main/resources/templates/system/baseExpense/edit.html

2
ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java

@ -86,7 +86,7 @@ public class ErpUtbItemController extends BaseController
* 业务绩效系数表单
* @return
*/
@RequestMapping("/utbcoef")
@RequestMapping("/coef")
public String utbcoef()
{
return prefix + "/utbcoef";

6
ruoyi-admin/src/main/resources/templates/erp/utb/utb.html

@ -45,7 +45,7 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:utb:add">
<i class="fa fa-plus"></i> 添加业务团队
</a>
<a class="btn btn-success" onclick="showUtbCodf()" shiro:hasPermission="erp:utb:add">
<a class="btn btn-success" onclick="showUtbCoef()" shiro:hasPermission="erp:utb:add">
<i class="fa fa-plus"></i> 业务绩效系数配置
</a>
</div>
@ -155,8 +155,8 @@
};
$.table.init(options);
});
function showUtbCodf(){
var url = prefix + "/utbcodf";
function showUtbCoef(){
var url = prefix + "/coef";
$.modal.open("业务绩效系数配置", url);
}
</script>

8
ruoyi-admin/src/main/resources/templates/financial/expense/expense.html

@ -89,9 +89,6 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:baseExpense:add">
<i class="fa fa-plus"></i> 添加
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
@ -143,11 +140,6 @@
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.expenseId + '\')"><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.expenseId + '\')"><i class="fa fa-details"></i>详情</a> ');
if(row.delFlag == '0'){
actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
}else{
actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
}
return actions.join('');
}
}

55
ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html

@ -2,6 +2,9 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增报销单')" />
<th:block th:include="include :: datetimepicker-css" />
<th:block th:include="include :: select2-css" />
<th:block th:include="include :: bootstrap-editable-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -44,13 +47,17 @@
<div class="form-group">
<label class="col-sm-6 control-label">是否是委外/采购采销:</label>
<div class="col-sm-6">
<input name="isPurchaseOutsource" class="form-control" type="text">
<select name="isPurchaseOutsource" class="form-control" th:with="dictOptions=${@dict.getType('sys_whether')}">
<option th:each="dict : ${dictOptions}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label">供应商ID:</label>
<div class="col-sm-6">
<input name="supplierCode" class="form-control" type="text">
<select name="supplierCode" class="form-control" th:with="supplierList=${@supplier.selectSysSupplierListAll()}">
<option th:each="supplier : ${supplierList}" th:text="${supplier.supplierName}" th:value="${supplier.supplierCode}"></option>
</select>
</div>
</div>
<div class="form-group">
@ -109,6 +116,12 @@
// 假设此函数返回供应商列表
});
$('#supplierCode').on('select2:select', function (e) {
var data = e.params.data;
$("input[name='corporatePayee']").val(data.supplierName);
$("input[name='corporateReceivingAccount']").val(data.bankAccount);
$("input[name='publicAccountBanks']").val(data.depositBank);
});
//获取子表信息
$(function() {
var options = {
@ -135,12 +148,38 @@
return getCostSmallType(value,row,index)
}
},
{title: '用途',field: 'purpose',editable:{type:'text',options:{maxlength:100}}},
{title: '金额',field: 'amounts',editable: {type:'text',options:{maxlength:100}}},
{title: '报销时间',field: 'expenseTime',editable:{type:'date'}},
{title: '出差单号',field: 'evectionCode',},
{title: '采购单号',field: 'purcahseCode',},
{title: '委外单号',field: 'outsourceCode',},
{title: '用途',field: 'purpose',
editable:{
type:'text',
mode:'inline',
}
},
{title: '金额',field: 'amounts',
editable:{
type:'text',
mode:'inline',
}
},
{title: '报销时间',field: 'expenseTime',editable:{
type:'text',
mode:'inline',
}
},
{title: '出差单号',field: 'evectionCode',editable:{
type:'text',
mode:'inline',
}
},
{title: '采购单号',field: 'purcahseCode',editable:{
type:'text',
mode:'inline',
}
},
{title: '委外单号',field: 'outsourceCode',editable:{
type:'text',
mode:'inline',
}
},
{title: '操作', align: 'center',
formatter: function (value, row, index) {
var actions = [];

3
ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html

@ -98,7 +98,8 @@
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: footer" />
<th:block th:include="include :: bootstrap-table-editable-js" />
<script th:inline="javascript">
var costTypeDatas = [[${@category.getChildByCode('costType')}]];
var editFlag = [[${@permission.hasPermi('system:baseExpense:edit')}]];

1
ruoyi-admin/src/main/resources/templates/system/baseExpense/edit.html

@ -84,6 +84,7 @@
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: bootstrap-table-editable-js" />
<script th:inline="javascript">
var prefix = ctx + "system/baseExpense"
var costTypeDatas = [[${@category.getChildByCode('costType')}]];

Loading…
Cancel
Save