Browse Source

[fix]

基础资料 报销单
修改报销经理、报销主管、副总经理、总经理、财务审批页面显示字段及排版效果;
dev
王晓迪 2 months ago
parent
commit
5cc4028e49
  1. 63
      ruoyi-admin/src/main/resources/templates/system/baseExpense/taskBxjlVerify.html
  2. 61
      ruoyi-admin/src/main/resources/templates/system/baseExpense/taskBxzgVerify.html
  3. 70
      ruoyi-admin/src/main/resources/templates/system/baseExpense/taskCwVerify.html
  4. 50
      ruoyi-admin/src/main/resources/templates/system/baseExpense/taskFzjlVerify.html
  5. 133
      ruoyi-admin/src/main/resources/templates/system/baseExpense/taskModifyApply.html
  6. 56
      ruoyi-admin/src/main/resources/templates/system/baseExpense/taskZozjVerify.html

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

@ -39,13 +39,13 @@
<div class="form-group">
<label class="col-sm-3 control-label">部门:</label>
<div class="col-sm-8">
<select name="deptName" th:field="*{deptName}" class="form-control" disabled>
<input name="deptName" th:field="*{deptName}" class="form-control" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">岗位:</label>
<div class="col-sm-8">
<select name="postName" th:field="*{postName}" class="form-control" disabled>
<input name="postName" th:field="*{postName}" class="form-control" disabled>
</div>
</div>
<div class="form-group">
@ -54,9 +54,9 @@
<input name="fullName" th:field="*{fullName}" class="form-control" disabled>
</div>
</div>
<div class="col-xs-12">
<label class="col-sm-6 control-label">报销方式:</label>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-3 control-label">报销方式:</label>
<div class="col-sm-8">
<select id="bxjl_expenseMethod" name="expenseMethod" th:field="*{expenseMethod}" onchange="handleExpenseMethod(this)"
class="form-control"
th:with="dictList=${@dict.getType('sys_base_expense_method')}" disabled>
@ -64,41 +64,41 @@
</select>
</div>
</div>
<div id="bxjl_expenseMethodModal" class="container" style="display: none">
<div id="bxjl_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-3 control-label is-required">是否是委外/采购采销:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required" style="text-align: left;padding-left: 0px;padding-right: 0px;">是否是委外/采购采销:</label>
<div class="col-sm-6">
<select name="isPurchaseOutsource" class="form-control" th:with="dictList=${@dict.getType('sys_whether')}" disabled required>
<option th:each="dict : ${dictList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">供应商ID:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">供应商ID:</label>
<div class="col-sm-6">
<input id="supplierCode" name="supplierCode" th:field="*{supplierCode}" class="form-control" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公收款方:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公收款方:</label>
<div class="col-sm-6">
<input name="corporatePayee" th:field="*{corporatePayee}" class="form-control" type="text" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公收款账户:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公收款账户:</label>
<div class="col-sm-6">
<input name="corporateReceivingAccount" th:field="*{corporateReceivingAccount}" class="form-control" type="text" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公开户行:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公开户行:</label>
<div class="col-sm-6">
<input name="publicAccountBanks" th:field="*{publicAccountBanks}" class="form-control" type="text" disabled required>
</div>
</div>
</div>
<div class="form-group">
<div class="form-group" style="padding-top: 10px;">
<label class="col-sm-3 control-label is-required" for="bxjlVerifyApproved">审批意见:</label>
<div class="col-sm-6">
<select name="p_B_bxjlVerifyApproved" id="bxjlVerifyApproved" class="form-control" required>
@ -108,7 +108,12 @@
</select>
</div>
</div>
<div class="form-group" style="padding-top: 10px;">
<label class="col-sm-3 control-label">批注:</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control" width="30%"></textarea>
</div>
</div>
</form>
<div class="container">
<div class="form-row">
@ -144,6 +149,7 @@
},
pagination: false,
sidePagination: "client",
showFooter: true,
model: "报销单数据",
editable: true,
columns: [
@ -165,15 +171,24 @@
return getCostSmallType(value,row,index)
}
},
{title: '用途',field: 'purpose',editable:{type:'text',mode:'inline'}},
{title: '金额',field: 'amounts',editable: {type:'text',mode:'inline'}},
{title: '报销时间',field: 'expenseTime',editable:{type:'date',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: '用途',field: 'purpose',},
{title: '金额',field: 'amounts',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].amounts)|| 0;
}
return "总金额: " + sum.toFixed(2);
}
},
{title: '报销时间',field: 'expenseTime',visible: false},
{title: '出差单号',field: 'evectionCode',},
{title: '采购单号',field: 'purcahseCode',},
{title: '委外单号',field: 'outsourceCode',},
],
};
$.table.init(options);
handleExpenseMethod(this);
});
// 列中获取成本类型的下拉改变数据

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

