Browse Source

fix: 空表里删除计算式报错

vian 1 year ago
parent
commit
5502e5cf12

+ 2 - 2
modules/price_info_lib/facade/index.js

@@ -670,9 +670,9 @@ const matchSummary = async (compilationID, libID) => {
             console.log(matched);
             console.log(matched);
             console.log(updateObj);
             console.log(updateObj);
             const areaName = areaNameMap[priceItem.areaID];
             const areaName = areaNameMap[priceItem.areaID];
-            if (/珠海/.test(areaName)) {
+            /* if (/珠海/.test(areaName)) {
                 updateObj.expString = matched.expString;
                 updateObj.expString = matched.expString;
-            }
+            } */
             updateBulks.push({
             updateBulks.push({
                 updateOne: {
                 updateOne: {
                     filter: { ID: priceItem.ID, compilationID: priceItem.compilationID, areaID: priceItem.areaID, period: priceItem.period },
                     filter: { ID: priceItem.ID, compilationID: priceItem.compilationID, areaID: priceItem.areaID, period: priceItem.period },

+ 3 - 2
web/maintain/price_info_lib/js/priceEmpty.js

@@ -133,11 +133,12 @@ const EMPTY_BOOK = (() => {
               // 改一行, 实际可能是改多行,表格一行数据是多行合并显示的
               // 改一行, 实际可能是改多行,表格一行数据是多行合并显示的
               const items = getItemsFromTableItem(cache[row]);
               const items = getItemsFromTableItem(cache[row]);
               items.forEach(item => {
               items.forEach(item => {
-                // 只有珠海才更新计算式
+                // 只有珠海建筑才更新计算式
                 const updateObj = { ...diffData };
                 const updateObj = { ...diffData };
                 const area = AREA_BOOK.cache.find(areaItem => areaItem.ID === item.areaID);
                 const area = AREA_BOOK.cache.find(areaItem => areaItem.ID === item.areaID);
-                if (!area || !area.name || !/珠海/.test(area.name)) {
+                if (diffMap) {
                   delete updateObj.expString;
                   delete updateObj.expString;
+                  delete diffData.expString;
                 }
                 }
                 postData.push({ type: UpdateType.UPDATE, ID: item.ID, areaID: area.ID, compilationID, period: curLibPeriod, data: updateObj });
                 postData.push({ type: UpdateType.UPDATE, ID: item.ID, areaID: area.ID, compilationID, period: curLibPeriod, data: updateObj });
               });
               });