debug

modules/bills_lib/models/bills_lib_schemas.js

@@ -45,8 +45,8 @@ let billsSchema = mongoose.Schema({
     unit: String,
     ruleText: String,
     Expression: String,
-    jobs: [jobsSchema],
-    items: [itemsSchema],
+    jobs: [],
+    items: [],
     recharge:String,
     billsLibId: Number,
     deleted: Boolean

web/maintain/bills_lib/html/neirong.html

@@ -262,6 +262,13 @@
 
         function pasteJobs(sheet, totalJobs){
             sheetJobsDatas = tools.getsheetDatas(sheet, 'total');
+            sheet.bind(GC.Spread.Sheets.Events.ClipboardPasting, function (sender, args) {
+                let maxCol = args.cellRange.col + args.cellRange.colCount - 1;
+                //复制的列数超过正确的列数，不可复制
+                if(maxCol >= totalJobsSetting.cols.length){
+                    args.cancel = true;
+                }
+            });
             sheet.bind(GC.Spread.Sheets.Events.ClipboardPasted, function(sender, args){
                 const colIdx = 1;
                 let orgRow = args.cellRange.row, orgCol = args.cellRange.col, rowCount = args.cellRange.rowCount, colCount = args.cellRange.colCount;

web/maintain/bills_lib/html/qingdan.html

@@ -634,6 +634,13 @@
 
     function bindPasteBills(controller, sheet, setting){
         sheetBillsDatas = tools.getsheetDatas(sheet, 'bills', controller);
+        sheet.bind(GC.Spread.Sheets.Events.ClipboardPasting, function (sender, args) {
+            let maxCol = args.cellRange.col + args.cellRange.colCount - 1;
+            //复制的列数超过正确的列数，不可复制
+            if(maxCol >= billsLibSetting.cols.length){
+                args.cancel = true;
+            }
+        });
         sheet.bind(GC.Spread.Sheets.Events.ClipboardPasted, function(sender, args){
             let datas = [], field;
             let orgRow = args.cellRange.row, orgCol = args.cellRange.col, rowCount = args.cellRange.rowCount, colCount = args.cellRange.colCount;
@@ -676,6 +683,13 @@
     }
     function bindPasteRel(sheet, controller, totalJobs, setting){
         sheetDatas = tools.getsheetDatas(sheet, 'jobs');
+        sheet.bind(GC.Spread.Sheets.Events.ClipboardPasting, function (sender, args) {
+            let maxCol = args.cellRange.col + args.cellRange.colCount - 1;
+            //复制的列数超过正确的列数，不可复制
+            if(maxCol >= jobsSetting.cols.length){
+                args.cancel = true;
+            }
+        });
         sheet.bind(GC.Spread.Sheets.Events.ClipboardPasted, function(sender, args){
           //  sheet.setColumnCount(2, GC.Spread.Sheets.SheetArea.viewport);
            // sheet.setColumnCount(2, GC.Spread.Sheets.SheetArea.colHeader);

web/maintain/bills_lib/html/tezheng.html

@@ -311,6 +311,13 @@
 
         function pasteItems(sheet, totalItems){
             totalItemsDatas = tools.getsheetDatas(sheet, 'total');
+            sheet.bind(GC.Spread.Sheets.Events.ClipboardPasting, function (sender, args) {
+                let maxCol = args.cellRange.col + args.cellRange.colCount - 1;
+                //复制的列数超过正确的列数，不可复制
+                if(maxCol >= totalItemsSetting.cols.length){
+                    args.cancel = true;
+                }
+            });
             sheet.bind(GC.Spread.Sheets.Events.ClipboardPasted, function(sender, args){
                 const colIdx = 1;
                 let orgRow = args.cellRange.row, orgCol = args.cellRange.col, rowCount = args.cellRange.rowCount, colCount = args.cellRange.colCount;
@@ -371,6 +378,14 @@
         }
 
         function pasteValue(sheet, totalItems){
+            sheet.bind(GC.Spread.Sheets.Events.ClipboardPasting, function (sender, args) {
+                let maxCol = args.cellRange.col + args.cellRange.colCount - 1;
+                //复制的列数超过正确的列数，不可复制
+                if(maxCol >= eigenValueSetting.cols.length){
+                    args.cancel = true;
+                }
+            });
+
             sheet.bind(GC.Spread.Sheets.Events.ClipboardPasted, function(sender, args){
                 valueDatas = tools.getsheetDatas(sheet, 'total');
                 const colIdx = 1;

web/maintain/bills_lib/scripts/bills_lib_ajax.js

@@ -301,11 +301,11 @@ var billsAjax = {
             }
         })
     },
-    updateSerialNo: function (lastOperator, billsLibId, billsId, updateArr, field, callback) {
+    updateSerialNo: function (billsLibId, billsId, updateArr, field, callback) {
         $.ajax({
             type: 'post',
             url: 'stdBillsEditor/updateSerialNo',
-            data: {data: JSON.stringify({lastOperator: lastOperator, billsLibId: billsLibId, billsId: billsId, updateArr: updateArr, field: field})},
+            data: {data: JSON.stringify({lastOperator: userAccount, billsLibId: billsLibId, billsId: billsId, updateArr: updateArr, field: field})},
             dataType: 'json',
             success: function (result) {
                 if(!result.error && callback){

web/maintain/std_glj_lib/js/glj.js

@@ -237,7 +237,6 @@ repositoryGljObj = {
             if(glj.ID === me.gljList[i].ID){
                 me.gljList[i].basePrice = glj.basePrice;
                 me.workBook.getSheet(0).setValue(i, 4, glj.basePrice);
-                console.log(i);
                 break;
             }
         }
@@ -257,8 +256,6 @@ repositoryGljObj = {
             if(row < me.currentCache.length){
                 //标记当前工料机
                 me.currentGlj = me.currentCache[row];
-                console.log(`me.currentCache`);
-                console.log(me.currentCache);
                 if(me.allowComponent.indexOf(me.currentCache[row].gljType) !== -1){
                     that.workBook.getSheet(0).getRange(-1, 0 , -1, 1, GC.Spread.Sheets.SheetArea.viewport).locked(false);
                     that.workBook.getSheet(0).getRange(-1, 4 , -1, 1, GC.Spread.Sheets.SheetArea.viewport).locked(false);
@@ -373,8 +370,6 @@ repositoryGljObj = {
             updateArr = [], addArr = [], updateBasePrcArr = [];
         me.editingRowIdx = args.row;
         rObj.basePrice = rObj.basePrice ? rObj.basePrice : 0;
-        console.log(`me.currentGlj`);
-        console.log(me.currentGlj);
         if (me.currentEditingGlj["ID"]) {
             rObj["ID"] = me.currentEditingGlj["ID"];
             rObj.gljClass = me.currentEditingGlj.gljClass;
@@ -441,7 +436,6 @@ repositoryGljObj = {
             me.currentEditingGlj = null;
             //me.workBook.getSheet(0).setValue(11, 5, "人工");
             me.mixUpdateRequest(updateArr, addArr, []);
-            console.log(updateArr);
         }
     },
     repositoryGljDelOpr: function () {
@@ -1082,7 +1076,6 @@ var gljTypeTreeOprObj = {
         }
         hoverOpr();
         function hoverOpr(){
-            //console.log(treeNode);
             var me = repositoryGljObj, sObj = $("#" + treeNode.tId + "_span");
             if (treeNode.editNameFlag || $("#addBtn_"+treeNode.tId).length>0) return;
             var addStr = "<span class='button add' id='addBtn_" + treeNode.tId + "' title='新增子节点' onfocus='this.blur();'></span>";

web/maintain/std_glj_lib/js/gljComponent.js

@@ -376,11 +376,9 @@ let gljComponentOprObj = {
             data: {libId: pageOprObj.gljLibId, updateArr: updateArr, oprtor: userAccount},
             dataType: 'json',
             success: function (result) {
-                console.log(result);
                 if(result.data.length > 0){
                     if(result.data[0]){
                         that.currentComponent =  that.getCurrentComponent(result.data[0].component);
-                        console.log(that.currentComponent);
                         sheetCommonObj.cleanSheet(me.workBook.getSheet(0), me.setting, -1);
                         sheetCommonObj.showData(me.workBook.getSheet(0), me.setting, that.currentComponent);
                     }