Explorar o código

fix: 导入信息价关键字7月份excel问题

vian %!s(int64=3) %!d(string=hai) anos
pai
achega
21b03eb060

+ 9 - 3
modules/price_info_lib/facade/index.js

@@ -270,21 +270,27 @@ async function importKeyData(libID, mainData, subData) {
     for (let row = 1; row < subData.length; row++) {
         const rowData = subData[row];
         const keywordItem = {
-            code: rowData[0] || '',
+            code: rowData[0] ? String(rowData[0]) : '',
             keyword: rowData[1] || '',
             unit: rowData[2] || '',
             coe: rowData[3] || '',
             group: rowData[4] || '',
             optionCode: rowData[5] || '',
         };
+        if (!keywordItem.code) {
+            continue;
+        }
         (keywordMap[keywordItem.code] || (keywordMap[keywordItem.code] = [])).push(keywordItem);
     }
 
     const priceItems = [];
     for (let row = 1; row < mainData.length; row++) {
         const rowData = mainData[row];
-        const code = rowData[0] || '';
-        const matchCode = code.substr(0, 4);
+        const code = rowData[0] ? String(rowData[0]) : '';
+        if (!code) {
+            continue;
+        }
+        const matchCode = code.substring(0, 4);
         const classID = classMap[matchCode] || otherClassID;
         const priceItem = {
             code,

+ 1 - 0
web/maintain/price_info_lib/js/index.js

@@ -653,6 +653,7 @@ const KEYWORD_BOOK = (() => {
     const setting = {
         header: [
             { headerName: '关键字', headerWidth: 200, dataCode: 'keyword', dataType: 'String', hAlign: 'left', vAlign: 'center' },
+            { headerName: '单位', headerWidth: 70, dataCode: 'unit', dataType: 'String', hAlign: 'center', vAlign: 'center' },
             { headerName: '关键字效果', headerWidth: 100, dataCode: 'coe', dataType: 'String', hAlign: 'center', vAlign: 'center' },
             { headerName: '组别', headerWidth: 50, dataCode: 'group', dataType: 'String', hAlign: 'center', vAlign: 'center' },
             { headerName: '选项号', headerWidth: 70, dataCode: 'optionCode', dataType: 'String', hAlign: 'center', vAlign: 'center' },