Browse Source

[fix]采购管理

采购订单详情、采购经理审批、副总经理审批页面新增采购合计,字段如下:物料数合计,采购合计、不含税总价、含税总价
dev
liuxiaoxu 2 months ago
parent
commit
51cdbeb7d0
  1. 33
      ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html
  2. 28
      ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgjlVerify.html
  3. 28
      ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskFzjlVerify.html

33
ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html

@ -93,7 +93,32 @@
</div>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-12">
<h3 class="mb-4">采购合计:</h3>
</div>
</div>
<div class="form-group row">
<label for="materialSum" class="col-sm-1 control-label">物料数:</label>
<div class="col-sm-2">
<input id="materialSum" th:field="*{materialSum}" name="materialSum" class="form-control" type="text" readonly>
</div>
<label for="actualPurchaseSum" class="col-sm-1 control-label">采购合计:</label>
<div class="col-sm-2">
<input id="actualPurchaseSum" th:field="*{actualPurchaseSum}" name="actualPurchaseSum" class="form-control" type="text" readonly>
</div>
<label for="noRmbSum" class="col-sm-1 control-label">不含税总价:</label>
<div class="col-sm-2">
<input id="noRmbSum" th:field="*{noRmbSum}" name="noRmbSum" class="form-control" type="text" readonly>
</div>
<label for="rmbSum" class="col-sm-1 control-label">含税总价:</label>
<div class="col-sm-2">
<input id="rmbSum" th:field="*{rmbSum}" name="rmbSum" class="form-control" type="text" readonly>
</div>
</div>
</div>
</form>
@ -132,6 +157,7 @@
showRefresh: false,
showToggle: false,
showColumns:false,
showFooter:true,
modalName: "选择物料",
columns: [{checkbox: true},
{
@ -190,6 +216,13 @@
{
title: '实际采购数',
field: 'actualPurchaseNum',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].actualPurchaseNum)|| 0;
}
return "采购合计: " + sum.toFixed(2);
}
},
{
title: '共享库存占用数',

28
ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgjlVerify.html

@ -127,6 +127,34 @@
</div>
</div>
<div class="container">
<div class="row">
<div class="col-12">
<h3 class="mb-4">采购合计:</h3>
</div>
</div>
<div class="form-group row">
<label for="materialSum" class="col-sm-1 control-label">物料数:</label>
<div class="col-sm-2">
<input id="materialSum" th:field="*{materialSum}" name="materialSum" class="form-control" type="text" readonly>
</div>
<label for="actualPurchaseSum" class="col-sm-1 control-label">采购合计:</label>
<div class="col-sm-2">
<input id="actualPurchaseSum" th:field="*{actualPurchaseSum}" name="actualPurchaseSum" class="form-control" type="text" readonly>
</div>
<label for="noRmbSum" class="col-sm-1 control-label">不含税总价:</label>
<div class="col-sm-2">
<input id="noRmbSum" th:field="*{noRmbSum}" name="noRmbSum" class="form-control" type="text" readonly>
</div>
<label for="rmbSum" class="col-sm-1 control-label">含税总价:</label>
<div class="col-sm-2">
<input id="rmbSum" th:field="*{rmbSum}" name="rmbSum" class="form-control" type="text" readonly>
</div>
</div>
</div>
</form>

28
ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskFzjlVerify.html

@ -127,6 +127,34 @@
</div>
</div>
<div class="container">
<div class="row">
<div class="col-12">
<h3 class="mb-4">采购合计:</h3>
</div>
</div>
<div class="form-group row">
<label for="materialSum" class="col-sm-1 control-label">物料数:</label>
<div class="col-sm-2">
<input id="materialSum" th:field="*{materialSum}" name="materialSum" class="form-control" type="text" readonly>
</div>
<label for="actualPurchaseSum" class="col-sm-1 control-label">采购合计:</label>
<div class="col-sm-2">
<input id="actualPurchaseSum" th:field="*{actualPurchaseSum}" name="actualPurchaseSum" class="form-control" type="text" readonly>
</div>
<label for="noRmbSum" class="col-sm-1 control-label">不含税总价:</label>
<div class="col-sm-2">
<input id="noRmbSum" th:field="*{noRmbSum}" name="noRmbSum" class="form-control" type="text" readonly>
</div>
<label for="rmbSum" class="col-sm-1 control-label">含税总价:</label>
<div class="col-sm-2">
<input id="rmbSum" th:field="*{rmbSum}" name="rmbSum" class="form-control" type="text" readonly>
</div>
</div>
</div>
</form>

Loading…
Cancel
Save