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

[fix]仓库管理 

国税发票、公司成本、公司固定资产和报销管理操作栏和表头按钮调整为统一样式
公司成本详情页面所有选项设置为只读
dev
liuxiaoxu 2 months ago
parent
7fdbd245e3
commit
b1ee31eabf
5 changed files with 51 additions and 48 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. 8
      ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/compantFixedAssets.html
  2. 11
      ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html
  3. 50
      ruoyi-admin/src/main/resources/templates/financial/companyCost/detail.html
  4. 11
      ruoyi-admin/src/main/resources/templates/financial/expense/expense.html
  5. 19
      ruoyi-admin/src/main/resources/templates/financial/taxInvoice/taxInvoice.html

8
ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/compantFixedAssets.html
View File

@ -132,10 +132,10 @@
{title: '操作',align: 'center', {title: '操作',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.compantFixedAssetsId + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.compantFixedAssetsId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.compantFixedAssetsId + '\')"><i class="fa fa-eye"></i>详情</a> '); actions.push('<a href="javascript:void(0)" onclick="$.operate.detail(\'' + row.compantFixedAssetsId + '\')"><i class="fa fa-eye"></i>详情</a> ');
var actionLinks = actions.join('');
return actions.join(''); return $.table.dropdownToggle(actionLinks);
} }
} }
] ]

11
ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html
View File

@ -19,7 +19,7 @@
<input type="number" name="costYear"/> <input type="number" name="costYear"/>
</li> </li>
<li> <li>
<label for="costMonth">月份：</label> <label>月份：</label>
<select class="form-control" name="costMonth"> <select class="form-control" name="costMonth">
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="item : ${@dict.getType('sys_month')}" th:text="${item.dictLabel}" th:value="${item.dictValue}"></option> <option th:each="item : ${@dict.getType('sys_month')}" th:text="${item.dictLabel}" th:value="${item.dictValue}"></option>
@ -45,7 +45,7 @@
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="financial:companyCost:export"> <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="financial:companyCost:export">
<i class="fa fa-plus"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
@ -97,10 +97,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-info btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i>详情</a> '); actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></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-danger btn-xs ' + 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);
} }
} }
] ]

50
ruoyi-admin/src/main/resources/templates/financial/companyCost/detail.html
View File

@ -27,7 +27,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">备注：</label> <label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="remark" th:field="*{remark}" class="form-control"></textarea> <textarea name="remark" th:text="*{remark}" class="form-control" readonly></textarea>
</div> </div>
</div> </div>
</div> </div>
@ -35,39 +35,39 @@
<div class="form-group" hidden="hidden"> <div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">经营成本：</label> <label class="col-sm-3 control-label">经营成本：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="operatingCosts" name="operatingCosts" th:field="*{operatingCosts}" class="form-control" type="number"> <input id="operatingCosts" name="operatingCosts" th:field="*{operatingCosts}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="container"> <div class="container">
<h3>经营成本</h3> <h3>经营成本</h3>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">工资费用：</label> <label class="col-sm-3 control-label">工资费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="salaryExpenses" th:field="*{salaryExpenses}" class="form-control" type="number" required> <input name="salaryExpenses" th:field="*{salaryExpenses}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">厂租费用：</label> <label class="col-sm-3 control-label">厂租费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="factoryRentalFees" th:field="*{factoryRentalFees}" class="form-control" type="number" required> <input name="factoryRentalFees" th:field="*{factoryRentalFees}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">税金费用：</label> <label class="col-sm-3 control-label">税金费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="taxExpenses" th:field="*{taxExpenses}" class="form-control" type="number" required> <input name="taxExpenses" th:field="*{taxExpenses}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">工厂电费：</label> <label class="col-sm-3 control-label">工厂电费：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="factoryElectricityFees" th:field="*{factoryElectricityFees}" class="form-control" type="number" required> <input name="factoryElectricityFees" th:field="*{factoryElectricityFees}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">其他费用：</label> <label class="col-sm-3 control-label">其他费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="ohterExpenses" th:field="*{ohterExpenses}" class="form-control" type="number" requirede> <input name="ohterExpenses" th:field="*{ohterExpenses}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
</div> </div>
@ -75,45 +75,45 @@
<div class="form-group" hidden="hidden"> <div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">业务成本：</label> <label class="col-sm-3 control-label">业务成本：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="businessCost" name="businessCost" th:field="*{businessCost}" class="form-control" type="number"> <input id="businessCost" name="businessCost" th:field="*{businessCost}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="container"> <div class="container">
<h3>业务成本</h3> <h3>业务成本</h3>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">运输费用：</label> <label class="col-sm-3 control-label">运输费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="transportationCosts" th:field="*{transportationCosts}" class="form-control" type="number" required> <input name="transportationCosts" th:field="*{transportationCosts}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">推广费用：</label> <label class="col-sm-3 control-label">推广费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="promotionExpenses" th:field="*{promotionExpenses}" class="form-control" type="number" required> <input name="promotionExpenses" th:field="*{promotionExpenses}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">包装费用：</label> <label class="col-sm-3 control-label">包装费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="packagingCost" th:field="*{packagingCost}" class="form-control" type="number" required> <input name="packagingCost" th:field="*{packagingCost}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">业务费用：</label> <label class="col-sm-3 control-label">业务费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="businessExpenses" th:field="*{businessExpenses}" class="form-control" type="number" required> <input name="businessExpenses" th:field="*{businessExpenses}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">售后费用：</label> <label class="col-sm-3 control-label">售后费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="afterSalesExpenses" th:field="*{afterSalesExpenses}" class="form-control" type="number" required> <input name="afterSalesExpenses" th:field="*{afterSalesExpenses}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">业务提成：</label> <label class="col-sm-3 control-label">业务提成：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="businessCommission" th:field="*{businessCommission}" class="form-control" type="number" required> <input name="businessCommission" th:field="*{businessCommission}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
</div> </div>

