|
@@ -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", 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", formatter: "@"}
|
|
|
],
|
|
|
view:{
|
|
|
comboBox:[
|
|
@@ -459,15 +459,6 @@ let rationOprObj = {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- else if(dataCode === 'feeType'){//取费专业控制为整数
|
|
|
- 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);
|
|
|
}
|
|
@@ -558,10 +549,6 @@ let rationOprObj = {
|
|
|
items[i][me.setting.header[col].dataCode] = cacheSection[rowIdx][me.setting.header[col].dataCode];
|
|
|
}
|
|
|
}
|
|
|
- if(items[i].feeType && !me.isInt(items[i].feeType)){
|
|
|
- items[i].feeType = '';
|
|
|
- me.workBook.getSheet(0).setValue(rowIdx, 8, '');
|
|
|
- }
|
|
|
if(info.cellRange.col === 0){
|
|
|
if(me.rationsCodes.indexOf(items[i].code.toString()) === -1){
|
|
|
items[i].ID = cacheSection[rowIdx].ID;
|