zhangweicheng 4 лет назад
Родитель
Сommit
e12ff725d2

+ 1 - 1
modules/all_models/stdRation_ration.js

@@ -40,7 +40,7 @@ const rationItemSchema = new Schema({
     sectionId: Number,
     rationRepId: {type: Number, index: true},
     caption: String,
-    feeType: Number,
+    feeType: String,
     jobContent: String,
     annotation: String,
     rationGljList: [rationGljItemSchema],

+ 9 - 8
web/maintain/ration_repository/js/ration.js

@@ -459,14 +459,15 @@ 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 if(dataCode === 'feeType'){//取费专业控制为整数 20200928 这个改为文本
+                      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);