Sfoglia il codice sorgente

feat: 导入电子招投标文件,能使用限价功能

TASK #3669
vian 4 anni fa
parent
commit
4d09e221c5

+ 0 - 2
web/building_saas/main/html/main.html

@@ -812,7 +812,6 @@
                                             </div>
 
                                         </fieldset>
-                                        <% if (!projectData.importedByInterface) { %>
                                             <fieldset class="form-group">
                                               <h5>清单限价</h5>
                                               <div class="mt-1">
@@ -822,7 +821,6 @@
                                                 <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>
-                                            <% } %>
                                     </div>
                                 </div>
                                 <!--清单工程精度-->

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

@@ -296,12 +296,12 @@ let MainTreeCol = {
     },
     maxPrice: function (node) {
       const hasOutPutMaxPriceCol = !!projectObj.project.projSetting.main_tree_col.cols.find(item => item.data.field === 'outPutMaxPrice');
-      const hasOutPutLitmitPriceCol = !!projectObj.project.projSetting.main_tree_col.cols.find(item => item.data.field === 'outPutLitmitPrice');
-      return projectObj.project.projectInfo.importedByInterface || (hasOutPutMaxPriceCol && (node.data.outPutMaxPrice === undefined || node.data.outPutMaxPrice === false)) || (hasOutPutLitmitPriceCol && (node.data.outPutLimitPrice === undefined || node.data.outPutLimitPrice === false));
+      const hasOutPutLimitPriceCol = !!projectObj.project.projSetting.main_tree_col.cols.find(item => item.data.field === 'outPutLimitPrice');
+      return (hasOutPutMaxPriceCol && (node.data.outPutMaxPrice === undefined || node.data.outPutMaxPrice === false)) || (hasOutPutLimitPriceCol && (node.data.outPutLimitPrice === undefined || node.data.outPutLimitPrice === false));
     },
     minPrice: function (node) {
-      const hasOutPutLitmitPriceCol = !!projectObj.project.projSetting.main_tree_col.cols.find(item => item.data.field === 'outPutLitmitPrice');
-      return projectObj.project.projectInfo.importedByInterface || (hasOutPutLitmitPriceCol && (node.data.outPutLimitPrice === undefined || node.data.outPutLimitPrice === false));
+      const hasOutPutLimitPriceCol = !!projectObj.project.projSetting.main_tree_col.cols.find(item => item.data.field === 'outPutLimitPrice');
+      return (hasOutPutLimitPriceCol && (node.data.outPutLimitPrice === undefined || node.data.outPutLimitPrice === false));
     },
   },
   cellType: {
@@ -415,14 +415,14 @@ let MainTreeCol = {
     },
     outPutMaxPrice: function (node) {
       if (node.sourceType === projectObj.project.Bills.getSourceType()) {
-        return projectObj.project.projectInfo.importedByInterface  || projectObj.project.projectInfo.property.lockBills
+        return projectObj.project.projectInfo.property.lockBills
           ? sheetCommonObj.getReadOnlyCheckBox()
           : sheetCommonObj.getCheckBox();
       }
     },
     outPutLimitPrice: function (node) {
       if (node.sourceType === projectObj.project.Bills.getSourceType()) {
-        return projectObj.project.projectInfo.importedByInterface || projectObj.project.projectInfo.property.lockBills
+        return projectObj.project.projectInfo.property.lockBills
           ? sheetCommonObj.getReadOnlyCheckBox()
           : sheetCommonObj.getCheckBox();
       }