1.TASK #3057 农村公路养护(2020)，项目属性-小数位数，清单和定额的合价应默认为2。（其他编办保持不变）

2.TASK #3056 农村公路养护(2020)，项目管理窗口，隐藏“项目类别”列。（其他编办保持不变）
3.TASK #3039 用户登录成功后，选择编制办法的页面，改成一行3个编办，去掉介绍内容。

modules/pm/controllers/pm_controller.js

@@ -173,7 +173,7 @@ module.exports = {
         try{
             let data = JSON.parse(req.body.data);
             let projectID = data.projectID;
-            let defaultSettingSc = await ProjectsData.defaultSettings(req.session.sessionUser.id, req.session.sessionCompilation._id, projectID);
+            let defaultSettingSc = await ProjectsData.defaultSettings(req.session.sessionUser.id, req.session.sessionCompilation, projectID);
             if(!defaultSettingSc){
                 throw '恢复失败';
             }

modules/pm/models/project_model.js

@@ -137,6 +137,10 @@ ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId
                 Projects.update({userID: userId, ID: data.updateData.ID}, data.updateData, updateAll);
             }
             else if (data.updateType === 'new') {
+                let overWrite;
+                if(compilation.overWriteUrl && compilation.overWriteUrl!=""){
+                    overWrite = require("../../.."+compilation.overWriteUrl);
+                }
                 data.updateData['userID'] = userId;
                 data.updateData['compilation'] = compilationId;
                 data.updateData['createDateTime'] = new Date();
@@ -157,10 +161,7 @@ ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId
                         user_id: userId,
                         root_project_id: data.updateData.property.rootProjectID
                     };
-                    if(compilation.overWriteUrl && compilation.overWriteUrl!=""){
-                        let overWrite = require("../../.."+compilation.overWriteUrl);
-                        if(overWrite.getDefalutAssistProductionFeeRate) insertData.assistProductionFeeRate = overWrite.getDefalutAssistProductionFeeRate();
-                    }
+                    if(overWrite && overWrite.getDefalutAssistProductionFeeRate) insertData.assistProductionFeeRate = overWrite.getDefalutAssistProductionFeeRate();
                     let addResult = await unitPriceFileModel.add(insertData);
                     if (!addResult) {
                         callback(1, '新增单价文件失败.', null);
@@ -174,7 +175,7 @@ ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId
                     //单价文件
                     data.updateData.property.unitPriceFile.id=parseInt(data.updateData.property.unitPriceFile.id);
                     //小数位数
-                    data.updateData.property.decimal = defaultDecimal;
+                    data.updateData.property.decimal = overWrite && overWrite.defaultDecimal || defaultDecimal;
                     //清单工程量精度
                     data.updateData.property.billsQuantityDecimal = billsQuantityDecimal;
                     //基本信息-挪到建设项目下，多个单位工程共用
@@ -818,7 +819,8 @@ ProjectsDAO.prototype.getBasicInfo = async function (projectID) {
 };
 
 //恢复默认系统设置
-ProjectsDAO.prototype.defaultSettings = async function (userID, compilationId, projectID) {
+ProjectsDAO.prototype.defaultSettings = async function (userID, compilation, projectID) {
+    const compilationId = compilation._id;
     let project = await Projects.findOne({ID: projectID});
     if(!project){
         return false;
@@ -832,7 +834,11 @@ ProjectsDAO.prototype.defaultSettings = async function (userID, compilationId, p
     //清单工程量精度
     cloneProperty.billsQuantityDecimal = billsQuantityDecimal;
     //小数位数
-    cloneProperty.decimal = defaultDecimal;
+    let overWrite;
+    if(compilation.overWriteUrl && compilation.overWriteUrl!=""){
+        overWrite = require("../../.."+compilation.overWriteUrl);
+    }
+    cloneProperty.decimal = overWrite && overWrite.defaultDecimal || defaultDecimal;
     //呈现选项
     cloneProperty.displaySetting = displaySetting;
     //列设置

web/building_saas/css/custom.css

@@ -451,4 +451,10 @@ input.text-right{
 }
 .table-sc th {
     font-weight: normal;
+}
+
+.compilation-content {
+    left: 50% !important;
+    transform: translateX(-50%) !important;
+    width: 123% !important;
 }

web/building_saas/pm/html/project-management.html

@@ -329,7 +329,7 @@
                         </div>
                     </div>
                     <!--养护中计价方式为项目类别，预算用清单计价原字段，工程量清单用定额计价原字段-->
-                    <div class="form-group row">
+                    <div class="form-group row" id="val-type-group">
                         <label for="staticEmail" class="col-auto col-form-label col-form-label-sm">项目类别</label>
                         <div class="col">
                             <div class="custom-control custom-radio custom-control-inline">

web/over_write/js/nongcun_2020.js

@@ -100,10 +100,29 @@ if (typeof baseFigureTemplate !== 'undefined') {
     baseFigureTemplate.boq = {};
 }
 
+// 项目管理界面
+if (typeof projTreeObj !== 'undefined') {
+    // 新建分段，隐藏项目类别、养护类别、费用标准
+    $('#val-type-group').hide();
+    $('#tender-engineering-group').hide();
+    $('#tender-feeStandard-group').hide();
+}
 
 if (typeof module !== 'undefined') {
+    // 农村公路养护(2020)，项目属性-小数位数，清单和定额的合价应默认为2。（其他编办保持不变）
+    const defaultDecimal = {
+        bills: { unitPrice: 2, totalPrice: 2 },
+        ration: { quantity: 3, unitPrice: 2, totalPrice: 2 },
+        glj: { quantity: 3, unitPriceHasMix: 2, unitPrice: 3 },
+        feeRate: 3,
+        quantity_detail: 4,
+        material:5,
+        process: 6
+    };
+
     module.exports = {
         progression: [],
-        deficiency: {}
+        deficiency: {},
+        defaultDecimal
     };
 }

web/users/html/login-sms.html

@@ -49,7 +49,7 @@
     <!--弹出信息-->
     <div class="modal fade" id="ver" data-backdrop="static">
         <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
+            <div class="modal-content compilation-content">
                 <div class="modal-header">
                     <h5 class="modal-title">选择费用定额</h5>
                     <p class="m-0 text-warning"><i class="fa fa-exclamation-triangle"></i> <b>登录设置</b> 中可以修改您的登录习惯。</p>

web/users/html/login.html

@@ -8,6 +8,7 @@
     <!-- inject:css -->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
+    <link rel="stylesheet" href="/web/building_saas/css/custom.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <!-- endinject -->
     <link rel="shortcut icon" href="/web/building_saas/css/favicon.ico">
@@ -64,7 +65,7 @@
     <!--弹出信息-->
     <div class="modal fade" id="ver" data-backdrop="static" style="top: 25%;">
         <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
+            <div class="modal-content compilation-content">
                 <div class="modal-header">
                     <h5 class="modal-title">选择编制办法</h5>
                     <p class="m-0 text-warning"><i class="fa fa-exclamation-triangle"></i> <b>登录设置</b> 中可以修改您的登录习惯。</p>

web/users/js/login.js

@@ -482,12 +482,11 @@ function cleanError() {
 function setVersion(versionData) {
     let html = '';
     for (let version of versionData) {
-        let description = version.description ? version.description : '介绍内容';
-        let tmpHtml = '<div class="col-sm-6 mb-3">' +
+        //let description = version.description ? version.description : '介绍内容';
+        let tmpHtml = '<div class="col-sm-4 mb-3">' +
             '<div class="card card-block">' +
             '<div class="card-body">' +
             '<h3 class="card-title">'+ version.name +'</h3>' +
-            '<p class="card-text">' + description + '</p>' +
             '<a class="btn btn-primary" href="/boot/'+ version._id.toString() +'">开始使用</a>' +
             '</div>' +
             '</div>' +