diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java index ddcab230..7156e625 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java +++ b/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"; diff --git a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html index c395b8c0..63f5bcf2 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html +++ b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html @@ -45,7 +45,7 @@ 添加业务团队 - + 业务绩效系数配置 @@ -155,8 +155,8 @@ }; $.table.init(options); }); - function showUtbCodf(){ - var url = prefix + "/utbcodf"; + function showUtbCoef(){ + var url = prefix + "/coef"; $.modal.open("业务绩效系数配置", url); } diff --git a/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html b/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html index 6352c32c..4ca04a5d 100644 --- a/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html +++ b/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html @@ -89,9 +89,6 @@
- - 添加 -
@@ -143,11 +140,6 @@ var actions = []; actions.push('编辑 '); actions.push('详情 '); - if(row.delFlag == '0'){ - actions.push('作废 '); - }else{ - actions.push('恢复 '); - } return actions.join(''); } } diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html index c15ed92d..0c603749 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html @@ -2,6 +2,9 @@ + + +
@@ -44,13 +47,17 @@
- +
- +
@@ -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 = []; diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html index 35d9636c..72442d40 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html @@ -98,7 +98,8 @@
- + +