@ -55,52 +55,52 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label">报销方式:</label>
<div class="col-sm-6">
<select id="bxjl_expenseMethod" name="expenseMethod" th:field="*{expenseMethod}"
<label class="col-sm-3 control-label">报销方式:</label>
<div class="col-sm-8">
<select id="bxzg_expenseMethod" name="expenseMethod" th:field="*{expenseMethod}"
onchange="handleExpenseMethod(this)" class="form-control"
th:with="dictList=${@dict.getType('sys_base_expense_method')}" disabled>
<option th:each="dict : ${dictList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div id="bxjl_expenseMethodModal" class="container" style="display: none">
<div id="bxzg_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-3 control-label is-required">是否是委外/采购采销:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required" style="text-align: left;padding-left: 0px;padding-right: 0px;">是否是委外/采购采销:</label>
<div class="col-sm-6">
<select name="isPurchaseOutsource" class="form-control" th:with="dictList=${@dict.getType('sys_whether')}" disabled required>
<option th:each="dict : ${dictList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">供应商ID:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">供应商ID:</label>
<div class="col-sm-6">
<input id="supplierCode" name="supplierCode" th:field="*{supplierCode}" class="form-control" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公收款方:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公收款方:</label>
<div class="col-sm-6">
<input name="corporatePayee" th:field="*{corporatePayee}" class="form-control" type="text" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公收款账户:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公收款账户:</label>
<div class="col-sm-6">
<input name="corporateReceivingAccount" th:field="*{corporateReceivingAccount}" class="form-control" type="text" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公开户行:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公开户行:</label>
<div class="col-sm-6">
<input name="publicAccountBanks" th:field="*{publicAccountBanks}" class="form-control" type="text" disabled required>
</div>
</div>
</div>
<div class="form-group">
<div class="form-group" style="padding-top: 10px;">
<label class="col-sm-3 control-label is-required" for="bxzgVerifyApproved">审批意见:</label>
<div class="col-sm-6">
<div class="col-sm-8">
<select name="p_B_bxzgVerifyApproved" id="bxzgVerifyApproved" class="form-control" required>
<option value=""></option>
<option value="true">同意</option>
@ -108,6 +108,12 @@
</select>
</div>
</div>
<div class="form-group" style="padding-top: 10px;">
<label class="col-sm-3 control-label">批注:</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control" width="30%"></textarea>
</div>
</div>
</form>
<div class="container">
@ -144,10 +150,10 @@
},
pagination: false,
sidePagination: "client",
showFooter: true,
model: "报销单数据",
editable: true,
columns: [
{checkbox: true},
{title: '主键',field: 'index',visible: false,
formatter: function (value, row, index) {
return index;
@ -165,15 +171,24 @@
return getCostSmallType(value,row,index)
}
},
{title: '用途',field: 'purpose',editable:{type:'text',mode:'inline'}},
{title: '金额',field: 'amounts',editable: {type:'text',mode:'inline'}},
{title: '报销时间',field: 'expenseTime',editable:{type:'date',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: '用途',field: 'purpose',},
{title: '金额',field: 'amounts',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].amounts)|| 0;
}
return "总金额: " + sum.toFixed(2);
}
},
{title: '报销时间',field: 'expenseTime',visible: false},
{title: '出差单号',field: 'evectionCode',},
{title: '采购单号',field: 'purcahseCode',},
{title: '委外单号',field: 'outsourceCode',},
],
};
$.table.init(options);
handleExpenseMethod(this);
});
// 列中获取成本类型的下拉改变数据
function onCostTypeChange(selectElement, rowIndex) {

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

@ -33,70 +33,72 @@
<div class="form-group">
<label class="col-sm-3 control-label">标题:</label>
<div class="col-sm-8">
<input name="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
<input name="title" th:field="*{applyTitle}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门:</label>
<div class="col-sm-8">
<select name="deptName" th:field="*{deptName}" class="form-control"></select>
<input name="deptName" th:field="*{deptName}" class="form-control" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">岗位:</label>
<div class="col-sm-8">
<select name="postName" th:field="*{postName}" class="form-control"></select>
<input name="postName" th:field="*{postName}" class="form-control" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">姓名:</label>
<div class="col-sm-8">
<select name="fullName" th:field="*{fullName}" class="form-control"></select>
<input name="fullName" th:field="*{fullName}" class="form-control" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label">报销方式:</label>
<div class="col-sm-6">
<select id="cw_expenseMethod" name="expenseMethod" th:field="*{expenseMethod}" onchange="handleExpenseMethod(this)" class="form-control" th:with="dictList=${@dict.getType('sys_base_expense_method')}">
<label class="col-sm-3 control-label">报销方式:</label>
<div class="col-sm-8">
<select id="cw_expenseMethod" name="expenseMethod" th:field="*{expenseMethod}" onchange="handleExpenseMethod(this)"
class="form-control"
th:with="dictList=${@dict.getType('sys_base_expense_method')}" disabled>
<option th:each="dict : ${dictList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div id="cw_expenseMethodModal" class="container" style="display: none">
<div id="cw_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-3 control-label is-required">是否是委外/采购采销:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required" style="text-align: left;padding-left: 0px;padding-right: 0px;">是否是委外/采购采销:</label>
<div class="col-sm-6">
<select name="isPurchaseOutsource" class="form-control" th:with="dictList=${@dict.getType('sys_whether')}" disabled required>
<option th:each="dict : ${dictList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">供应商ID:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">供应商ID:</label>
<div class="col-sm-6">
<input id="supplierCode" name="supplierCode" th:field="*{supplierCode}" class="form-control" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公收款方:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公收款方:</label>
<div class="col-sm-6">
<input name="corporatePayee" th:field="*{corporatePayee}" class="form-control" type="text" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公收款账户:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公收款账户:</label>
<div class="col-sm-6">
<input name="corporateReceivingAccount" th:field="*{corporateReceivingAccount}" class="form-control" type="text" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公开户行:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公开户行:</label>
<div class="col-sm-6">
<input name="publicAccountBanks" th:field="*{publicAccountBanks}" class="form-control" type="text" disabled required>
</div>
</div>
</div>
<div class="form-group">
<div class="form-group" style="padding-top: 10px;">
<label class="col-sm-3 control-label is-required" for="cwVerifyApproved">审批意见:</label>
<div class="col-sm-6">
<select name="p_B_cwVerifyApproved" id="cwVerifyApproved" class="form-control" required>
@ -106,12 +108,17 @@
</select>
</div>
</div>
<div class="form-group" style="padding-top: 10px;">
<label class="col-sm-3 control-label">批注:</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control" width="30%"></textarea>
</div>
</div>
</form>
<div class="container">
<div class="form-row">
<div class="btn-group-sm" id="toolbar" role="group">
<span>选择报销分类信息</span>
<span>报销分类信息</span>
</div>
</div>
<div class="row">
@ -142,6 +149,7 @@
},
pagination: false,
sidePagination: "client",
showFooter: true,
model: "报销单数据",
editable: true,
columns: [
@ -163,12 +171,20 @@
return getCostSmallType(value,row,index)
}
},
{title: '用途',field: 'purpose',editable:{type:'text',mode:'inline'}},
{title: '金额',field: 'amounts',editable: {type:'text',mode:'inline'}},
{title: '报销时间',field: 'expenseTime',editable:{type:'date',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: '用途',field: 'purpose',},
{title: '金额',field: 'amounts',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].amounts)|| 0;
}
return "总金额: " + sum.toFixed(2);
}
},
{title: '报销时间',field: 'expenseTime',visible: false},
{title: '出差单号',field: 'evectionCode',},
{title: '采购单号',field: 'purcahseCode',},
{title: '委外单号',field: 'outsourceCode',},
],
};
$.table.init(options);

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