11
ruoyi-admin/src/main/resources/templates/financial/expense/expense.html
View File

@ -202,15 +202,16 @@
var todoUserIdList = row.todoUserId.split(","); var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName)){ if(todoUserIdList.includes(loginName)){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix1 + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+ row.instanceTypeName +"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> '); actions.push('<a href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix1 + '\',\'' + 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 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="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></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> '); actions.push('<a href="javascript:void(0)" onclick="$.operate.detail(\'' + row.expenseId + '\')"><i class="fa fa-eye"></i> 详情</a> ');
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
} }
], ],

19
ruoyi-admin/src/main/resources/templates/financial/taxInvoice/taxInvoice.html
View File

@ -87,7 +87,7 @@
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="financial:taxInvoice:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="financial:taxInvoice:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="financial:taxInvoice:export"> <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="financial:taxInvoice:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
@ -265,19 +265,19 @@
//待审核详情 //待审核详情
if (row.taxInvoiceStatus=="0"){ if (row.taxInvoiceStatus=="0"){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="beforeAuditInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>'); actions.push('<a href="javascript:void(0)" onclick="beforeAuditInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>');
} }
if (row.taxInvoiceStatus=="0" && row.commonCurrency=="1"){ if (row.taxInvoiceStatus=="0" && row.commonCurrency=="1"){
actions.push('<a class="btn btn-success btn-xs ' + auditInvoiceFlag + '" href="javascript:void(0)" onclick="auditInvoiceRmb(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>审核</a>'); actions.push('<a class=" ' + auditInvoiceFlag + '" href="javascript:void(0)" onclick="auditInvoiceRmb(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>审核</a>');
} }
if (row.taxInvoiceStatus=="0" && row.commonCurrency=="2"){ if (row.taxInvoiceStatus=="0" && row.commonCurrency=="2"){
actions.push('<a class="btn btn-success btn-xs ' + auditInvoiceFlag + '" href="javascript:void(0)" onclick="auditInvoiceUsd(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>审核</a>'); actions.push('<a class=" ' + auditInvoiceFlag + '" href="javascript:void(0)" onclick="auditInvoiceUsd(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>审核</a>');
} }
//审核详情 //审核详情
if (row.taxInvoiceStatus=="1"){ if (row.taxInvoiceStatus=="1"){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="auditInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>'); actions.push('<a href="javascript:void(0)" onclick="auditInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>');
} }
// if (row.taxInvoiceStatus=="1" ){ // if (row.taxInvoiceStatus=="1" ){
@ -285,17 +285,18 @@
// } // }
if (row.taxInvoiceStatus=="1" && row.commonCurrency=="1"){ if (row.taxInvoiceStatus=="1" && row.commonCurrency=="1"){
actions.push('<a class="btn btn-success btn-xs ' + uploadInvoiceFlag + '" href="javascript:void(0)" onclick="uploadInvoiceRmb(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>上传发票</a>'); actions.push('<a class=" ' + uploadInvoiceFlag + '" href="javascript:void(0)" onclick="uploadInvoiceRmb(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>上传发票</a>');
} }
if (row.taxInvoiceStatus=="1" && row.commonCurrency=="2"){ if (row.taxInvoiceStatus=="1" && row.commonCurrency=="2"){
actions.push('<a class="btn btn-success btn-xs ' + uploadInvoiceFlag + '" href="javascript:void(0)" onclick="uploadInvoiceUsd(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>上传发票</a>'); actions.push('<a class=" ' + uploadInvoiceFlag + '" href="javascript:void(0)" onclick="uploadInvoiceUsd(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>上传发票</a>');
} }
//上传发票详情 //上传发票详情
if (row.taxInvoiceStatus=="2" ){ if (row.taxInvoiceStatus=="2" ){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="uploadInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>'); actions.push('<a href="javascript:void(0)" onclick="uploadInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>');
} }
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
}] }]
}; };

Write Preview
Loading…
Cancel
Save