1.内蒙古定额库中，修改定额工料机，重算本条定额基价时应计算管理

2.定额库中，输入编号、名称、单位时，如果输入回车符或粘贴回车符，提交时应转换为空格。
3.人材机库中，输入编号、名称、规格时，如果输入回车符或粘贴回车符，提交时应转换为空格。

web/maintain/ration_repository/js/ration.js

@@ -370,6 +370,9 @@ let rationOprObj = {
         me.workBook.commandManager().setShortcutKey(null, GC.Spread.Commands.Key.del, false, false, false, false);
         me.workBook.commandManager().setShortcutKey('rationDelete', GC.Spread.Commands.Key.del, false, false, false, false);
     },
+    isDef: function (v) {
+        return v !== undefined && v !== null;
+    },
     onLeaveCell: function (sender, args) {
         let me = rationOprObj;
         me.lastCol = me.setting.header[args.col];
@@ -430,13 +433,17 @@ let rationOprObj = {
         }
     },
     onCellEditEnd: function(sender, args) {
-        let edV = args.sheet.getValue(args.row, args.col);
-        if(edV){
-            args.sheet.setValue(args.row, args.col, edV.toString().trim());
-        }
-        let me = rationOprObj, rObj = sheetsOprObj.combineRationRowData(me.workBook.getSheet(0), me.setting, args.row),
-            updateArr = [], addArr = [];
+        let me = rationOprObj;
+        // 输入编号、名称、单位时，如果输入回车符或粘贴回车符，提交时应转换为空格。
         let dataCode = me.setting.header[args.col].dataCode;
+        let deESCFields = ['code', 'name', 'unit'];
+        if(deESCFields.includes(dataCode)){
+            args.editingText = me.isDef(args.editingText) ? args.editingText.toString().replace(/[\r, \n]/g, ' ') : '';
+            args.sheet.setValue(args.row, args.col, args.editingText);
+        }
+        let rObj = sheetsOprObj.combineRationRowData(me.workBook.getSheet(0), me.setting, args.row),
+            updateArr = [],
+            addArr = [];
         me.editingRowIdx = args.row;
         if (me.currentEditingRation["ID"]) {
             if((!args.editingText || args.editingText.toString().trim().length === 0) && args.col === 0){

web/maintain/std_glj_lib/js/glj.js

@@ -752,11 +752,15 @@ let repositoryGljObj = {
         return objA[me.colMapping.colToField[col]] !== objB[[me.colMapping.colToField[col]]];
     },
     onCellEditEnd: function(sender, args) {
-        let me = repositoryGljObj, that = gljComponentOprObj,
-            updateArr = [], addArr = [], updateBasePrcArr = [];
-        let deESCFields = ['code', 'name', 'specs'];//消除转义字符
+        let me = repositoryGljObj,
+            that = gljComponentOprObj,
+            updateArr = [],
+            addArr = [],
+            updateBasePrcArr = [];
+        // 输入编号、名称、规格时，如果输入回车符或粘贴回车符，提交时应转换为空格。
+        let deESCFields = ['code', 'name', 'specs'];
         if(deESCFields.includes(me.setting.header[args.col]['dataCode'])){
-            args.editingText = me.isDef(args.editingText) ? args.editingText.toString().replace(/[\r, \n]/g, '') : '';
+            args.editingText = me.isDef(args.editingText) ? args.editingText.toString().replace(/[\r, \n]/g, ' ') : '';
             args.sheet.setValue(args.row, args.col, args.editingText);
         }
         let rObj = sheetsOprObj.combineRowData(me.workBook.getSheet(0), me.setting, args.row, me);

web/over_write/js/neimenggu_2017.js

@@ -49,7 +49,7 @@ if (typeof rationGLJOprObj !== 'undefined' && typeof rationGLJOprObj.rationCal !
         if(me.currentRationItem && me.cache['_GLJ_' + me.currentRationItem.ID]){
             let cacheArr = me.cache['_GLJ_' + me.currentRationItem.ID];
             cacheArr.forEach(function (gljData) {
-                if(gljData.gljType && gljData.basePrice && gljData.consumeAmt){
+                if(gljData.gljType && gljData.consumeAmt){
                     let parentGLJType = parseInt(String(gljData.gljType)[0]);
                     if (parentGLJType <= 3) { // 人工、材料、机械
                         // 单位为%，单条基价计算为定额价*消耗量*0.01