@ -64,41 +64,41 @@
</select>
</div>
</div>
<div id="fzjl_expenseMethodModal" class="container" style="display: none">
<div id="fzjl_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-3 control-label is-required">是否是委外/采购采销:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required" style="text-align: left;padding-left: 0px;padding-right: 0px;">是否是委外/采购采销:</label>
<div class="col-sm-6">
<select name="isPurchaseOutsource" class="form-control" th:with="dictList=${@dict.getType('sys_whether')}" disabled required>
<option th:each="dict : ${dictList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">供应商ID:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">供应商ID:</label>
<div class="col-sm-6">
<input id="supplierCode" name="supplierCode" th:field="*{supplierCode}" class="form-control" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公收款方:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公收款方:</label>
<div class="col-sm-6">
<input name="corporatePayee" th:field="*{corporatePayee}" class="form-control" type="text" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公收款账户:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公收款账户:</label>
<div class="col-sm-6">
<input name="corporateReceivingAccount" th:field="*{corporateReceivingAccount}" class="form-control" type="text" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公开户行:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公开户行:</label>
<div class="col-sm-6">
<input name="publicAccountBanks" th:field="*{publicAccountBanks}" class="form-control" type="text" disabled required>
</div>
</div>
</div>
<div class="form-group">
<div class="form-group" style="padding-top: 10px;">
<label class="col-sm-3 control-label is-required" for="fzjlVerifyApproved">审批意见:</label>
<div class="col-sm-8">
<select name="p_B_fzjlVerifyApproved" id="fzjlVerifyApproved" class="form-control" required>
@ -107,9 +107,8 @@
<option value="false">拒绝</option>
</select>
</div>
</div>
<div class="form-group">
<div class="form-group" style="padding-top: 10px;">
<label class="col-sm-3 control-label">批注:</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control" width="30%"></textarea>
@ -119,7 +118,7 @@
<div class="container">
<div class="form-row">
<div class="btn-group-sm" id="toolbar" role="group">
<span>选择报销分类信息</span>
<span>报销分类信息</span>
</div>
</div>
<div class="row">
@ -147,6 +146,7 @@
queryParams: function(params) {return {expenseCode: $("#expenseCode").val()};},
pagination: false,
sidePagination: "client",
showFooter: true,
model: "报销单数据",
editable: true,
columns: [
@ -168,12 +168,20 @@
return getCostSmallType(value,row,index)
}
},
{title: '用途',field: 'purpose',editable:{type:'text',mode:'inline'}},
{title: '金额',field: 'amounts',editable: {type:'text',mode:'inline'}},
{title: '报销时间',field: 'expenseTime',editable:{type:'date',mode:'inline',}},
{title: '出差单号',field: 'evectionCode',editable: {type:'text',mode:'inline'}},
{title: '采购单号',field: 'purchaseCode',editable: {type:'text',mode:'inline',}},
{title: '委外单号',field: 'outsourceCode',editable: {type:'text',mode:'inline',}},
{title: '用途',field: 'purpose',},
{title: '金额',field: 'amounts',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].amounts)|| 0;
}
return "总金额: " + sum.toFixed(2);
}
},
{title: '报销时间',field: 'expenseTime',visible: false},
{title: '出差单号',field: 'evectionCode',},
{title: '采购单号',field: 'purcahseCode',},
{title: '委外单号',field: 'outsourceCode',},
],
};
$.table.init(options);

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

