Commit 58e41ff4 authored by 1650842865's avatar 1650842865

工序外协的LOSS需要按百分比显示;费用报销优化

parent cfa2c4d8
...@@ -337,7 +337,7 @@ function loadClickItemGrid() { ...@@ -337,7 +337,7 @@ function loadClickItemGrid() {
{display: "运输费", name: "freight", width: 100, minWidth: 60, type: "String", align: "left"}, {display: "运输费", name: "freight", width: 100, minWidth: 60, type: "String", align: "left"},
{display: "包装费", name: "packMoney", width: 100, minWidth: 60, type: "String", align: "left"}, {display: "包装费", name: "packMoney", width: 100, minWidth: 60, type: "String", align: "left"},
{display: "最低消费", name: "minimum", width: 100, minWidth: 60, type: "String", align: "left"}, {display: "最低消费", name: "minimum", width: 100, minWidth: 60, type: "String", align: "left"},
{display: "loss数", name: "lossNumber", width: 100, minWidth: 60, type: "String", align: "left"}, {display: "loss数百分比", name: "lossNumber", width: 100, minWidth: 60, type: "String", align: "left"},
], ],
dataAction: "server", dataAction: "server",
url: web_app.name + '/processQuotedPrice/queryProcessQuotedPriceItemNumbers.ajax', url: web_app.name + '/processQuotedPrice/queryProcessQuotedPriceItemNumbers.ajax',
......
...@@ -211,7 +211,7 @@ function showItemNumber(row,panel){ ...@@ -211,7 +211,7 @@ function showItemNumber(row,panel){
{display: "运输费", name: "freight", width: 100, minWidth: 60, type: "String", align: "left",}, {display: "运输费", name: "freight", width: 100, minWidth: 60, type: "String", align: "left",},
{display: "包装费", name: "packMoney", width: 100, minWidth: 60, type: "String", align: "left",}, {display: "包装费", name: "packMoney", width: 100, minWidth: 60, type: "String", align: "left",},
{display: "最低消费", name: "minimum", width: 100, minWidth: 60, type: "String", align: "left"}, {display: "最低消费", name: "minimum", width: 100, minWidth: 60, type: "String", align: "left"},
{display: "loss数", name: "lossNumber", width: 100, minWidth: 60, type: "String", align: "left"}, {display: "loss数百分比", name: "lossNumber", width: 100, minWidth: 60, type: "String", align: "left"},
], ],
dataAction: 'local', dataAction: 'local',
checkbox: false, checkbox: false,
......
...@@ -98,9 +98,9 @@ function loadItemNumberGrid() { ...@@ -98,9 +98,9 @@ function loadItemNumberGrid() {
} }
}, },
{ {
display: "loss数", name: "lossNumber", width: 100, minWidth: 60, type: "String", align: "left", display: "loss数百分比", name: "lossNumber", width: 100, minWidth: 60, type: "String", align: "left",
editor: { editor: {
required: false, type: "text",mask: '9999999.999' required: false, type: "text",mask: '9.99'
} }
}, },
], ],
......
...@@ -99,6 +99,11 @@ public class ProcessQuotedPriceItemApplicationImpl extends BaseApplication imple ...@@ -99,6 +99,11 @@ public class ProcessQuotedPriceItemApplicationImpl extends BaseApplication imple
List<ProcessQuotedPriceItem> priceItemList = processQuotedPriceItemRepository.findAll(ids); List<ProcessQuotedPriceItem> priceItemList = processQuotedPriceItemRepository.findAll(ids);
for (ProcessQuotedPriceItem processQuotedPriceItem : priceItemList) { for (ProcessQuotedPriceItem processQuotedPriceItem : priceItemList) {
processQuotedPriceItem.setStatus(status); processQuotedPriceItem.setStatus(status);
processQuotedPriceItem.setDisableDate(new Date());
String personMemberId = this.getOperator().getPersonMemberId();
String personMemberName = this.getOperator().getPersonMemberName();
processQuotedPriceItem.setDisablePersonId(personMemberId);
processQuotedPriceItem.setDisablePersonName(personMemberName);
} }
processQuotedPriceItemRepository.save(priceItemList); processQuotedPriceItemRepository.save(priceItemList);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment