基数bug

modules/all_models/vehicle_vessel_tax_items.js

@@ -0,0 +1,27 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Zhong
+ * @date 2019/2/18
+ * @version
+ */
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+
+const vehicleVesselTax = new Schema({
+    libID: String,
+    ID: String,
+    code: String,
+    name: String,
+    spec: String,
+    unit: String,
+    vehicleVesselTax: Number, //车船税
+    useTax: Number, //使用税
+    useTaxMeasure: Number, //使用税计量吨
+    annualMonth: Number, //年工作月
+    annualMachine: Number, //年工作台班
+}, {versionKey: false});
+
+mongoose.model('std_vehicleVesselTax_items', vehicleVesselTax, 'std_vehicleVesselTax_items');

modules/all_models/vehicle_vessel_tax_lib.js

@@ -0,0 +1,26 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Zhong
+ * @date 2019/2/18
+ * @version
+ */
+
+/*
+* 车船税编辑器
+* */
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+const oprSchema = require('../all_schemas/opr_schema');
+
+const vehicleVesselTaxLib = new Schema({
+    ID: String,
+    name: String,
+    creator: String,
+    createDate: Date,
+    recentOpr: [oprSchema]
+}, {versionKey: false});
+
+mongoose.model('std_vehicleVesselTax_lib', vehicleVesselTaxLib, 'std_vehicleVesselTax_lib');

web/building_saas/main/js/models/calc_base.js

@@ -583,21 +583,21 @@ let baseFigureTemplate = {
         'LXGCJLF': function (tender) {
             let baseFee = this['DEJZAZGCSBSS'](tender),
                 fee = cbTools.getProgressiveFee(baseFee, '路线工程监理费');
-            return fee < 20000 ? 20000 : fee;
+            return fee > 0 && fee < 20000 ? 20000 : fee;
         },
         //{独立桥梁隧道工程监理费}
         //使用累进办法计算，不足2万按2万，计算基数为{定额建筑安装工程（其中定额设备购置费按 40%计）}
         'QLSDGCJLF': function (tender) {
             let baseFee = this['DEJZAZGCSBSS'](tender),
                 fee = cbTools.getProgressiveFee(baseFee, '独立桥梁隧道工程监理费');
-            return fee < 20000 ? 20000 : fee;
+            return fee > 0 && fee < 20000 ? 20000 : fee;
         },
         //{设计文件审查费}
         // 使用累进办法计算，不足3千按3千，计算基数为{定额建筑安装工程（其中定额设备购置费按 40%计）}
         'SJWJSCF': function (tender) {
             let baseFee = this['DEJZAZGCSBSS'](tender),
                 fee = cbTools.getProgressiveFee(baseFee, '设计文件审查费');
-            return fee < 3000 ? 3000 : fee;
+            return fee > 0 && fee < 3000 ? 3000 : fee;
         },
         //{路线勘察设计费}
         // 使用累进办法计算，计算基数为{定额建筑安装工程（其中定额设备购置费按 40%计）}

web/building_saas/main/js/views/project_view.js

@@ -1344,26 +1344,35 @@ var projectObj = {
                         return !project.Ration.canAdd(project.mainTree.selected);
                     },
                     callback: function (key, opt) {
-                        var selected = project.mainTree.selected;
-                        if(selected.sourceType == ModuleNames.bills){
+                        let selected = project.mainTree.selected;
+                       /* if(selected.sourceType == ModuleNames.bills){
                             if(selected.data.type == billType.FX||selected.data.type ==billType.BILL){
                                 if(selected.data.calcBase&&selected.data.calcBase!=""){
                                     alert("当前有基数计算，不能插入定额/量价/人材机。");
                                     return;
                                 }
                             }
+                        }*/
+                        if(selected.data.calcBase&&selected.data.calcBase!=""){
+                            alert("当前有基数计算，不能插入定额/量价/人材机。");
+                            return;
                         }
                         getGLJData('insert');// ProjectController.addRation(project, controller, rationType.volumePrice);
                     },
                     visible: function(key, opt){//2018-11-08  新需求，这个按钮先隐藏，有需要再放开
                         let selected = project.mainTree.selected;
-                        if (selected && selected.sourceType == ModuleNames.bills) {
+                        //属于的固定清单
+                        let belongFlag = cbTools.getBelongFlag(selected);
+                        if (belongFlag && belongFlag === fixedFlag.EQUIPMENT_ACQUISITION_FEE) {
+                            return true;
+                        }
+                        /*if (selected && selected.sourceType == ModuleNames.bills) {
                             //属于的固定清单
                             let belongFlag = cbTools.getBelongFlag(selected);
                             if (belongFlag && belongFlag === fixedFlag.EQUIPMENT_ACQUISITION_FEE) {
                                 return true;
                             }
-                        }
+                        }*/
                         return false;
                     }
                 },

web/building_saas/pm/js/pm_newMain.js

@@ -961,7 +961,7 @@ const projTreeObj = {
                 hitinfo.sheet.repaint();
             }
         };
-        TreeNodeCellType.prototype.processMouseMove = function (hitInfo) {
+        /*TreeNodeCellType.prototype.processMouseMove = function (hitInfo) {
             let sheet = hitInfo.sheet;
 
             let div = sheet.getParent().getHost();
@@ -975,7 +975,7 @@ const projTreeObj = {
                 canvas.style.cursor='default';
             }
             return false;
-        };
+        };*/
         TreeNodeCellType.prototype.processMouseEnter = function (hitinfo) {
             let text = hitinfo.sheet.getText(hitinfo.row, hitinfo.col);
             let value = hitinfo.sheet.getValue(hitinfo.row, hitinfo.col);

web/building_saas/pm/js/pm_share.js

@@ -389,7 +389,7 @@ const pmShare = (function () {
                 hitinfo.sheet.repaint();
             }
         };
-        TreeNodeCellType.prototype.processMouseMove = function (hitInfo) {
+        /*TreeNodeCellType.prototype.processMouseMove = function (hitInfo) {
             let sheet = hitInfo.sheet;
             let div = sheet.getParent().getHost();
             let canvasId = div.id + "vp_vp";
@@ -402,7 +402,7 @@ const pmShare = (function () {
                 canvas.style.cursor='default';
             }
             return false;
-        };
+        };*/
         TreeNodeCellType.prototype.processMouseEnter = function (hitinfo) {
             let text = hitinfo.sheet.getText(hitinfo.row, hitinfo.col);
             let value = hitinfo.sheet.getValue(hitinfo.row, hitinfo.col);