合同参数-安全生产费

app/const/tender_info.js

@@ -100,6 +100,7 @@ const defaultInfo = {
         zanLiePrice: 0,
         startAdvance: 0,
         materialAdvance: 0,
+        safeAdvance: 0,
     },
     // 显示设置
     display: {

app/public/js/tender.js

@@ -269,21 +269,22 @@ $(document).ready(function() {
             sheet.options.colHeaderVisible = false;
             sheet.defaults.rowHeight = 25;
             sheet.setColumnCount(3);
-            sheet.setRowCount(6);
+            sheet.setRowCount(7);
             sheet.setColumnWidth(0, 1);
             sheet.setColumnWidth(1, 200);
             sheet.setColumnWidth(2, 200);
             sheet.setRowHeight(0, 1);
-            sheet.getRange(1, 1, 5, 1).vAlign(1).backColor('#e4e7ea').locked(true);
-            sheet.getRange(1, 2, 5, 1).vAlign(1).hAlign(2).locked(true);
+            sheet.getRange(1, 1, 6, 1).vAlign(1).backColor('#e4e7ea').locked(true);
+            sheet.getRange(1, 2, 6, 1).vAlign(1).hAlign(2).locked(true);
             sheet.setText(1, 1, '签约合同价');
             sheet.setText(2, 1, '暂列金额');
             sheet.setText(3, 1, '签约合同价（不含暂列金）');
             sheet.setText(4, 1, '签约开工预付款');
             sheet.setText(5, 1, '签约材料预付款');
+            sheet.setText(6, 1, '安全生产费');
             const lineBorder = new spreadNS.LineBorder('#6a696e', spreadNS.LineStyle.thin);
-            sheet.getRange(0, 0, 6, 3).setBorder(lineBorder, {all: true});
-            sheet.getRange(0, 0, 6, 3).formatter('@');
+            sheet.getRange(0, 0, 7, 3).setBorder(lineBorder, {all: true});
+            sheet.getRange(0, 0, 7, 3).formatter('@');
             sheet.setSelection(1, 2, 1, 1);
         });
 
@@ -347,6 +348,7 @@ $(document).ready(function() {
             sheet.setValue(3, 2, accSub(property.deal_param.zanLiePrice, property.deal_param.contractPrice));
             sheet.setValue(4, 2, property.deal_param.startAdvance);
             sheet.setValue(5, 2, property.deal_param.materialAdvance);
+            sheet.setValue(6, 2, property.deal_param.safeAdvance);
 
         }
         function setReadOnly (readOnly) {
@@ -354,6 +356,7 @@ $(document).ready(function() {
             sheet.getCell(2, 2).locked(readOnly);
             sheet.getCell(4, 2).locked(readOnly);
             sheet.getCell(5, 2).locked(readOnly);
+            sheet.getCell(6, 2).locked(readOnly);
         }
         function getNewDealData () {
             const result = {};
@@ -361,6 +364,7 @@ $(document).ready(function() {
             result.zanLiePrice = _.toNumber(sheet.getText(2, 2));
             result.startAdvance = _.toNumber(sheet.getText(4, 2));
             result.materialAdvance = _.toNumber(sheet.getText(5, 2));
+            result.safeAdvance = _.toNumber(sheet.getText(6, 2));
             return result;
         }
 

app/view/tender/detail_modal.ejs

@@ -1219,20 +1219,21 @@
         SpreadJsObj.massOperationSheet(sheet, function () {
             sheet.defaults.rowHeight = 21;
             sheet.setColumnCount(2);
-            sheet.setRowCount(5);
+            sheet.setRowCount(6);
             sheet.setColumnWidth(0, 200);
             sheet.setColumnWidth(1, 200);
-            sheet.getRange(0, 0, 5, 1).vAlign(1).backColor('#e4e7ea').locked(true);
-            sheet.getRange(0, 1, 5, 1).vAlign(1).hAlign(2).locked(false);
+            sheet.getRange(0, 0, 6, 1).vAlign(1).backColor('#e4e7ea').locked(true);
+            sheet.getRange(0, 1, 6, 1).vAlign(1).hAlign(2).locked(false);
             sheet.setText(0, 0, '签约合同价');
             sheet.setText(1, 0, '暂列金额');
             sheet.setText(2, 0, '签约合同价（不含暂列金）');
             sheet.setText(3, 0, '签约开工预付款');
             sheet.setText(4, 0, '签约材料预付款');
+            sheet.setText(5, 0, '安全生产费');
             sheet.getCell(2, 1).locked(true);
             const lineBorder = new spreadNS.LineBorder('#dee2e6', spreadNS.LineStyle.thin);
-            sheet.getRange(0, 0, 5, 2).setBorder(lineBorder, {all: true});
-            sheet.getRange(0, 0, 5, 2).formatter('@');
+            sheet.getRange(0, 0, 6, 2).setBorder(lineBorder, {all: true});
+            sheet.getRange(0, 0, 6, 2).formatter('@');
             sheet.setSelection(0, 1, 1, 1);
         });
 
@@ -1295,6 +1296,7 @@
             sheet.setValue(2, 1, ZhCalc.sub(property.deal_param.contractPrice, property.deal_param.zanLiePrice));
             sheet.setValue(3, 1, property.deal_param.startAdvance);
             sheet.setValue(4, 1, property.deal_param.materialAdvance);
+            sheet.setValue(5, 1, property.deal_param.safeAdvance);
 
         }
         function setReadOnly (readOnly) {
@@ -1302,6 +1304,7 @@
             sheet.getCell(1, 1).locked(readOnly);
             sheet.getCell(3, 1).locked(readOnly);
             sheet.getCell(4, 1).locked(readOnly);
+            sheet.getCell(5, 1).locked(readOnly);
         }
         function getNewDealData () {
             const result = {};
@@ -1309,6 +1312,7 @@
             result.zanLiePrice = _.toNumber(sheet.getText(1, 1));
             result.startAdvance = _.toNumber(sheet.getText(3, 1));
             result.materialAdvance = _.toNumber(sheet.getText(4, 1));
+            result.safeAdvance = _.toNumber(sheet.getText(5, 1));
             return result;
         }