列设置、安装增加费debug

web/maintain/ration_repository/js/installation.js

@@ -35,7 +35,7 @@ let feeItemObj = {
     updateType: {update: 'update', new: 'new'},
     setting: {
         header:[
-            {headerName:"费用项",headerWidth:300,dataCode:"feeItem", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
+            {headerName:"费用项",headerWidth:200,dataCode:"feeItem", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
             {headerName:"费用类型",headerWidth:150,dataCode:"feeType", dataType: "String", hAlign: "center", vAlign: "center"},
             {headerName:"记取位置",headerWidth:150,dataCode:"position", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"}
         ],
@@ -44,7 +44,7 @@ let feeItemObj = {
         options: {
             tabStripVisible:  false,
             allowCopyPasteExcelStyle : false,
-            allowExtendPasteRange: false,
+            allowExtendPasteRange: true,
             allowUserDragDrop : false,
             allowUserDragFill: false,
             scrollbarMaxAlign : true
@@ -108,6 +108,7 @@ let feeItemObj = {
         sheet.bind(Events.EnterCell, me.onEnterCell);
         sheet.bind(Events.EditStarting, me.onEditStarting);
         sheet.bind(Events.EditEnded, me.onEditEnded);
+        sheet.bind(Events.ClipboardPasting, me.onClipboardPasting);
         sheet.bind(Events.ClipboardPasted, me.onClipboardPasted);
         me.feeItemDelOpr();
     },
@@ -191,6 +192,12 @@ let feeItemObj = {
         //ajax
         me.updateFeeItem([updateObj]);
     },
+    onClipboardPasting: function (sender, info) {
+        let me = this;
+        if(info.cellRange.col + info.cellRange.colCount > me.setting.header.length){
+            info.cancel = true;
+        }
+    },
     onClipboardPasted: function (sender, info) {
         let me = feeItemObj, se = sectionObj;
         let postData = [];
@@ -325,7 +332,7 @@ let sectionObj = {
         options: {
             tabStripVisible:  false,
             allowCopyPasteExcelStyle : false,
-            allowExtendPasteRange: false,
+            allowExtendPasteRange: true,
             allowUserDragDrop : false,
             allowUserDragFill: false,
             scrollbarMaxAlign : true
@@ -475,7 +482,7 @@ let sectionObj = {
     },
     onClipboardPasting: function (sender, info) {
         let me = sectionObj, fi = feeItemObj;
-        if(!me.isDef(fi.currentFeeItem)){
+        if(info.cellRange.col + info.cellRange.colCount > me.setting.header.length || !me.isDef(fi.currentFeeItem)){
             info.cancel = true;
         }
     },
@@ -585,7 +592,7 @@ let feeRuleObj = {
         options: {
             tabStripVisible:  false,
             allowCopyPasteExcelStyle : false,
-            allowExtendPasteRange: false,
+            allowExtendPasteRange: true,
             allowUserDragDrop : false,
             allowUserDragFill: false,
             scrollbarMaxAlign : true
@@ -921,6 +928,9 @@ let feeRuleObj = {
     },
     onClipboardPasting: function (sender, info) {
         let me = feeRuleObj, se = sectionObj;
+        if(info.cellRange.col + info.cellRange.colCount > me.setting.header.length){
+            info.cancel = true;
+        }
         if(!me.isDef(se.currentSection)){
             info.cancel = true;
         }
@@ -1057,7 +1067,7 @@ let batchSectionObj = {
         options: {
             tabStripVisible:  false,
             allowCopyPasteExcelStyle : false,
-            allowExtendPasteRange: false,
+            allowExtendPasteRange: true,
             allowUserDragDrop : false,
             allowUserDragFill: false,
             scrollbarMaxAlign : true

web/users/js/main_tree_col.js

@@ -4,6 +4,9 @@
 
 let MainTreeCol = {
     getText: {
+        subType: function (node) {
+
+        },
         type: function (node) {
             if (node.sourceType === projectObj.project.Bills.getSourceType()) {
                 return '';
@@ -24,7 +27,15 @@ let MainTreeCol = {
         },
         code: function (node) {
 
+        },
+        //取费专业
+        calcProgramName: function (node) {
+
+        },
+        marketPrice: function (node) {
+
         }
+
     },
     readOnly: {
         bills: function (node) {
@@ -99,6 +110,17 @@ let MainTreeCol = {
         },
         calcBase: function () {
             return calcBaseView.getCalcBaseCellType();
+        },
+        calcProgramName: function (node) {
+
+        },
+        //类别
+        subType: function (node) {
+
+        },
+        //是否分包
+        isSubcontract: function (node) {
+
         }
      },
     getEvent: function (eventName) {