zhongzewei 7 jaren geleden
bovenliggende
commit
4e52033023
1 gewijzigde bestanden met toevoegingen van 13 en 9 verwijderingen
  1. 13 9
      web/maintain/bills_lib/scripts/db_controller.js

+ 13 - 9
web/maintain/bills_lib/scripts/db_controller.js

@@ -499,7 +499,7 @@ var tools = {
                         if(ref === 'reference' && item[classify].data[field] == newData){
                             isRepeat = true;
                         }
-                        else if(ref === 'document' && item[field] === newData){
+                        else if(ref === 'document' && item[field] == newData){
                             isRepeat = true;
                         }
                     });
@@ -511,7 +511,7 @@ var tools = {
                         if(ref === 'reference' && item.data[field] == newData){
                             isRepeat = true;
                         }
-                        else if(ref === 'document' && item[field] === newData){
+                        else if(ref === 'document' && item[field] == newData){
                             isRepeat = true;
                         }
                     });
@@ -765,6 +765,7 @@ var tools = {
     },
 
     reshowValue: function(sheet, arr, setting, isResort){
+        sheet.suspendPaint();
         tools.clearData(sheet);
         sheet.setColumnCount(2, GC.Spread.Sheets.SheetArea.viewport);
         sheet.setColumnCount(2, GC.Spread.Sheets.SheetArea.colHeader);
@@ -778,7 +779,6 @@ var tools = {
             arr.sort(myCompareCode);
         }
         if(arr.length > 0){
-            sheet.suspendPaint();
             var length = arr.length;
             for(var i=0; i<length; i++){
                 setting.cols.forEach(function(col, colIdx){
@@ -791,8 +791,8 @@ var tools = {
                     }
                 });
             }
-            sheet.resumePaint();
         }
+        sheet.resumePaint();
     },
 
     clearData: function(sheet){
@@ -2047,7 +2047,7 @@ var valueController = {
         let me = valueController;
         sheet.bind(GC.Spread.Sheets.Events.EditStarting, function (sender, args) {
             me.currentEditData = sheet.getValue(args.row, args.col);
-        })
+        });
         sheet.bind(GC.Spread.Sheets.Events.EditEnded, function(sender, args){
             var newValue = args.editingText, tagId = sheet.getTag(args.row, args.col), field, isRepeat;
             setting.cols.forEach(function(col, colIdx){
@@ -2117,13 +2117,13 @@ var valueController = {
             itemsAjax.updateValue(userAccount, billsLibId, selectedId, updateData, null, 'update');
         }
         else {
-            if(typeof newData === 'number'){
+            if(isNumber(newData)){
                 if(itemVals){
                     var updateEle;
                     var index;
                     itemVals.forEach(function(val){
                         if(val.code === tagId){
-                            updateEle = {code: newData, value: val.value};
+                            updateEle = {code: parseInt(newData), value: val.value};
                             index = itemVals.indexOf(val);
                             itemVals.splice(index, 1);
                         }
@@ -2134,7 +2134,7 @@ var valueController = {
             }
             else {
                 //编号只能为数字!
-                sheet.getCell(args.row, args.col).value('');
+                args.sheet.getCell(args.row, args.col).value(args.sheet.getValue(0, args.col) ? args.sheet.getValue(0, args.col) : '');
             }
         }
     },
@@ -2152,7 +2152,7 @@ var valueController = {
         var valArr = totalItems.findItem(id).data.itemValue;
         if(valArr){
             tools.resort(valArr, 'code', true);
-            return valArr.length > 0 ? valArr[valArr.length - 1].code + 1 : 1;
+            return valArr.length > 0 ? parseInt(valArr[valArr.length - 1].code) + 1 : 1;
         }else {
             return 1;
         }
@@ -2385,6 +2385,10 @@ var rechargeController = {
     }
 };
 
+function isNumber(num){
+    return !isNaN(num) && num % 1 === 0;
+}
+