辅助定额。

public/web/sheet/sheet_creater.js

@@ -11,11 +11,10 @@ sheetObj = {
     create: function (container, colDef, datas){
         var me = this;
         me.spread = new GC.Spread.Sheets.Workbook(container, {sheetCount:1});
+        me.spread.suspendPaint();
         me.spread.options.tabStripVisible = false;
         me.spread.options.showHorizontalScrollbar = false;
         var sheet = me.spread.getSheet(0);
-        sheet.suspendPaint();
-        sheet.suspendEvent();
         var sheetArea = GC.Spread.Sheets.SheetArea;
         sheet.setRowCount(20, sheetArea.viewport);
         sheet.setRowHeight(0, 25, sheetArea.colHeader);
@@ -26,8 +25,7 @@ sheetObj = {
         me.setColAlign(colDef);
         me.lockCols(colDef);
         me.setRowHeight(datas, 23);
-        sheet.resumeEvent();
-        sheet.resumePaint();
+        me.spread.resumePaint();
         return me.spread;
     },
 

web/maintain/ration_repository/js/ration.js

@@ -61,7 +61,7 @@ var rationOprObj = {
             if (cacheSection && args.row < cacheSection.length) {
                 rationGLJOprObj.getGljItems(cacheSection[args.row]);
                 rationCoeOprObj.getCoeItems(cacheSection[args.row]);
-                rationAssistOprObj.getAssistItems(cacheSection[args.row]);
+                rationAssistOprObj.getAssItems(cacheSection[args.row]);
             }
         };
         me.workBook.focus(true);

web/maintain/ration_repository/js/ration_assist.js

@@ -1,5 +1,5 @@
 /**
- * Created by CSL on 2017-06-08.
+ * Created by CSL on 2017-06-14.
  */
 var rationAssistOprObj = {
     sheet: null,
@@ -7,19 +7,16 @@ var rationAssistOprObj = {
     ration: null,
     setting: {
         header:[
-            {headerName:"调整名称",headerWidth:200,dataCode:"name", dataType: "String"},
+            {headerName:"调整名称",headerWidth:200,dataCode:"name", dataType: "String", hAlign: "left"},
             {headerName:"辅助定额号",headerWidth:120,dataCode:"assistCode", dataType: "String", hAlign: "center"},
-            {headerName:"标准值",headerWidth:120,dataCode:"stdValue", dataType: "String"},
-            {headerName:"步距",headerWidth:120,dataCode:"stepValue", dataType: "String"},
-            {headerName:"精度",headerWidth:80,dataCode:"decimal", dataType: "Number", hAlign: "center"},
-            {headerName:"进位方式",headerWidth:120,dataCode:"carryBit", dataType: "String"},
-            {headerName:"最小值",headerWidth:120,dataCode:"minValue", dataType: "String"},
-            {headerName:"最大值",headerWidth:120,dataCode:"maxValue", dataType: "String"}
+            {headerName:"标准值",headerWidth:100,dataCode:"stdValue", dataType: "String", hAlign: "right"},
+            {headerName:"步距",headerWidth:100,dataCode:"stepValue", dataType: "String", hAlign: "right"},
+            {headerName:"精度",headerWidth:80,dataCode:"decimal", dataType: "Number", hAlign: "right"},
+            {headerName:"进位方式",headerWidth:100,dataCode:"carryBit", dataType: "String", hAlign: "center"},
+            {headerName:"最小值",headerWidth:100,dataCode:"minValue", dataType: "String", hAlign: "right"},
+            {headerName:"最大值",headerWidth:100,dataCode:"maxValue", dataType: "String", hAlign: "right"}
         ],
-        view:{
-            comboBox:[],
-            lockColumns:[]
-        }
+        view:{}
     },
 
     buildSheet: function(sheet) {
@@ -28,7 +25,7 @@ var rationAssistOprObj = {
         me.libID = storageUtil.getSessionCache("RationGrp","repositoryID"); // 不可靠，有时取不到
         if (me.libID == undefined){me.libID = getQueryString('repository')};
 
-        sheetCommonObj.initSheet(me.sheet, me.setting, 10);
+        sheetCommonObj.initSheet(me.sheet, me.setting, 30);
 
         var carryBit = new GC.Spread.Sheets.CellTypes.ComboBox();
         carryBit.items(["四舍五入","进一"]);
@@ -36,7 +33,7 @@ var rationAssistOprObj = {
 
         me.sheet.bind(GC.Spread.Sheets.Events.ClipboardPasting, me.onClipboardPasting);
         me.sheet.bind(GC.Spread.Sheets.Events.ClipboardPasted, me.onClipboardPasted);
-        me.sheet.bind(GC.Spread.Sheets.Events.EditEnded, me.onCellEditEnd);
+        me.sheet.bind(GC.Spread.Sheets.Events.EditEnded, me.onEditEnded);
         me.sheet.bind(GC.Spread.Sheets.Events.RangeChanged, me.onRangeChanged);
     },
 
@@ -49,53 +46,69 @@ var rationAssistOprObj = {
 
     onClipboardPasted: function(e, info) {
         var me = rationAssistOprObj;
-        if (me.ration) {
-            // 粘！
-        }
-    },  // .....
+        if (!me.ration) {return;};
+        var tempArr = sheetCommonObj.analyzePasteData(me.setting, info);
+        var assList = me.ration.rationAssList;
+        if (assList == undefined) {
+            me.ration.rationAssList = tempArr;
+        }else{
+            assList = assList.concat(tempArr);
+            me.ration.rationAssList = assList;
+        };
+
+        rationOprObj.mixUpdateRequest([me.ration], [], []);
+        sheetCommonObj.cleanSheet(me.sheet, me.setting, -1);
+        sheetCommonObj.showData(me.sheet, me.setting, me.ration.rationAssList);
+    },
 
-    onCellEditEnd: function(sender, args){
+    onEditEnded: function(sender, args){
         var me = rationAssistOprObj;
         if (!me.ration) {return;};
+        var assList = me.ration.rationAssList;
+        var assObj = sheetCommonObj.combineRowData(me.sheet, me.setting, args.row);
+        // 新增
+        if ((assList == undefined) || (assList && args.row >= assList.length)) {
+            if (assObj.decimal == undefined || assObj.decimal == null){assObj.decimal = '0';};
+            if (assObj.carryBit == undefined || assObj.carryBit == null){assObj.carryBit = '四舍五入';};
+            assList.push(assObj);
+        }
+        // 修改
+        else{ assList[args.row] = assObj; };
 
-    },  // .....
+        rationOprObj.mixUpdateRequest([me.ration], [], []);
+        sheetCommonObj.cleanSheet(me.sheet, me.setting, -1);
+        sheetCommonObj.showData(me.sheet, me.setting, assList);
+    },
 
     onRangeChanged: function(sender, args) {
         if (args.action == GC.Spread.Sheets.RangeChangedAction.clear) {
-            if (!confirm('确定要删除本条辅助定额吗？')){return; }
+            if (!confirm(`确定要删除选中的 ${args.rowCount} 条辅助定额吗？`)){return; }
+
             var me = rationAssistOprObj;
-            var obj = me.datas[args.row];
-            me.save([],[obj],[]);
-            args.sheet.deleteRows(args.row, 1);
+            if (!me.ration) {return;};
+            var assList = me.ration.rationAssList;
+            for (var i = args.rowCount - 1; i >= 0; i--) {
+                if (args.row + i < assList.length) {
+                    assList.splice(args.row + i, 1);
+                };
+            };
+
+            rationOprObj.mixUpdateRequest([me.ration], [], []);
+            sheetCommonObj.cleanSheet(me.sheet, me.setting, -1);
+            sheetCommonObj.showData(me.sheet, me.setting, assList);
         };
     },
 
-    getAssistItems: function(ration) {
+    getAssItems: function(ration) {
         var me = this;
         me.ration = ration;
 
         sheetCommonObj.cleanSheet(me.sheet, me.setting, -1);
+        sheetCommonObj.unShieldAllCells(me.sheet);
 
         if (ration == undefined || ration.rationAssList == undefined ||
             ration.rationAssList.length == 0){return;};
 
         sheetCommonObj.showData(me.sheet, me.setting, ration.rationAssList);
-    },
-
-    save: function() {
-        var me = this;
-        if (!me.ration) {return;};
-
-        var ass = me.ration.rationAssList;
-/*        var rst = [];
-        var curCache = me.cache["_Coe_" + me.ration.ID];
-        if (curCache) {
-            for (let obj of curCache) {
-                rst.push(obj.ID);
-            };
-            me.ration.rationCoeList = rst;
-            updateArr.push(me.ration);
-            rationOprObj.mixUpdateRequest(updateArr, [], []);
-        }; */
     }
 }

web/maintain/ration_repository/js/ration_coe.js

@@ -26,7 +26,7 @@ var rationCoeOprObj = {
         sheetCommonObj.initSheet(me.sheet, me.setting, 30);
         me.sheet.bind(GC.Spread.Sheets.Events.ClipboardPasting, me.onClipboardPasting);
         me.sheet.bind(GC.Spread.Sheets.Events.ClipboardPasted, me.onClipboardPasted);
-        me.sheet.bind(GC.Spread.Sheets.Events.EditEnded, me.onCellEditEnd);
+        me.sheet.bind(GC.Spread.Sheets.Events.EditEnded, me.onEditEnded);
         me.sheet.bind(GC.Spread.Sheets.Events.RangeChanged, me.onRangeChanged);
     },
 
@@ -54,7 +54,7 @@ var rationCoeOprObj = {
         }
     },
 
-    onCellEditEnd: function(sender, args){
+    onEditEnded: function(sender, args){
         var me = rationCoeOprObj;
         if (args.col == 0) {   // 编号列
             //delete
@@ -81,7 +81,8 @@ var rationCoeOprObj = {
 
     onRangeChanged: function(sender, args) {
         if (args.action == GC.Spread.Sheets.RangeChangedAction.clear) {
-            var me = rationCoeOprObj, updateArr = [], removeArr = [];
+            if (!confirm(`确定要删除选中的 ${args.rowCount} 条附注条件吗？`)){return; }
+            var me = rationCoeOprObj;
             if (args.col == 0) {
                 var curCache = me.cache["_Coe_" + me.curRation.ID];
                 if (curCache) {

web/users/login.html

@@ -126,7 +126,7 @@
 
     <script src="/lib/tether/tether.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
-    <script src="/web/ration_repository/js/global.js"></script>
+    <script src="/web/maintain/ration_repository/js/global.js"></script>
 </body>
 
 </html>