Jelajahi Sumber

feat: 增加评审清单列

vian 4 tahun lalu
induk
melakukan
00636aa341

+ 1 - 0
modules/all_models/bills.js

@@ -99,6 +99,7 @@ let billsSchema = new Schema({
   specialProvisional: String,
   outPutMaxPrice:{type:Schema.Types.Mixed,default:false},//输出最高限价 true 是,false否,null 不确定,三个状态
   outPutLimitPrice:{type:Schema.Types.Mixed,default:false},//输出限价 true 是,false否,null 不确定,三个状态
+  appraisalBills:{type:Schema.Types.Mixed,default:false},//true 是,false否,null 不确定,三个状态
   maxPrice:String,//最高限价
   minPrice:String,//最低限价
   remark: String,

+ 1 - 1
public/web/tree_sheet/tree_sheet_helper.js

@@ -187,7 +187,7 @@ var TREE_SHEET_HELPER = {
                 if (colSetting.data.getText && Object.prototype.toString.apply(colSetting.data.getText) === "[object Function]") {
                     if(colSetting.data.field=="quantity") sheet.setFormatter(iRow, iCol, '@');//输入 % 号时会出现奇怪的现像, %一直追加在后面
                     cell.value(colSetting.data.getText(node));
-                } else if(['outPutMaxPrice', 'outPutLimitPrice'].includes(colSetting.data.field) && node.sourceType === projectObj.project.Bills.getSourceType()){//主要清单有三种状态,所以直接显示就好,不走最后的逻辑
+                } else if((colSetting.data.field=="appraisalBills" && MainTreeCol.appraisalBillsEnable(node)) || (['outPutMaxPrice', 'outPutLimitPrice'].includes(colSetting.data.field) && node.sourceType === projectObj.project.Bills.getSourceType())){//主要清单有三种状态,所以直接显示就好,不走最后的逻辑
                     cell.value(node.data[colSetting.data.field]===undefined?false:node.data[colSetting.data.field]);
                 } else {
                     cell.value(getFieldText2());

+ 11 - 0
web/building_saas/main/js/views/main_tree_col.js

@@ -441,7 +441,18 @@ let MainTreeCol = {
       };
       return sheetCommonObj.getTipsText(tips, setting, node);
     } */
+    appraisalBills:function (node) {
+      if(MainTreeCol.appraisalBillsEnable(node)) {
+          return projectObj.project.projectInfo.property.lockBills 
+              ? sheetCommonObj.getReadOnlyCheckBox()
+              : sheetCommonObj.getCheckBox(true)
+      };
+},
   },
+  appraisalBillsEnable:function (node) {
+    let Bills = projectObj.project.Bills;
+    return Bills.isBelongOneToSeven(node) && node.sourceType === ModuleNames.bills && node.getFlag() !== fixedFlag.ONE_SEVEN_BILLS;
+},
   editChecking: function (node) {
     if (node.sourceType == projectObj.project.Bills.getSourceType() && projectObj.project.isBillsLocked() && projectObj.project.withinBillsLocked(node)) {
       return true;

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

@@ -1923,7 +1923,7 @@ var projectObj = {
             projectObj.onEvaluationProjectClic(node,info);
         }else if(fieldName == "unitPriceAnalysis"){
             projectObj.onUnitPriceAnalysisClick(node,info);
-        }else if(fieldName == "lockUnitPrice"||fieldName == "outPutMaxPrice"||fieldName=="outPutLimitPrice"){
+        }else if(fieldName == 'appraisalBills' || fieldName == "lockUnitPrice"||fieldName == "outPutMaxPrice"||fieldName=="outPutLimitPrice"){
           projectObj.onCasCadeButtonClick(node,info,fieldName);
       }
     },