工料机调整价列设置

config/gulpConfig.js

@@ -101,6 +101,7 @@ module.exports = {
         'public/web/tree_sheet/tree_sheet_controller.js',
         'public/web/tree_sheet/tree_sheet_helper.js',
         'public/web/sheet/sheet_data_helper.js',
+        'web/building_saas/main/js/views/glj_col.js',
         'web/building_saas/main/js/views/main_tree_col.js',
         'web/building_saas/main/js/views/project_info.js',
         'web/building_saas/main/js/views/project_view.js',

modules/all_models/bills_template.js

@@ -13,6 +13,10 @@ var BillsTemplateSchema = new Schema({
     name: String,
     unit: String,
     deleteInfo: deleteSchema,
-    tempType: Number
+    tempType: Number,
+    //计算基数
+    calcBase: String,
+    //费率ID
+    feeRateID:Number
 });
 //mongoose.model('temp_bills', BillsTemplateSchema);  之后删除

modules/all_models/proj_setting.js

@@ -11,6 +11,10 @@ let projSettingSchema = {
     main_tree_col: {
         type: Schema.Types.Mixed,
         default: {}
+    },
+    //设置人材机显示列
+    glj_col:{
+        showAdjustPrice:Boolean//是否显示调整价列
     }
 };
 mongoose.model(collectionName, new Schema(projSettingSchema, {versionKey: false, collection: collectionName}));

modules/all_models/tem_bills.js

@@ -30,7 +30,10 @@ const BillsTemplateSchema = {
     // 工程专业
     engineering: Number,
     type:Number,
-    calcBase: String
+    //计算基数
+    calcBase: String,
+    //费率ID
+    feeRateID:Number
 };
 
 mongoose.model('temp_bills', BillsTemplateSchema, 'temp_bills');

modules/pm/controllers/new_proj_controller.js

@@ -39,7 +39,7 @@ module.exports = {
             async function (cb) {
                 let engineeringModel = new EngineeringLibModel();
                 let engineering = await engineeringModel.getEngineering(property.engineering_id);
-                projSetting.insertData({"projectID": newProjID, main_tree_col: engineering.main_tree_col}, cb);
+                projSetting.insertData({"projectID": newProjID, main_tree_col: engineering.main_tree_col,glj_col:engineering.glj_col}, cb);
             }
         ], (err) => callback(err));
     }

web/building_saas/main/html/main.html

@@ -1342,6 +1342,7 @@
         <script type="text/javascript" src="/public/web/sheet/sheet_data_helper.js"></script>
 
         <!-- view -->
+        <script type="text/javascript" src="/web/building_saas/main/js/views/glj_col.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/views/main_tree_col.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/views/project_info.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/views/project_view.js"></script>

web/building_saas/main/js/views/glj_col.js

@@ -0,0 +1,36 @@
+/**
+ * Created by zhang on 2018/7/3.
+ */
+let gljCol = {
+    ration_glj_setting: {
+        header: [
+            {headerName: "编码", headerWidth: 100, dataCode: "code", dataType: "String", formatter: "@"},
+            {headerName: "名称", headerWidth: 160, dataCode: "name", dataType: "String"},
+            {headerName: "规格型号", headerWidth: 90, dataCode: "specs", dataType: "String", hAlign: "left"},
+            {headerName: "单位", headerWidth: 45, dataCode: "unit", dataType: "String", hAlign: "center"},
+            {headerName: "类型", headerWidth: 45, dataCode: "shortName", dataType: "String", hAlign: "center"},
+            {headerName: "定额消耗", headerWidth: 80, dataCode: "rationItemQuantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity"},    // dataType: "Number", formatter: "0.00"
+            {headerName: "自定消耗", headerWidth: 80, dataCode: "customQuantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity"},
+            {headerName: "消耗量", headerWidth: 80, dataCode: "quantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity"},
+            {headerName: "总消耗量", headerWidth: 80, dataCode: "totalQuantity", dataType: "Number", hAlign: "right", decimalField: "glj.quantity"},
+            {headerName: "定额价", headerWidth: 80, dataCode: "basePrice", dataType: "Number", hAlign: "right", decimalField: "glj.unitPrice"},
+            {headerName: "调整价", headerWidth: 80, dataCode: "adjustPrice", dataType: "Number", hAlign: "right", decimalField: "glj.unitPrice"},
+            {headerName: "市场价", headerWidth: 80, dataCode: "marketPrice", dataType: "Number", hAlign: "right", decimalField: "glj.unitPrice"},
+            {headerName: "是否暂估", headerWidth: 65, dataCode: "isEstimate", dataType: "String", hAlign: "center", vAlign: "center", cellType: "checkBox"
+            }
+        ],
+        view: {
+            lockColumns: [0, 4, 5, 7, 8, 10, 12]
+        },
+        // 工料机类型是混凝土、砂浆、配合比、机械台班时，价格不可编辑。
+        editedTyep:[GLJTypeConst.MAIN_MATERIAL,GLJTypeConst.EQUIPMENT]//主材设备
+    },
+    removeCol:function (dataCode,setting) {
+       // let colIndex =
+
+
+
+    }
+
+
+};

web/building_saas/main/js/views/glj_view.js

@@ -88,8 +88,6 @@ var gljOprObj = {
             }
         ],
         view: {
-            comboBox: [{row: -1, col: 12, rowCount: -1, colCount: 1}],
-            lockedCells: [{row: -1, col: 3, rowCount: -1, colCount: 1}],
             lockColumns: [0, 4, 5, 7, 8, 10, 12]
         },
         // 工料机类型是混凝土、砂浆、配合比、机械台班时，价格不可编辑。

web/building_saas/main/js/views/project_glj_view.js

@@ -529,7 +529,10 @@ projectGljObject={
     },
     refreshDataSheet:function () {
         let me = projectGljObject;
-        let quantityCol = 5;
+        //------------5;
+        let quantityCol = _.findIndex(me.projectGljSetting.header,function (header) {
+            return header.dataCode ==  'quantity'|| header.dataCode == 'techQuantity' || header.dataCode =='subdivisionQuantity';
+        });
         if(me.displayType == filterType.FBFX){//分部分项人材机，将“总消耗量”替换显示为“分部分项总消耗量”。
             me.projectGljSetting.header[quantityCol].dataCode = 'subdivisionQuantity';
             me.projectGljSheet.setValue(0, quantityCol, "分部分项总消耗量", GC.Spread.Sheets.SheetArea.colHeader);
@@ -540,7 +543,6 @@ projectGljObject={
             me.projectGljSetting.header[quantityCol].dataCode = 'quantity';
             me.projectGljSheet.setValue(0, quantityCol, "总消耗量", GC.Spread.Sheets.SheetArea.colHeader);
         }
-
         if(me.displayType == filterType.SCHZ){//三材汇总树节点
             me.showMaterialTreeData();
         }else {