小数位数

config/gulpConfig.js

@@ -87,6 +87,7 @@ module.exports = {
         'web/building_saas/main/js/views/project_info.js',
         'web/building_saas/main/js/views/project_view.js',
         'web/building_saas/main/js/views/options_view.js',
+        'web/building_saas/main/js/views/project_property_decimal_view.js',
         'web/building_saas/main/js/main_ajax.js',
         'web/building_saas/main/js/main.js',
         'web/building_saas/main/js/controllers/project_controller.js',

modules/pm/controllers/pm_controller.js

@@ -295,5 +295,4 @@ module.exports = {
             callback(request, response, err, msg, data);
         });
     }
-
 };

modules/pm/models/project_model.js

@@ -22,11 +22,18 @@ let projectType = {
     project: 'Project',
     engineering: 'Engineering',
 };
-//回收站恢复级别
 let fileType = {
     unitPriceFile: 'UnitPriceFile',
     feeRateFile: 'FeeRateFile'
 };
+//默认的小数位数
+const defaultDecimal = {
+    bills: {unitPrice: 2, totalPrice: 2},
+    ration: {quantity: 3, unitPrice: 2, totalPrice: 2},
+    glj: {quantity: 3, unitPrice: 2},
+    feeRate: 2,
+    process: 6//中间过程，用于未定义取舍位数
+};
 
 let ProjectsDAO = function(){};
 
@@ -95,6 +102,9 @@ ProjectsDAO.prototype.updateUserProjects = async function(userId, datas, callbac
                     }
                     data.updateData.property.unitPriceFile.id = addResult.id;
                 }
+                if(data.updateData.projType === projectType.tender){
+                    data.updateData.property.decimal = defaultDecimal;
+                }
                 newProject = new Projects(data.updateData);
                 // 查找同级是否存在同名数据
                 let exist = await this.isExist(data.updateData.name, data.updateData.ParentID);

web/building_saas/main/html/main.html

@@ -265,6 +265,7 @@
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-3" role="tab">指标信息</a></li>
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-4" role="tab">关于计算</a></li>
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-5" role="tab">清单工程精度</a></li>
+                                <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-decimal" role="tab" id="tab_poj-settings-decimal">小数位数</a></li>
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-6" role="tab" id="tab_poj-settings-6">人工单价调整</a></li>
                             </ul>
                         </div>
@@ -341,6 +342,73 @@
                                         清单工程精度
                                     </div>
                                 </div>
+                                <!--小数位数-->
+                                <div class="tab-pane fade" id="poj-settings-decimal" role="tabpanel">
+                                    <div class="modal-auto-height">
+                                        <fieldset class="form-group">
+                                            <h5>清单</h5>
+                                            <div class="row m-0">
+                                                <div class="col-sm-3">
+                                                    <div class="input-group input-group-sm mb-2">
+                                                        <div class="input-group-addon">单价</div>
+                                                        <input type="number" name="bills-unitPrice" class="form-control" value="2" step="1" max="6" min="0">
+                                                    </div>
+                                                </div>
+                                                <div class="col-sm-3">
+                                                    <div class="input-group input-group-sm mb-2">
+                                                        <div class="input-group-addon">合价</div>
+                                                        <input type="number" name="bills-totalPrice" class="form-control" value="2" step="1" max="6" min="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <h5 class="mt-3">定额</h5>
+                                            <div class="row m-0">
+                                                <div class="col-sm-3">
+                                                    <div class="input-group input-group-sm mb-2">
+                                                        <div class="input-group-addon">工程量</div>
+                                                        <input type="number" name="ration-quantity" class="form-control" value="2" step="1" max="6" min="0">
+                                                    </div>
+                                                </div>
+                                                <div class="col-sm-3">
+                                                    <div class="input-group input-group-sm mb-2">
+                                                        <div class="input-group-addon">单价</div>
+                                                        <input type="number" name="ration-unitPrice" class="form-control" value="2" step="1" max="6" min="0">
+                                                    </div>
+                                                </div>
+                                                <div class="col-sm-3">
+                                                    <div class="input-group input-group-sm mb-2">
+                                                        <div class="input-group-addon">合价</div>
+                                                        <input type="number" name="ration-totalPrice" class="form-control" value="2" step="1" max="6" min="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <h5 class="mt-3">工料机</h5>
+                                            <div class="row m-0">
+                                                <div class="col-sm-3">
+                                                    <div class="input-group input-group-sm mb-2">
+                                                        <div class="input-group-addon">工程量</div>
+                                                        <input type="number" name="glj-quantity" class="form-control" value="2" step="1" max="6" min="0">
+                                                    </div>
+                                                </div>
+                                                <div class="col-sm-3">
+                                                    <div class="input-group input-group-sm mb-2">
+                                                        <div class="input-group-addon">单价</div>
+                                                        <input type="number" name="glj-unitPrice" class="form-control" value="2" step="1" max="6" min="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <h5 class="mt-3">费率</h5>
+                                            <div class="row m-0">
+                                                <div class="col-sm-3">
+                                                    <div class="input-group input-group-sm mb-2">
+                                                        <div class="input-group-addon">费率</div>
+                                                        <input type="number" name="feeRate" class="form-control" value="2" step="1" max="6" min="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+                                </div>
                                 <!--人工单价调整-->
                                 <div class="tab-pane fade" id="poj-settings-6" role="tabpanel">
                                     <div class="row px-3">
@@ -596,6 +664,7 @@
         <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>
         <script type="text/javascript" src="/web/building_saas/main/js/views/options_view.js"></script>
+        <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_decimal_view.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/main_ajax.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/main.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/controllers/project_controller.js"></script>

web/building_saas/main/js/views/project_info.js

@@ -26,6 +26,8 @@ var projectInfoObj = {
         CommonAjax.post('/pm/api/getProject', {"user_id": userID, "proj_id": scUrlUtil.GetQueryString('project')}, function (data) {
             if (data) {
                 that.projectInfo = data;
+                //init decimal
+                setDecimal(decimalObj, data.property.decimal);
                 $('#fullpath').html(that.getFullPathHtml(that.projectInfo));
             }
         });