debug number string

web/maintain/bills_lib/scripts/db_controller.js

@@ -2207,7 +2207,9 @@ var totalJobsController = {
             });
         }
         else {
-            if(typeof newData === 'number'){
+            let parseNum = parseInt(newData);
+            //if(typeof newData === 'number'){
+            if(!isNaN(parseNum)){
                 maxJobsNumber = maxJobsNumber >= newData ? maxJobsNumber : newData;
                 jobsAjax.createJobContent(billsLibId, '', newData, function(newJobId){
                     let newJobData, newJob;
@@ -2228,7 +2230,8 @@ var totalJobsController = {
     },
 
     updateJob: function(totalJobs, id, field, newData, args){
-        if(field === 'code' && typeof newData !== 'number'){
+       // if(field === 'code' && typeof newData !== 'number'){
+        if(field === 'code' && isNaN(parseInt(newData))){
             tools.alertTotalOpr(args, '编号只能为数字，请重新输入!', totalJobs.jobsArr);
         }
         else {
@@ -2237,6 +2240,7 @@ var totalJobsController = {
                     job.data[field] = newData;
                 }
             });
+            tools.reshowData(args.sheet, totalJobs.jobsArr, totalJobsSetting, true);
             jobsAjax.updateJobContent(billsLibId, id, field, newData);
         }
     }
@@ -2283,7 +2287,7 @@ var totalItemsController = {
             });
         }
         else {
-            if(typeof newData === 'number'){
+            if(!isNaN(parseInt(newData))){
                 maxItemsNumber = maxItemsNumber >= newData ? maxItemsNumber : newData;
                 itemsAjax.createItemCharacter(billsLibId, '', newData, function(newItemId){
                     var newItemData, newItem;
@@ -2303,7 +2307,7 @@ var totalItemsController = {
     },
 
     updateItem: function(totalItems, id, field, newData, args){
-        if(field === 'code' && typeof newData !== 'number'){
+        if(field === 'code' && isNaN(parseInt(newData))){
             tools.alertTotalOpr(args, '编号只能为数字，请重新输入！', totalItems.itemsArr);
         }
         else {
@@ -2312,6 +2316,7 @@ var totalItemsController = {
                     item.data[field] = newData;
                 }
             });
+            tools.reshowData(args.sheet, totalItems.itemsArr, totalItemsSetting, true);
             itemsAjax.updateItemCharacter(billsLibId, id, field, newData);
         }
     }

web/maintain/ration_repository/js/ration.js

@@ -189,15 +189,21 @@ var rationOprObj = {
     },
     onClipboardPasting: function(sender, args) {
         var me = rationOprObj;
-        if (args.cellRange.colCount != me.setting.header.length) {
+        console.log(`args`);
+        console.log(args);
+      /*  if (args.cellRange.colCount != me.setting.header.length) {
             args.cancel = true;
-        }
+        }*/
     },
     onClipboardPasted: function(e, info) {
+        console.log(`info`);
+        console.log(info);
         var me = rationOprObj;
         var cacheSection = me.getCache();
         var updateArr = [], addArr = [];
         var items = sheetCommonObj.analyzePasteData(me.setting, info);
+        console.log(`items`);
+        console.log(items);
         for (var i = 0; i < items.length; i++) {
             if (cacheSection) {
                 var hasCacheItem = false;
@@ -218,7 +224,7 @@ var rationOprObj = {
             }
         };
         if (updateArr.length > 0 || addArr.length > 0) {
-            me.mixUpdateRequest(updateArr, addArr, []);
+            //me.mixUpdateRequest(updateArr, addArr, []);
         }
     },
     mixUpdateRequest: function(updateArr, addArr, removeIds) {
@@ -305,5 +311,15 @@ var rationOprObj = {
                 sheetCommonObj.cleanSheet(me.workBook.getSheet(0), me.setting, -1);
             }
         }
+    },
+    sortByCode: function(arr){
+        function compare(){
+            return function (a, b) {
+                let valA = a.code,
+                    valB = b.code;
+                return valA - valB;
+            }
+        }
+        arr.sort(compare());
     }
 }

web/maintain/ration_repository/js/ration_glj.js

@@ -134,7 +134,8 @@ var rationGLJOprObj = {
             if (args.row < cacheArr.length) {
                 var editGlj = cacheArr[args.row];
                 if (editGlj["consumeAmt"] != args.editingText) {
-                    if(typeof args.editingText !== 'number'){
+                    let parseNum = parseFloat(args.editingText);
+                    if(isNaN(parseFloat(args.editingText))){
                         $('#alertModalBtn').click();
                         $('#alertText').text("定额消耗只能输入数值！");
                         args.sheet.options.isProtected = true;
@@ -148,7 +149,7 @@ var rationGLJOprObj = {
                         })
                     }
                     else{
-                        editGlj["consumeAmt"] = args.editingText;
+                        editGlj["consumeAmt"] = parseNum;
                         me.updateRationItem();
                     }
                 }