瀏覽代碼

①人工系数数据结构调整、入库存储。
②计算程序标准入库存储。
③确定取费类别标准,绑定计算程序。

Chenshilong 7 年之前
父節點
當前提交
babf19bbd3

+ 20 - 4
web/building_saas/main/js/calc/calc_fees.js

@@ -3,14 +3,30 @@
  */
 
 let feeType = [
-    {type: 'common', name: '工程造价'},
-    {type: 'baseLabour', name: '基价人工费'},
+    // {type: 'common', name: '工程造价'},
+    // {type: 'baseLabour', name: '基价人工费'},
+    // {type: 'material', name: '材料费'},
+    // {type: 'machine', name: '机械费'},
+    // {type: 'rationDirect', name: '定额直接费'},
+    // {type: 'manage', name: '企业管理费'},
+    // {type: 'profit', name: '利润'},
+    // {type: 'risk', name: '风险费'},
+
+// 以下标准由缪佩玲提供
+    {type: 'direct', name: '直接费'},
+    {type: 'labour', name: '人工费'},
     {type: 'material', name: '材料费'},
     {type: 'machine', name: '机械费'},
-    {type: 'rationDirect', name: '定额直接费'},
-    {type: 'manageFee', name: '企业管理费'},
+    {type: 'mainMaterial', name: '主材费'},
+    {type: 'manage', name: '企业管理费'},
     {type: 'profit', name: '利润'},
     {type: 'risk', name: '风险费'},
+    {type: 'labourDiff', name: '人工价差'},
+    {type: 'materialDiff', name: '材料价差'},
+    {type: 'machineDiff', name: '机械价差'},
+    {type: 'common', name: '工程造价'},
+    {type: 'adjustLabour', name: '调整人工费'},
+    {type: 'adjustMachineLabour', name: '调整机上人工费'},
     // 模拟用户新增
     {type: 'fee1', name: '甲供材料费'}
 ];

File diff suppressed because it is too large
+ 168 - 168
web/building_saas/main/js/models/calc_program.js


+ 1 - 1
web/building_saas/main/js/views/calc_program_manage.js

@@ -26,7 +26,7 @@ let rationPM = {
             {headerName:"计算基数",headerWidth:180,dataCode:"dispExpr", dataType: "String"},
             {headerName:"基数说明",headerWidth:300,dataCode:"statement", dataType: "String"},
             {headerName:"费率",headerWidth:80,dataCode:"feeRate", dataType: "Number"},
-            {headerName:"字段名称",headerWidth:100,dataCode:"displayFieldName", dataType: "String", hAlign: "center"},
+            {headerName:"字段名称",headerWidth:140,dataCode:"displayFieldName", dataType: "String", hAlign: "center"},
             {headerName:"备注",headerWidth:100,dataCode:"memo", dataType: "String"}
         ],
         view:{