清单库debug

web/maintain/bills_lib/html/neirong.html

@@ -41,14 +41,14 @@
       <div class="content">
         <div class="container-fluid">
           <div class="row">
-            <div class="main-content col-lg-7 p-0">
+            <div class="main-content col-lg-12 p-0">
                 <nav class="tools-bar">
                 </nav>
                 <div class="main-data" id="spreadAllJobs">
                 </div>
             </div>
-            <div class="main-side col-lg-5 p-0">
-            </div>
+          <!--  <div class="main-side col-lg-5 p-0">
+            </div>-->
           </div>
         </div>
       </div>
@@ -290,27 +290,27 @@
                         }
                     }
                 }
-                //let pasteDatas = tools.uniqObjArr(pasteDatas);
-            //    tools.resetRowIdx(pasteDatas, orgRow);
-                for(let i=0; i< pasteDatas.length; i++){
+                let uniqPasteDatas = tools.uniqObjArr(pasteDatas);
+                tools.resetRowIdx(uniqPasteDatas, orgRow);
+                for(let i=0; i< uniqPasteDatas.length; i++){
                     let crossedData;
                     let flag = true;
                     sheetJobsDatas.forEach(function(orgData){
-                        if(pasteDatas[i].rowIdx === orgData.rowIdx && pasteDatas[i].colIdx === orgData.colIdx){
+                        if(uniqPasteDatas[i].rowIdx === orgData.rowIdx && uniqPasteDatas[i].colIdx === orgData.colIdx){
                             flag = false;
                             crossedData = {
                                 billsLibId: billsLibId,
-                                rowIdx: pasteDatas[i].rowIdx,
-                                colIdx: pasteDatas[i].colIdx,
-                                field: pasteDatas[i].field,
+                                rowIdx: uniqPasteDatas[i].rowIdx,
+                                colIdx: uniqPasteDatas[i].colIdx,
+                                field: uniqPasteDatas[i].field,
                                 orgId: orgData.id,
-                                data: pasteDatas[i].data,
+                                data: uniqPasteDatas[i].data,
                                 type: 'Update'
                             }
                         }
                     });
                     if(flag){
-                        uncrossedDatas.push(pasteDatas[i]);
+                        uncrossedDatas.push(uniqPasteDatas[i]);
                     }
                     else{
                         crossedDatas.push(crossedData);

web/maintain/bills_lib/html/qingdan.html

@@ -68,14 +68,26 @@
             </div>
             <div class="main-side col-lg-5 p-0">
               <div class="container-fluid">
-                <div class="row">
-                  <div class="col" style="width:50%; height: 100%">
+                  <div  style="width:50%; height: 100%; float: left;">
+                      <h5>工作内容</h5>
+                      <div id="spreadJobs" class="ovf-hidden" style="width:97%; height: 300px;"></div>
+                  </div>
+                  <div  style="width:50%; height: 100%; float: left;">
+                      <h5>项目特征</h5>
+                      <div id="spreadItems" class="ovf-hidden" style="width: 97%; height: 300px;"></div>
+                  </div>
+                  <div class="form-group">
+                      <label for="exampleTextarea"><h5>补注：</h5></label>
+                      <textarea class="form-control" id="exampleTextarea" rows="8"></textarea>
+                  </div>
+               <!-- <div class="row">
+                  <div class="col ovf-hidden" style="width:50%; height: 100%; float: left;">
                       <h5>工作内容</h5>
                       <div id="spreadJobs"  style="width:97%; height: 300px;"></div>
                   </div>
-                  <div class="col" style="width:50%; height: 100%">
+                  <div class="col" style="width:50%; height: 100%; float: left;">
                     <h5>项目特征</h5>
-                      <div id="spreadItems" style="width: 97%; height: 300px;"></div>
+                      <div id="spreadItems" class="ovf-hidden" style="width: 97%; height: 300px;"></div>
                   </div>
                   <div class="w-100"></div>
                   <div class="col">
@@ -84,7 +96,7 @@
                       <textarea class="form-control" id="exampleTextarea" rows="8"></textarea>
                     </div>
                   </div>
-                </div>
+                </div>-->
               </div>
             </div>
           </div>
@@ -374,11 +386,7 @@
         let btnDownMove = $('#downMove');
         let btnUpLevel = $('#upLevel');
         let btnDownLevel = $('#downLevel');
-       // billsSheet.clearSelection();
-       // billsSheet.options.isProtected = true;
-       // controller.setTreeSelected(null);
         billsSheet.bind(GC.Spread.Sheets.Events.CellClick, function (sender, args) {
-           // if(billsSheet.options.isProtected){
                 jobsSheet.clearSelection();
                 itemsSheet.clearSelection();
                 billsSpread.focus(true);
@@ -392,21 +400,8 @@
                 btnDownLevel.attr('fcsOnBills', 'true');
                 btnUpMove.attr('fcsOnBills', 'true');
                 btnDownMove.attr('fcsOnBills', 'true');
-          //  }
-               // jobsSheet.clearSelection();
-               // itemsSheet.clearSelection();
-                //billsSheet.options.isProtected = false;
-               /* jobsSheet.options.isProtected = true;
-                itemsSheet.options.isProtected = true;
-                let activeRow = billsSheet.getActiveRowIndex();
-                let activeCol = billsSheet.getActiveColumnIndex();
-                billsSheet.setActiveCell(activeRow === 0 ? 1: 0, 0);
-                billsSheet.setActiveCell(activeRow, activeCol);*/
-               // controller.setTreeSelected(controller.tree.findNode(billsSheet.getTag(activeRow, activeCol)));
-          //  }
         });
         jobsSheet.bind(GC.Spread.Sheets.Events.CellClick, function (sender, args) {
-           // if(jobsSheet.options.isProtected){
                 itemsSheet.clearSelection();
                 jobsSpread.focus(true);
                 itemsSheet.options.isProtected = true;
@@ -427,18 +422,14 @@
                 let selected;
                 if(controller.tree.selected){
                     selected = controller.tree.selected.jobs[args.row];
-                    console.log(`selected`);
-                    console.log(selected);
                 }
                 if(tools.canUpMove(selected, controller.tree.selected.jobs)){
                     tools.btnAction(btnUpMove);
                     btnUpMove.attr('canMove', 'true');
-                    console.log(`canup`);
                 }
                 else{
                     tools.btnClose(btnUpMove);
                     btnUpMove.attr('canMove', 'false');
-                    console.log(`nocan`);
                 }
                 if(tools.canDownMove(selected, controller.tree.selected.jobs)){
                     tools.btnAction(btnDownMove);
@@ -448,19 +439,13 @@
                     tools.btnClose(btnDownMove);
                     btnDownMove.attr('canMove', 'false');
                 }
-            //}
         });
         itemsSheet.bind(GC.Spread.Sheets.Events.CellClick, function (sender, args) {
-           // if(itemsSheet.options.isProtected){
                 jobsSheet.clearSelection();
                 itemsSpread.focus(true);
                 jobsSheet.options.isProtected = true;
                 billsSheet.options.isProtected = true;
                 itemsSheet.options.isProtected = false;
-                /*let activeRow = itemsSheet.getActiveRowIndex();
-                let activeCol = itemsSheet.getActiveColumnIndex();
-                itemsSheet.setActiveCell(activeRow === 0 ? 1: 0, 0);
-                itemsSheet.setActiveCell(activeRow, activeCol);*/
 
                 controller.tree.selected.args = args;
                 controller.tree.selected.field = 'item';
@@ -494,7 +479,6 @@
                     tools.btnClose(btnDownMove);
                     btnDownMove.attr('canMove', 'false');
                 }
-            //}
         });
     };
 
@@ -516,14 +500,8 @@
             let showButton = function (show, btn) {
                 tools.btnAction($('#insert'), 'focusOnBills');
                 if (show) {
-                    //btn.show();
                     tools.btnAction(btn, 'doing');
-                    /*btn.css("opacity", "");
-                    btn.removeClass("disabled");*/
                 } else {
-                    //btn.hide();
-                    /*btn.css("opacity", "0.2");
-                    btn.addClass("disabled");*/
                     tools.btnClose(btn, 'doing');
                 }
             };
@@ -597,6 +575,9 @@
             if(arr.length > 0){
                 tools.orderReshowData(sheet, arr, setting, prefix,true);
             }
+            else{
+                setSheet.setMaxRowCount(sheet, []);
+            }
             if(recharge){
                 $('#exampleTextarea').val(recharge);
             }
@@ -692,8 +673,6 @@
             }
         });
         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);
             if(controller.tree.selected){
                 let orgRow = args.cellRange.row, orgCol = args.cellRange.col, rowCount = args.cellRange.rowCount, colCount = args.cellRange.colCount;
                 let maxRow = orgRow + rowCount - 1, maxCol = orgCol + colCount -1;
@@ -756,8 +735,6 @@
             }
         });
         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);
             if(controller.tree.selected){
                 let orgRow = args.cellRange.row, orgCol = args.cellRange.col, rowCount = args.cellRange.rowCount, colCount = args.cellRange.colCount;
                 let maxRow = orgRow + rowCount - 1, maxCol = orgCol + colCount -1;
@@ -787,7 +764,6 @@
                         }
                     });
                     if(flag){
-                        //let serialNo = tools.getSerialNo(controller.tree.selected.items);
                         serialNoUn ++;
                         console.log(serialNoUn);
                         uncrossedDatas.push({data: uniqPasteArr[j], serialNo: serialNoUn});
@@ -815,7 +791,6 @@
 
     function buildJobs(jobsSpread, setting){
         setSheet.initSheet(jobsSpread, setting, true);
-       // setSheet.setMaxRowCount(jobsSpread.getActiveSheet(), 10);
         jobsSpread.getActiveSheet().clearSelection();
         myKey.downKey(jobsSpread);
         myKey.enterKey(jobsSpread);

web/maintain/bills_lib/html/tezheng.html

@@ -47,7 +47,7 @@
             </div>
             </div>
             <div class="main-side col-lg-5 p-0">
-              <div class="main-data" id="spreadEigenvalue" style="width: 95%">
+              <div class="main-data" id="spreadEigenvalue" >
               </div>
             </div>
           </div>
@@ -307,6 +307,9 @@
                     tools.reshowValue(sheet, valueArr, setting, true);
                 }
             }
+            else{
+                    setSheet.setMaxRowCount(sheet, []);
+            }
         }
 
         function pasteItems(sheet, totalItems){

web/maintain/bills_lib/scripts/bills_lib_setting.js

@@ -241,7 +241,7 @@ var totalItemsSetting = {
                 hAlign: 0,
                 font: 'Arial'
             },
-            width: 850
+            width: 800
         },
     ],
     headRows: 1,

web/maintain/bills_lib/scripts/db_controller.js

@@ -419,6 +419,8 @@ var tools = {
         sheet.options.isProtected = true;
         let dataCode = args.col === 0 ? 'code' : 'content';
         let orgCode =  args.row < arr.length ? arr[args.row][field].data[dataCode] : '';
+        $('#alertCof').unbind('click');
+        $('#alertCls').unbind('click');
         $('#alertCls').click(function () {
             sheet.options.isProtected = false;
             sheet.getCell(args.row, args.col).value(orgCode);
@@ -434,11 +436,14 @@ var tools = {
         args.sheet.options.isProtected = true;
         let dataCode =  args.col === 0 ? 'code' : 'content';
         let orgCode =  args.row < arr.length ? arr[args.row].data[dataCode] : '';
+        $('#alertCof').unbind('click');
+        $('#alertCls').unbind('click');
         $('#alertCls').click(function () {
             args.sheet.options.isProtected = false;
             args.sheet.getCell(args.row, args.col).value(orgCode);
         });
         $('#alertCof').click(function () {
+            console.log(args.col);
             args.sheet.options.isProtected = false;
             args.sheet.getCell(args.row, args.col).value(orgCode);
         });
@@ -473,7 +478,6 @@ var tools = {
     },
     isRepeat: function(arr, field, newData, ref, classify){
         var isRepeat = false;
-        if(field === 'code'){
             if(classify){
                 if(arr){
                     arr.forEach(function(item){
@@ -498,7 +502,6 @@ var tools = {
                     });
                 }
             }
-        }
         return isRepeat;
     },
 
@@ -2277,7 +2280,8 @@ var totalItemsController = {
             else if(tagId && !isRepeat && newData !== orgItemData){//update
                     totalItemsController.updateItem(totalItems, tagId, field, newData, args);
             }
-            if(isRepeat){
+            else if(isRepeat){
+                console.log(`cunzai`);
                 tools.alertTotalOpr(args, '该项目特征已存在！', totalItems.itemsArr);
             }
         });

web/maintain/bills_lib/scripts/set_sheets.js

@@ -6,7 +6,7 @@ var setSheet = {
         var spreadNS = GC.Spread.Sheets, sheet = spread.getActiveSheet();
         sheet.suspendPaint();
         spread.options.showHorizontalScrollbar = false;
-        spread.options.showVerticalScrollbar =false;
+        //spread.options.showVerticalScrollbar =false;
         spread.options.tabStripVisible = false;
         spread.options.scrollbarMaxAlign = true;
         spread.options.allowCopyPasteExcelStyle = false;