|
@@ -223,6 +223,7 @@ let repositoryGljObj = {
|
|
|
}
|
|
|
}
|
|
|
let tailHeaders = [
|
|
|
+ { headerName: "损耗率", headerWidth: 90, dataCode: "lossRate", dataType: "Number", hAlign: "center", vAlign: "center" },
|
|
|
{ headerName: "毛重系数", headerWidth: 90, dataCode: "grossWeightCoe", dataType: "Number", hAlign: "center", vAlign: "center" },
|
|
|
{ headerName: "采购保管费率", headerWidth: 90, dataCode: "purchaseStorageRate", dataType: "Number", hAlign: "center", vAlign: "center" },
|
|
|
{ headerName: "场外运输损耗率", headerWidth: 100, dataCode: "offSiteTransportLossRate", dataType: "Number", hAlign: "center", vAlign: "center" },
|
|
@@ -836,7 +837,7 @@ let repositoryGljObj = {
|
|
|
args.sheet.setValue(args.row, args.col, _.find(me.distTypeTree.comboDatas, { value: me.currentGlj.gljType }).text);
|
|
|
});
|
|
|
return;
|
|
|
- } else if (me.feeDataCode.includes(dataCode) && rObj[dataCode] !== me.currentEditingGlj[dataCode]) {
|
|
|
+ } else if ((me.feeDataCode.includes(dataCode) || dataCode === 'lossRate') && rObj[dataCode] !== me.currentEditingGlj[dataCode]) {
|
|
|
if (isNaN(rObj[dataCode])) {
|
|
|
args.sheet.setValue(args.row, args.col, me.currentEditingGlj[dataCode] ? me.currentEditingGlj[dataCode] : '');
|
|
|
alert(`${me.setting.header[args.col].headerName}只能输入数值!`);
|
|
@@ -1216,6 +1217,9 @@ let repositoryGljObj = {
|
|
|
if (typeof pasteObj.unit !== 'undefined') {
|
|
|
tempObj.unit = pasteObj.unit;
|
|
|
}
|
|
|
+ if (typeof pasteObj.lossRate !== 'undefined' && !isNaN(pasteObj.lossRate)) {
|
|
|
+ tempObj.lossRate = pasteObj.lossRate;
|
|
|
+ }
|
|
|
if (typeof pasteObj.gljType !== 'undefined') {
|
|
|
let isExsit = false;
|
|
|
for (let i = 0; i < me.distTypeTree.comboDatas.length; i++) {
|
|
@@ -1341,6 +1345,9 @@ let repositoryGljObj = {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ if (typeof pasteObj.lossRate !== 'undefined' && isNaN(pasteObj[feeCode])) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
for (let feeCode of me.feeDataCode) {
|
|
|
if (typeof pasteObj[feeCode] !== 'undefined' && (isNaN(pasteObj[feeCode]) || me.getParentType(pasteObj.gljType) !== 2)) {
|
|
|
return false;
|