定额库工作内容、附注初始默认所有

web/maintain/ration_repository/js/annotation.js

@@ -319,7 +319,7 @@ let annotationOprObj = {
     //定额工作内容相关操作
     rationAnnotationOpr: function (rationItems) {
         let me = annotationOprObj;
-        me.setRadiosDisabled(rationItems.length > 0 ? false : true, me.radios);
+        me.setRadiosDisabled(sectionTreeObj.tree.selected.children.length === 0 ? false : true, me.radios);
         me.setRadiosChecked(me.currentSituation, me.radios);
         me.buildTablePartial(me.fzTablePartial, me.getGroup(rationItems));
     },

web/maintain/ration_repository/js/jobContent.js

@@ -328,7 +328,7 @@ let jobContentOprObj = {
     //定额工作内容相关操作
     rationJobContentOpr: function (rationItems) {
         let me = jobContentOprObj;
-        me.setRadiosDisabled(me.currentRationItems.length > 0 ? false : true, me.radios);
+        me.setRadiosDisabled(sectionTreeObj.tree.selected.children.length === 0 ? false : true, me.radios);
         me.setRadiosChecked(me.currentSituation, me.radios);
         me.buildTablePartial(me.tablePartial, me.getGroup(rationItems));
     },

web/maintain/ration_repository/js/section_tree.js

@@ -590,11 +590,11 @@ let sectionTreeObj = {
             explanatoryOprObj.clickUpdate($('#explanationShow'), $('#ruleTextShow'));
             explanatoryOprObj.showText($('#explanationShow'), $('#ruleTextShow'), node.data.explanation, node.data.ruleText);
             //job
-            jobContentOprObj.currentSituation = typeof node.data.jobContentSituation !== 'undefined'? node.data.jobContentSituation : jobContentOprObj.situations.NONE;
+            jobContentOprObj.currentSituation = typeof node.data.jobContentSituation !== 'undefined'? node.data.jobContentSituation : jobContentOprObj.situations.ALL;
             jobContentOprObj.setAttribute(jobContentOprObj.currentTreeNode ? jobContentOprObj.currentTreeNode : node, node);
             jobContentOprObj.clickUpdate($('#txtareaAll'));
             //fz
-            annotationOprObj.currentSituation = typeof node.data.annotationSituation !== 'undefined'? node.data.annotationSituation : annotationOprObj.situations.NONE;
+            annotationOprObj.currentSituation = typeof node.data.annotationSituation !== 'undefined'? node.data.annotationSituation : annotationOprObj.situations.ALL;
             annotationOprObj.clickUpdate($('#fzTxtareaAll'));
         }
     },

web/maintain/ration_repository/js/sheetsOpr.js

@@ -65,7 +65,8 @@ let sheetsOprObj = {
                     sheet.setValue(row, col, distTypeVal, ch);
                 }
                 else {
-                    sheet.setValue(row, col, data[row][setting.header[col].dataCode] ? data[row][setting.header[col].dataCode] : '', ch);
+                    sheet.setValue(row, col, data[row][setting.header[col].dataCode] !== undefined && data[row][setting.header[col].dataCode] !== null
+                        ? data[row][setting.header[col].dataCode] : '', ch);
                     sheet.setTag(row, 0, data[row].ID, ch);
                     /*if(typeof setting.owner !== 'undefined' && setting.owner !== 'gljComponent'){
                         sheet.getCell(row, 0, GC.Spread.Sheets.SheetArea.viewport).locked(true);