@ -31,33 +31,35 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group" hidden>
<label class="col-sm-3 control-label">标题:</label>
<div class="col-sm-8">
<input name="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门:</label>
<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" th:field="*{deptName}" class="form-control" disabled/>
<input name="deptName" class="form-control" type="text" th:field="*{deptName}" readonly required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">岗位:</label>
<div class="col-xs-3">
<label class="col-sm-4 control-label">岗位:</label>
<div class="col-sm-8">
<input name="postName" th:field="*{postName}" class="form-control" disabled/>
<input name="postName" class="form-control" th:field="*{postName}" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">姓名:</label>
<div class="col-xs-3">
<label class="col-sm-4 control-label is-required">姓名:</label>
<div class="col-sm-8">
<input name="fullName" th:field="*{fullName}" class="form-control" disabled/>
<input name="fullName" class="form-control" th:field="*{fullName}" type="text" readonly required>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label">报销方式:</label>
<div class="col-sm-6">
</div>
<div class="form-group" style="margin-top: 20px;">
<label class="col-sm-4 control-label">报销方式:</label>
<div class="col-sm-8">
<select id="modify_expenseMethod" name="expenseMethod" th:field="*{expenseMethod}" onchange="handleExpenseMethod(this)"
class="form-control"
th:with="dictList=${@dict.getType('sys_base_expense_method')}">
@ -65,39 +67,48 @@
</select>
</div>
</div>
<div id="modify_expenseMethodModal" class="container" style="display: none">
<div id="modify_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-3 control-label is-required">是否是委外/采购采销:</label>
<div class="col-sm-8">
<select name="isPurchaseOutsource" class="form-control" th:with="dictList=${@dict.getType('sys_whether')}">
<label class="col-sm-4 control-label is-required" style="text-align: left;padding-left: 0px;padding-right: 0px;">是否是委外/采购报销:</label>
<div class="col-sm-6">
<select name="isPurchaseOutsource" id="purchaseOutsourceSelect" th:field="*{isPurchaseOutsource}" class="form-control" th:with="dictList=${@dict.getType('sys_whether')}">
<option th:each="dict : ${dictList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">供应商ID:</label>
<div class="col-sm-8">
<input id="supplierCode" name="supplierCode" th:field="*{supplierCode}" class="form-control">
<div class="col-xs-6" id="supplierCodeDiv">
<label class="col-sm-4 control-label is-required">供应商ID:</label>
<div class="col-sm-6">
<select id="supplierCode" name="supplierCode" class="form-control"></select>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公收款方:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公收款方:</label>
<div class="col-sm-6">
<input name="corporatePayee" th:field="*{corporatePayee}" class="form-control" type="text">
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公收款账户:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公收款账户:</label>
<div class="col-sm-6">
<input name="corporateReceivingAccount" th:field="*{corporateReceivingAccount}" class="form-control" type="text">
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公开户行:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公开户行:</label>
<div class="col-sm-6">
<input name="publicAccountBanks" th:field="*{publicAccountBanks}" class="form-control" type="text">
</div>
</div>
<input type="hidden" name="expenseDetailList" id="expenseDetailList">
</div>
<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" th:text="*{remark}"></textarea>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="reApply">是否继续申请:</label>
@ -116,14 +127,11 @@
<a class="btn btn-success" onclick="insertRow()">
<span class="fa fa-plus"></span> 添加报销
</a>
<a class="btn btn-danger" onclick="removeRow()">
<span class="fa fa-remove"></span> 删除报销
</a>
</div>
</div>
<div class="row">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-sub-table-expense-modify"></table>
<table id="bootstrap-sub-table-expense-modify" style="white-space:nowrap;"></table>
</div>
</div>
</div>
@ -146,7 +154,9 @@
var options = {
id:'bootstrap-sub-table-expense-modify',
url: ctx + "system/expenseChild/list",
queryParams: function(params) {return {expenseCode: $("#expenseCode").val()};},
queryParams: function(params) {
return {expenseCode: $("#expenseCode").val()};
},
pagination: false,
sidePagination: "client",
model: "报销单数据",
@ -172,14 +182,14 @@
},
{title: '用途',field: 'purpose',editable:{type:'text',mode:'inline'}},
{title: '金额',field: 'amounts',editable: {type:'text',mode:'inline'}},
{title: '报销时间',field: 'expenseTime',editable:{type:'date',mode:'inline',}},
{title: '报销时间',visible: false,field: 'expenseTime',editable:{type:'date',mode:'inline',}},
{title: '出差单号',field: 'evectionCode',editable: {type:'text',mode:'inline'}},
{title: '采购单号',field: 'purchaseCode',editable: {type:'text',mode:'inline',}},
{title: '委外单号',field: 'outsourceCode',editable: {type:'text',mode:'inline',}},
{title: '操作', align: 'center',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.index + '\')"><i class="fa fa-remove"></i>删除</a> ');
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.expenseChildId + '\')"><i class="fa fa-remove"></i>删除</a> ');
return actions.join('');
}
}
@ -187,6 +197,20 @@
};
$.table.init(options);
handleExpenseMethod(this);
loadSupplierCodes();
// 根据是否委外/采购控制显示/隐藏供应商ID框
$('#purchaseOutsourceSelect').on('change',function() {
var selectedValue = $(this).val();
if (selectedValue === '1') {
$('#supplierCodeDiv').show();
} else {
$('#supplierCodeDiv').hide();
}
});
$('#purchaseOutsourceSelect').trigger('change');
});
function insertRow() {
$("bootstrap-sub-table-expense-modify").bootstrapTable('insertRow', {
@ -320,18 +344,39 @@
});
}
function removeRow(){
var ids = $.table.selectColumns("index");
if (ids.length == 0) {
$.modal.alertWarning("请至少选择一条记录");
return;
function removeRow(expenseChildId) {
console.log(expenseChildId);
// 使用索引值移除行
$('#bootstrap-sub-table-expense-modify').bootstrapTable('remove', {
field: 'expenseChildId',
values: expenseChildId
});
}
$("#bootstrap-sub-table-expense").bootstrapTable('remove', {
field: 'index',
values: ids
})
function loadSupplierCodes() {
var url = ctx + 'system/supplier/getSupplier';
$.ajax({
type: 'post', // 请求类型
url: url, // 后端接口URL
dataType: 'json', // 预期服务器返回的数据类型
success: function(data) {
if (data.rows && Array.isArray(data.rows)) {
var selectElement = $('#supplierCode'); // 获取仓库编号下拉框元素
// 清空下拉框现有选项
selectElement.empty();
// 添加默认选项(如果需要)编辑时不需要添加默认选项
selectElement.append('<option value="">所有</option>');
// 遍历返回的数据,添加为下拉框的选项
$.each(data.rows, function(index, item) {
// 仓库ID
selectElement.append('<option value="' + item.supplierCode + '">' + item.supplierCode + '</option>');
});
selectElement.val(baseExpense.supplierCode);
} else {
$.modal.alertWarning("数据为空");
}
}
});
}
$("input[name='expenseTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",

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

@ -56,8 +56,8 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label">报销方式:</label>
<div class="col-sm-6">
<label class="col-sm-3 control-label">报销方式:</label>
<div class="col-sm-8">
<select id="zozj_expenseMethod" name="expenseMethod" th:field="*{expenseMethod}" onchange="handleExpenseMethod(this)"
class="form-control"
th:with="dictList=${@dict.getType('sys_base_expense_method')}" disabled>
@ -65,57 +65,56 @@
</select>
</div>
</div>
<div id="zozj_expenseMethodModal" class="container" style="display: none">
<div id="zozj_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-3 control-label is-required">是否是委外/采购采销:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required" style="text-align: left;padding-left: 0px;padding-right: 0px;">是否是委外/采购采销:</label>
<div class="col-sm-6">
<select name="isPurchaseOutsource" class="form-control" th:with="dictList=${@dict.getType('sys_whether')}" disabled required>
<option th:each="dict : ${dictList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">供应商ID:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">供应商ID:</label>
<div class="col-sm-6">
<input id="supplierCode" name="supplierCode" th:field="*{supplierCode}" class="form-control" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公收款方:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公收款方:</label>
<div class="col-sm-6">
<input name="corporatePayee" th:field="*{corporatePayee}" class="form-control" type="text" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公收款账户:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公收款账户:</label>
<div class="col-sm-6">
<input name="corporateReceivingAccount" th:field="*{corporateReceivingAccount}" class="form-control" type="text" disabled required>
</div>
</div>
<div class="col-xs-6">
<label class="col-sm-3 control-label is-required">对公开户行:</label>
<div class="col-sm-8">
<label class="col-sm-4 control-label is-required">对公开户行:</label>
<div class="col-sm-6">
<input name="publicAccountBanks" th:field="*{publicAccountBanks}" class="form-control" type="text" disabled required>
</div>
</div>
</div>
<div class="form-group">
<div class="form-group" style="padding-top: 10px;">
<label class="col-sm-3 control-label is-required" for="zozjVerifyApproved">审批意见:</label>
<div class="col-sm-6">
<div class="col-sm-8">
<select name="p_B_zozjVerifyApproved" id="zozjVerifyApproved" class="form-control" required>
<option value=""></option>
<option value="true">同意</option>
<option value="false">拒绝</option>
</select>
</div>
<div class="form-group">
<label class="col-sm-6 control-label">批注:</label>
<div class="col-sm-6">
<textarea name="comment" class="form-control"></textarea>
</div>
<div class="form-group" style="padding-top: 10px;">
<label class="col-sm-3 control-label">批注:</label>
<div class="col-sm-8">
<textarea name="comment" class="form-control" width="30%"></textarea>
</div>
</div>
</form>
<div class="container">
<div class="form-row">
@ -149,6 +148,7 @@
queryParams: function(params) {return {expenseCode: $("#expenseCode").val()};},
pagination: false,
sidePagination: "client",
showFooter: true,
model: "报销单数据",
editable: true,
columns: [
@ -171,11 +171,19 @@
}
},
{title: '用途',field: 'purpose',},
{title: '金额',field: 'amounts',},
{title: '报销时间',field: 'expenseTime',},
{title: '金额',field: 'amounts',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].amounts)|| 0;
}
return "总金额: " + sum.toFixed(2);
}
},
{title: '报销时间',field: 'expenseTime',visible: false},
{title: '出差单号',field: 'evectionCode',},
{title: '采购单号',field: 'purchaseCode',},
{title: '委外单号',field: 'outsourceCode'},
{title: '采购单号',field: 'purcahseCode',},
{title: '委外单号',field: 'outsourceCode',},
],
};
$.table.init(options);

Loading…
Cancel
Save