caiaolin 8 роки тому
батько
коміт
f6c62f516c

+ 0 - 1
modules/glj/controllers/glj_controller.js

@@ -132,7 +132,6 @@ class GLJController extends BaseController {
             specs: '32.5',
             unit: 'kg',
             type: 5,
-            type_of_work: 5,
             base_price: 28.76,
             market_price: 28.76
         };

+ 1 - 1
modules/glj/models/glj_list_model.js

@@ -45,7 +45,6 @@ class GLJListModel extends BaseModel {
                 this.model.schema.path('project_id').required(true);
                 this.model.schema.path('code').required(true);
                 this.model.schema.path('name').required(true);
-                this.model.schema.path('type_of_work').required(true);
                 break;
         }
     }
@@ -106,6 +105,7 @@ class GLJListModel extends BaseModel {
                 continue;
             }
             glj.unit_price = unitPriceList[glj.code + glj.name] !== undefined ? unitPriceList[glj.code + glj.name] : null;
+            // 计算调整基价
             glj.adjust_price = glj.adjustment * glj.unit_price.market_price;
         }
     }

+ 0 - 2
modules/glj/models/schemas/glj.js

@@ -20,8 +20,6 @@ let modelSchema = {
     code: String,
     // 名称
     name: String,
-    // 人工工种
-    type_of_work: Number,
     // 是否暂估 (0为否 1为是)
     is_evaluate: {
         type: Number,

+ 0 - 1
web/glj/js/glj_index.js

@@ -14,7 +14,6 @@ $(document).ready(function () {
         {name: '单位', field: 'unit_price.unit', visible: true},
         {name: 'ID', field: 'id', visible: false},
         {name: '类型', field: 'unit_price.type', visible: false},
-        {name: '人工工种', field: 'type_of_work', visible: false},
         {name: '总消耗量', field: '', visible: true},
         {name: '基价单价', field: "unit_price.base_price", visible: true},
         {name: '调整基价', field: 'adjust_price', visible: true},