debug

web/building_saas/main/js/models/ration_glj.js

@@ -118,8 +118,11 @@ var ration_glj = {
                 gljOprObj.showRationGLJSheetData(true);
                 //add to mainTree;
                 me.addToMainTree(neRecodes);
-                let node = project.mainTree.selected;
-                project.calcProgram.calcAndSave(node);
+                let rationID = neRecodes[0].rationID;
+                let node = project.mainTree.nodes['id_' + rationID];
+                if(isDef(node)){
+                    project.calcProgram.calcAndSave(node);
+                }
                 if (activeSubSheetIs(subSheetIndex.ssiCalcProgram)) {
                     calcProgramObj.showData(node, false);
                 }

web/building_saas/main/js/views/character_content_view.js

@@ -293,6 +293,7 @@ let characterOprObj = {
         sheet.bind(EVENTS.EditStarting, me.onEditStart);
         sheet.bind(EVENTS.ClipboardPasting, me.onClipboardPasting);
         sheet.bind(EVENTS.ClipboardPasted, me.onClipboardPasted);
+        workBook.bind(EVENTS.RangeChanged, me.onRangeChanged);
     },
     //将从清单库中添加的清单，把标准清单的项目特征转化成清单的项目特征
     buildItemCharactet: function (items) {//从清单库过来的默认不输出
@@ -562,6 +563,24 @@ let characterOprObj = {
         }
         me.save();
     },
+    onRangeChanged: function (sender, args) {
+        let me = characterOprObj;
+        let rangeCell = isDef(args.changedCells[0]) ? args.changedCells[0] : null;
+        if(!rangeCell){
+            return;
+        }
+        let rangeData = isDef(me.currentCache[rangeCell.row]) ? me.currentCache[rangeCell.row] : null;
+        if(!rangeData){
+            return;
+        }
+        if(rangeCell.col === 1){//特征值
+            rangeData.isChecked = false;
+            for(let value of rangeData.eigenvalue){
+                value.isSelected = false;
+            }
+        }
+        me.save();
+    },
     //复选框控制输出
     onButtonClicked: function (sender, args) {
         let me = characterOprObj, characterTxt;
@@ -833,6 +852,8 @@ let pageCCOprObj = {
             saveObj.push({field: index, value: updateData[index]});
         }
         saveObj.push({field: 'addRule', value: setting});
+        saveObj.push({field: 'jobContent', value: node.data.jobContent});
+        saveObj.push({field: 'itemCharacter', value: node.data.itemCharacter});
         // 更新到数据库
         pageCCOprObj.updateBill(findSet, saveObj, function(response) {
             self.refreshView(node, updateData);

web/building_saas/main/js/views/glj_view.js

@@ -171,7 +171,7 @@ var gljOprObj = {
             onClick: function (event, treeId, treeNode) {
                 if (treeId == 'gljTree') {
                     let me = gljOprObj, gljTypeId = treeNode.ID;
-                    if (me.gljCurTypeId !== treeNode.ID) {
+                    if (treeNode.ID) {
                         me.gljCurTypeId = treeNode.ID;
                         me.filterLibGLJSheetData();
                         me.showLibGLJSheetData();

web/building_saas/main/js/views/project_view.js

@@ -262,8 +262,6 @@ var projectObj = {
         }
     },
     updateCellValue: function (node, value, colSetting) {
-        console.log(`node`);
-        console.log(node);
         let project = projectObj.project, fieldName = colSetting.data.field;
         if(node.sourceType==project.ration_glj.getSourceType()){
             project.ration_glj.updateFromMainSpread(value,node,fieldName);

web/building_saas/main/js/views/std_ration_lib.js

@@ -287,6 +287,13 @@ $('#rationSearch').click(function () {
         resultSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, rationLibObj.onRationSpreadCellDoubleClick);
     };
     CommonAjax.post('/complementaryRation/api/findRation', {'user_id': userID, 'rationRepId': rationLibID, 'keyword': keyword}, function (result) {
+        //sort
+        result.sort(function (a, b) {
+            let rst = 0;
+            if(a.code > b.code) rst = 1;
+            else if(a.code < b.code) rst = -1;
+            return rst;
+        });
         var resultObj = $('#rationSearchResult'), resultSpread = null;
         resultObj.empty();
         resultObj.append(getResultHtml(result));

web/building_saas/pm/js/pm_main.js

@@ -225,7 +225,6 @@ $(document).ready(function() {
                 updateObj.updateData.ID = fileDelObj.id;
             }
             updateObj.fileType = fileDelObj.fileType;
-            console.log(updateObj);
             a_updateFiles([updateObj], function () {
                 fileDelObj = null;
                 $('#fileDelCancel').click();
@@ -366,7 +365,7 @@ $(document).ready(function() {
         //获取建设项目
         let selected = Tree.selected();
         let projs = getProjs(selected);
-        setProjOptions(projs);
+        setProjOptions(projs, selected);
        $($("input[name='valuation_type']")[0]).click();
     });
 
@@ -432,7 +431,6 @@ $(document).ready(function() {
         let dialog = $('#del');
         if (Tree) {
             updateData = GetDeleteUpdateData(Tree.selected());
-            console.log(updateData);
             UpdateProjectData(updateData, function () {
                 dialog.modal('hide');
                 Tree.removeNode(Tree.selected());
@@ -487,7 +485,6 @@ $(document).ready(function() {
 
     // 移动到操作
     $('#move-to-confirm').click(function () {
-        console.log(111);
         let updateData = null;
         let dialog = $('#move-to-dialog');
         let target = GetTargetTreeNode($.fn.zTree.getZTreeObj('treeDemo'));
@@ -909,7 +906,6 @@ function AddSiblingsItem(selected, name, property, type, callback) {
                 datas.forEach(function (data) {
                     if (data.updateType === 'new') {
                         Tree.addNodeData(data.updateData, parent, next);
-                        console.log(selected);
                     }
                 });
                 callback();
@@ -1031,13 +1027,14 @@ function setFileOptions(projID){
 }
 
 //建设项目下拉框
-function setProjOptions(projs){
+function setProjOptions(projs, selected){
     $("#poj-name-list").empty();
     $("#poj-name").val("");
     if(projs.length > 0){
-        $("#poj-name").val(projs[0].data.name);
-        setFileOptions(projs[0].data.ID);
-        setEngOptions(projs[0].data.ID);
+        let firstProj = selected.data.projType === projectType.project ? selected: projs[0];
+        $("#poj-name").val(firstProj.data.name);
+        setFileOptions(firstProj.data.ID);
+        setEngOptions(firstProj.data.ID);
         for(let i = 0, len = projs.length; i < len; i++){
             let proj = $("<button>").val(projs[i].data.ID).text(projs[i].data.name);
             proj.addClass("dropdown-item");
@@ -1845,7 +1842,6 @@ function bindEvents_file_table(jqS, usedObj, targetBody, type){
                     $(jqS + ' div:eq(0)').show();
                     $(jqS + ' div:eq(1)').hide();
                 });
-                console.log(updateObj);
             }
             let newDispName = newName + postFix;
             $(jqS + ' div:eq(0)')[0].childNodes[0].textContent = newDispName;