回滚

modules/all_models/stdRation_ration.js

@@ -43,7 +43,7 @@ const rationItemSchema = new Schema({
     sectionId: Number,
     rationRepId: {type: Number, index: true},
     caption: String,
-    feeType: String,
+    feeType: Number,
     jobContent: String,
     annotation: String,
     manageFeeRate: String, // 管理费费率

web/maintain/ration_repository/js/ration.js

@@ -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: "String", hAlign: "center"},
+            {headerName:"取费专业",headerWidth:70,dataCode:"feeType", dataType: "Number", hAlign: "center"},
             {headerName:"管理费费率(%)",headerWidth:100,dataCode:"manageFeeRate", dataType: "String", hAlign: "center"},
         ],
         view:{
@@ -465,15 +465,14 @@ let rationOprObj = {
 
                         }
                     }
-                    else if (dataCode === 'feeType') {//取费专业控制为整数   20200928 改为文本
-                      updateArr.push(rObj);
-                        /* if(me.isInt(rObj[dataCode])){
+                    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);