Przeglądaj źródła

工作内容、附注debug

zhongzewei 6 lat temu
rodzic
commit
95d445e03f

+ 6 - 0
web/maintain/ration_repository/js/annotation.js

@@ -23,6 +23,8 @@ let annotationOprObj = {
     buildSheet: function () {
         let me = this;
         me.workBook = sheetCommonObj.buildSheet(me.container[0], me.setting, 30);
+        me.workBook.options.showDragFillSmartTag = false;
+        me.workBook.options.defaultDragFillType = GC.Spread.Sheets.Fill.AutoFillType.fillWithoutFormatting;
         me.workBook.refresh();
         me.workBook.bind(GC.Spread.Sheets.Events.ButtonClicked, me.onButtonClick);
         let sheet = me.workBook.getSheet(0);
@@ -183,9 +185,11 @@ let annotationOprObj = {
                 setTimeout(function () {
                     me.buildSheet();
                     me.showData(me.getShowDatas(jobContentOprObj.currentRationItems, []));
+                    me.workBook.getSheet(0).setActiveCell(0, 0);
                 }, 200);
             } else {
                 me.showData(me.getShowDatas(jobContentOprObj.currentRationItems, []));
+                me.workBook.getSheet(0).setActiveCell(0, 0);
             }
         }
         else{
@@ -200,9 +204,11 @@ let annotationOprObj = {
             setTimeout(function () {
                 me.buildSheet();
                 me.showData(me.getShowDatas(jobContentOprObj.currentRationItems, me.getUpdateCodes(obj)));
+                me.workBook.getSheet(0).setActiveCell(0, 0);
             }, 200);
         } else {
             me.showData(me.getShowDatas(jobContentOprObj.currentRationItems, me.getUpdateCodes(obj)));
+            me.workBook.getSheet(0).setActiveCell(0, 0);
         }
     },
     //获取弹出选择编码的数据

+ 7 - 0
web/maintain/ration_repository/js/jobContent.js

@@ -31,6 +31,8 @@ let jobContentOprObj = {
     buildSheet: function () {
         let me = this;
         me.workBook = sheetCommonObj.buildSheet(me.container[0], me.setting, 30);
+        me.workBook.options.showDragFillSmartTag = false;
+        me.workBook.options.defaultDragFillType = GC.Spread.Sheets.Fill.AutoFillType.fillWithoutFormatting;
         me.workBook.refresh();
         me.workBook.bind(GC.Spread.Sheets.Events.ButtonClicked, me.onButtonClick);
         let sheet = me.workBook.getSheet(0);
@@ -192,9 +194,11 @@ let jobContentOprObj = {
                 setTimeout(function () {
                     me.buildSheet();
                     me.showData(me.getShowDatas(me.currentRationItems, []));
+                    me.workBook.getSheet(0).setActiveCell(0, 0);
                 }, 200);
             } else {
                 me.showData(me.getShowDatas(me.currentRationItems, []));
+                me.workBook.getSheet(0).setActiveCell(0, 0);
             }
         }
         else{
@@ -209,9 +213,11 @@ let jobContentOprObj = {
             setTimeout(function () {
                 me.buildSheet();
                 me.showData(me.getShowDatas(me.currentRationItems, me.getUpdateCodes(obj)));
+                me.workBook.getSheet(0).setActiveCell(0, 0);
             }, 200);
         } else {
             me.showData(me.getShowDatas(me.currentRationItems, me.getUpdateCodes(obj)));
+            me.workBook.getSheet(0).setActiveCell(0, 0);
         }
     },
     //获取弹出选择编码的数据
@@ -462,6 +468,7 @@ let jobContentOprObj = {
     bindUpdateConBtn: function () {
         let me = jobContentOprObj;
         return function () {
+            console.log('enter');
             let codesObj = me.getCodesAfterS();
             let updateC = me.getUpdateArr(codesObj.checked, me.currentJobContent),
                 updateUnC = me.getUpdateArr(codesObj.unchecked, ''),

+ 0 - 13
web/maintain/ration_repository/js/ration.js

@@ -755,19 +755,6 @@ let rationOprObj = {
             }
             return rst;
         });
-        /*function compare(){
-            return function (a, b) {
-                let rst = 0;
-                if (a.code > b.code) {
-                    rst = 1;
-                }
-                else if (a.code < b.code) {
-                    rst = -1;
-                }
-                return rst;
-            }
-        }
-        arr.sort(compare());*/
     },
     saveInString(datas){
         for(let i = 0, len = datas.length; i < len; i++){