|
@@ -76,7 +76,7 @@ let rationOprObj = {
|
|
|
{ headerName: "机械费", headerWidth: 80, dataCode: "machinePrice", dataType: "Number", formatter: "0.00", hAlign: "right" },
|
|
|
{ headerName: "基价", headerWidth: 80, dataCode: "basePrice", dataType: "Number", formatter: "0.00", hAlign: "right" },
|
|
|
{ headerName: "显示名称(以%s表示参数)", headerWidth: 240, dataCode: "caption", dataType: "String" },
|
|
|
- { headerName: "取费专业", headerWidth: 70, dataCode: "feeType", dataType: "Number", hAlign: "center" },
|
|
|
+ { headerName: "取费专业", headerWidth: 70, dataCode: "feeType", dataType: "String", hAlign: "center" },
|
|
|
{ headerName: "管理费费率(%)", headerWidth: 100, dataCode: "manageFeeRate", dataType: "String", hAlign: "center" },
|
|
|
{ headerName: "一类地区管理费", headerWidth: 100, dataCode: "manageFee1", dataType: "Number", hAlign: "right" },
|
|
|
{ headerName: "二类地区管理费", headerWidth: 100, dataCode: "manageFee2", dataType: "Number", hAlign: "right" },
|
|
@@ -471,14 +471,15 @@ let rationOprObj = {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- else if (dataCode === 'feeType') {//取费专业控制为整数
|
|
|
- if (me.isInt(rObj[dataCode])) {
|
|
|
+ else if (dataCode === 'feeType') {
|
|
|
+ updateArr.push(rObj);
|
|
|
+ /* if (me.isInt(rObj[dataCode])) {
|
|
|
updateArr.push(rObj);
|
|
|
}
|
|
|
else {
|
|
|
rObj[dataCode] = '';
|
|
|
args.sheet.setValue(args.row, args.col, typeof me.currentEditingRation[dataCode] !== 'undefined' && me.currentEditingRation[dataCode] ? me.currentEditingRation[dataCode] : '');
|
|
|
- }
|
|
|
+ } */
|
|
|
}
|
|
|
else {
|
|
|
updateArr.push(rObj);
|