Jelajahi Sumber

取费类别默认为空

zhongzewei 6 tahun lalu
induk
melakukan
b6b6b13ce8

+ 1 - 1
modules/ration_repository/models/ration_item.js

@@ -786,7 +786,7 @@ rationItemDAO.prototype.batchUpdateSectionIdFromExcel = async function(data) {
         sectionId = isNaN(sectionId) || sectionId <= 0 ? 0 : sectionId;
         // 取费专业
         let feeType = tmp[1] ? parseInt(tmp[1]) : null;
-        feeType = isNaN(feeType) || feeType <= 0 ? 0 : feeType;
+        feeType = isNaN(feeType) || feeType <= 0 ? null : feeType;
         let name = tmp[4];
         name = name ? name : '';
         if (sectionId <= 0 || rationId <= 0) {

+ 1 - 1
web/maintain/ration_repository/js/sheetsOpr.js

@@ -65,7 +65,7 @@ let sheetsOprObj = {
                     sheet.setValue(row, col, distTypeVal, ch);
                 }
                 else {
-                    sheet.setValue(row, col, data[row][setting.header[col].dataCode], ch);
+                    sheet.setValue(row, col, data[row][setting.header[col].dataCode] ? 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);