zeweizhong 6 лет назад
Родитель
Сommit
1815f74ead
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      web/maintain/ration_repository/js/ration.js
  2. 1 1
      web/maintain/std_glj_lib/js/glj.js

+ 1 - 1
web/maintain/ration_repository/js/ration.js

@@ -435,7 +435,7 @@ let 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.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),

+ 1 - 1
web/maintain/std_glj_lib/js/glj.js

@@ -774,7 +774,7 @@ let repositoryGljObj = {
         // 输入编号、名称、规格时,如果输入回车符或粘贴回车符,提交时应转换为空格。
         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);