Browse Source

feat: 定额库编辑器,“导入内部数据”时,应识别文本格式的“取费专业”。

vian 2 years ago
parent
commit
236b8d6c52

+ 1 - 1
modules/all_models/stdRation_ration.js

@@ -43,7 +43,7 @@ const rationItemSchema = new Schema({
     sectionId: Number,
     rationRepId: { type: Number, index: true },
     caption: String,
-    feeType: Number,
+    feeType: String,
     jobContent: String,
     annotation: String,
     manageFeeRate: String, // 管理费费率

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

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

+ 5 - 4
web/maintain/ration_repository/js/ration.js

@@ -76,7 +76,7 @@ let rationOprObj = {
             { headerName: "机械费", headerWidth: 80, dataCode: "machinePrice", dataType: "Number", formatter: "0.00", hAlign: "right" },
             { headerName: "基价", headerWidth: 80, dataCode: "basePrice", dataType: "Number", formatter: "0.00", hAlign: "right" },
             { headerName: "显示名称(以%s表示参数)", headerWidth: 240, dataCode: "caption", dataType: "String" },
-            { headerName: "取费专业", headerWidth: 70, dataCode: "feeType", dataType: "Number", hAlign: "center" },
+            { headerName: "取费专业", headerWidth: 70, dataCode: "feeType", dataType: "String", hAlign: "center" },
             { headerName: "管理费费率(%)", headerWidth: 100, dataCode: "manageFeeRate", dataType: "String", hAlign: "center" },
             { headerName: "一类地区管理费", headerWidth: 100, dataCode: "manageFee1", dataType: "Number", hAlign: "right" },
             { headerName: "二类地区管理费", headerWidth: 100, dataCode: "manageFee2", dataType: "Number", hAlign: "right" },
@@ -471,14 +471,15 @@ let rationOprObj = {
 
                         }
                     }
-                    else if (dataCode === 'feeType') {//取费专业控制为整数    
-                        if (me.isInt(rObj[dataCode])) {
+                    else if (dataCode === 'feeType') {
+                        updateArr.push(rObj);
+                        /* if (me.isInt(rObj[dataCode])) {
                             updateArr.push(rObj);
                         }
                         else {
                             rObj[dataCode] = '';
                             args.sheet.setValue(args.row, args.col, typeof me.currentEditingRation[dataCode] !== 'undefined' && me.currentEditingRation[dataCode] ? me.currentEditingRation[dataCode] : '');
-                        }
+                        } */
                     }
                     else {
                         updateArr.push(rObj);