瀏覽代碼

fix: 限价功能bug

vian 4 年之前
父節點
當前提交
6616f9b885

+ 3 - 3
web/building_saas/main/html/main.html

@@ -1116,13 +1116,13 @@
                     </fieldset>
                     <% if (!projectData.importedByInterface) { %>
                     <fieldset class="form-group">
-                      <h5>清单限价</h5>
+                      <h5 >清单限价</h5>
                       <div class="mt-1">
-                        最高限价<input id="max-price-rate" data-limit="max" class="form-control form-control-sm limit-price-input" value="0" type="text"> %
+                        <span data-toggle="tooltip" data-placement="bottom" data-original-title="最高限价=清单综合单价*(1+X%)">最高限价 </span><input id="max-price-rate" data-limit="max" class="form-control form-control-sm limit-price-input" value="0" type="text"> %
                       </div>
                       <% if (compilationName !== '重庆定额(2018)') { %>
                         <div class="mt-1">
-                          最低限价<input id="min-price-rate" data-limit="min" class="form-control form-control-sm limit-price-input" value="0" type="text"> %
+                          <span data-toggle="tooltip" data-placement="bottom" data-original-title="最低限价=清单综合单价*(1-X%)">最低限价 </span><input id="min-price-rate" data-limit="min" class="form-control form-control-sm limit-price-input" value="0" type="text"> %
                         </div>
                       <% } %>
                     </fieldset>

+ 2 - 2
web/building_saas/main/js/views/main_tree_col.js

@@ -482,7 +482,7 @@ let MainTreeCol = {
             dynamicCombo.items(items);
             return dynamicCombo;
         },
-        maxPrice: function (node, setting) {
+        /* maxPrice: function (node, setting) {
             const tips = () => {
                 const maxPriceRate = projectObj.project.property.maxPriceRate || 0;
                 return node.data.maxPrice ? `最高限价=清单综合单价*(1+${maxPriceRate}%)` : '';
@@ -495,7 +495,7 @@ let MainTreeCol = {
                 return  node.data.minPrice ? `最低限价=清单综合单价*(1-${minPriceRate}%)` : '';
             };
             return sheetCommonObj.getTipsText(tips, setting, node);
-        }
+        } */
     },
     mainBillsEnable:function (node) {
         let Bills = projectObj.project.Bills;

+ 2 - 2
web/building_saas/main/js/views/project_view.js

@@ -2759,11 +2759,11 @@ $('#property_ok').click(function () {
     }
     // 清单限价
     const maxPriceRate = $('#max-price-rate') && +$('#max-price-rate').val();
-    if (maxPriceRate && maxPriceRate !== projectObj.project.property.maxPriceRate) {
+    if (commonUtil.isNumber(maxPriceRate) && maxPriceRate !== projectObj.project.property.maxPriceRate) {
         properties['property.maxPriceRate'] = maxPriceRate;
     }
     const minPriceRate = $('#min-price-rate') && +$('#min-price-rate').val();
-    if (minPriceRate && minPriceRate !== projectObj.project.property.minPriceRate) {
+    if (commonUtil.isNumber(minPriceRate) && minPriceRate !== projectObj.project.property.minPriceRate) {
         properties['property.minPriceRate'] = minPriceRate;
     }
     //清单工程量精度