Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/ledger.js

@@ -1601,7 +1601,7 @@ $(document).ready(function() {
                 });
             }
         };
-        billsContextMenuOptions.items.importGclBills2Xmj = {
+        billsContextMenuOptions.items.importOtherTender = {
             name: '导入(其他标段)工程量清单至项目节',
             icon: 'fa-link',
             disabled: function (key, opt) {

app/public/js/revise.js

@@ -1286,7 +1286,7 @@ $(document).ready(() => {
                 }
             }
         });
-        billsContextMenuOptions.items.importGclBills2Xmj = {
+        billsContextMenuOptions.items.importOtherTender = {
             name: '更新(其他标段)工程量清单至项目节',
             icon: 'fa-link',
             disabled: function (key, opt) {

app/service/ledger.js

@@ -769,9 +769,7 @@ module.exports = app => {
             const maxId = await this._getMaxLid(this.ctx.tender.id);
             const select = await this.getDataById(lid);
             const sumLoad = new SumLoad(this.ctx);
-            const loadTree = await sumLoad.loadGatherGcl(select, maxId, tenders, {
-
-            });
+            const loadTree = await sumLoad.loadGatherGcl(select, maxId, tenders, {});
             const result = loadTree.getUpdateData();
 
             const conn = await this.db.beginTransaction();

app/service/revise_bills.js

@@ -288,6 +288,7 @@ module.exports = app => {
                     crid: rid,
                 });
                 const result = loadTree.getUpdateData();
+                if (result.errors.length > 100) throw '您导入的数据存在大量数据错误，请您仔细检查';
 
                 this._cacheMaxLid(this.ctx.tender.id, loadTree.keyNodeId);
                 const his = await this.ctx.service.sumLoadHistory.saveReviseHistory(this.ctx.tender.id, rid, lid, tenders, result.errors);

app/service/stage_bills.js

@@ -485,6 +485,7 @@ module.exports = app => {
                 const sumLoad = new SumLoad(this.ctx);
                 const loadTree = await sumLoad.stageGatherGcl(select, maxId, tenders);
                 const result = loadTree.getUpdateData();
+                if (result.errors.length > 100) throw '您导入的数据存在大量数据错误，请您仔细检查';
 
                 const stageBills = await this.getLastestStageData(this.ctx.tender.id, this.ctx.stage.id);
                 const updateStageBills = [], insertStageBills = [];

app/view/setting/show.ejs

@@ -35,7 +35,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <legend>台账列显示</legend>
+                            <label>台账列显示</label>
                             <table class="table table-hover table-bordered">
                                 <thead><tr><th>名称</th><th>是否显示</th><th>别名</th><th></th></tr></thead>
                                 <tbody id="ledger_col_list">

sql/update.sql

@@ -299,4 +299,7 @@ ADD COLUMN `ex_memo2`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci N
 ADD COLUMN `ex_memo3`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '备注3' AFTER `ex_memo2`;
 
 ALTER TABLE `zh_project`
-ADD COLUMN `sjs_rela`  text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'sjs相关配置' AFTER `fun_rela`;
+ADD COLUMN `sjs_rela`  text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'sjs相关配置' AFTER `fun_rela`;
+
+ALTER TABLE `zh_s2b_proj`
+ADD COLUMN `fbfx_rela`  varchar(255) NULL COMMENT '分部分项-额外配置' AFTER `filter_tender`;