Merge branch 'dev' into uat

app/public/js/revise.js

@@ -10,10 +10,10 @@
 
 const ckBillsSpread = window.location.pathname + '-billsSelect';
 const invalidFields = {
-    parent: ['sgfh_qty', 'sgfh_tp', 'sjcl_qty', 'sjcl_tp', 'qtcl_qty', 'qtcl_tp', 'deal_qty', 'deal_tp', 'unit_price'],
+    parent: ['sgfh_qty', 'sgfh_tp', 'sjcl_qty', 'sjcl_tp', 'qtcl_qty', 'qtcl_tp', 'deal_qty', 'deal_tp', 'unit_price', 'ex_qty1', 'ex_tp1'],
     gcl: ['dgn_qty1', 'dgn_qty2'],
     posCode: ['b_code'],
-    posCalc: ['sgfh_qty', 'sgfh_tp', 'sjcl_qty', 'sjcl_tp', 'qtcl_qty', 'qtcl_tp'],
+    posCalc: ['sgfh_qty', 'sgfh_tp', 'sjcl_qty', 'sjcl_tp', 'qtcl_qty', 'qtcl_tp', 'ex_qty1', 'ex_tp1'],
     posXmj: ['code'],
 };
 function getExprInfo (field, converse = false) {
@@ -554,7 +554,8 @@ $(document).ready(() => {
                 // if (isTz) {
                     if (col.field === 'sgfh_qty' || col.field === 'sgfh_tp' ||
                         col.field === 'sjcl_qty' || col.field === 'sjcl_tp' ||
-                        col.field === 'qtcl_qty' || col.field === 'qtcl_tp') {
+                        col.field === 'qtcl_qty' || col.field === 'qtcl_tp'||
+                        col.field === 'ex_qty1' || col.field === 'ex_tp1') {
                         if (!node.children || node.children.length ===0) {
                             const lPos = pos.getLedgerPos(node.id);
                             if (lPos && lPos.length > 0) {
@@ -618,7 +619,7 @@ $(document).ready(() => {
                         SpreadJsObj.reLoadRowData(info.sheet, info.row);
                         return;
                     }
-                    data[col.field] = null;
+                    data[col.field] = 0;
                     if (exprInfo) {
                         data[exprInfo.expr] = '';
                     }
@@ -699,7 +700,8 @@ $(document).ready(() => {
                         }
                         if (colSetting.field === 'sgfh_qty' || colSetting.field === 'sgfh_tp' ||
                             colSetting.field === 'sjcl_qty' || colSetting.field === 'sjcl_tp' ||
-                            colSetting.field === 'qtcl_qty' || colSetting.field === 'qtcl_tp') {
+                            colSetting.field === 'qtcl_qty' || colSetting.field === 'qtcl_tp'||
+                            colSetting.field === 'ex_qty1' || colSetting.field === 'ex_tp1') {
                             // if (isTz) {
                                 toastMessageUniq(hint.posQty);
                                 continue;
@@ -799,7 +801,8 @@ $(document).ready(() => {
                             }
                             if (colSetting.field === 'sgfh_qty' || colSetting.field === 'sgfh_tp' ||
                                 colSetting.field === 'sjcl_qty' || colSetting.field === 'sjcl_tp' ||
-                                colSetting.field === 'qtcl_qty' || colSetting.field === 'qtcl_tp') {
+                                colSetting.field === 'qtcl_qty' || colSetting.field === 'qtcl_tp' ||
+                                colSetting.field === 'ex_qty1' || colSetting.field === 'ex_tp1') {
                                 toastMessageUniq(hint.posQty);
                                 continue;
                             }
@@ -933,9 +936,9 @@ $(document).ready(() => {
                     info.sheet.getCell(info.row, info.col).text(node[exprInfo.expr]);
                 }
             }
+            const posRange = pos.getLedgerPos(node.id);
             switch (col.field) {
                 case 'code':
-                    const posRange = pos.getLedgerPos(node.id);
                     info.cancel = posRange && posRange.length > 0;
                     break;
                 case 'unit_price':
@@ -949,7 +952,9 @@ $(document).ready(() => {
                 case 'qtcl_tp':
                 case 'deal_qty':
                 case 'deal_tp':
-                    info.cancel = (node.children && node.children.length > 0) || node.settle_status === settleStatus.finish;
+                case 'ex_qty1':
+                case 'ex_tp1':
+                    info.cancel = (node.children && node.children.length > 0) || node.settle_status === settleStatus.finish || (posRange && posRange.length > 0);
                     break;
                 case 'dgn_qty1':
                 case 'dgn_qty2':
@@ -983,7 +988,8 @@ $(document).ready(() => {
                         const col = sheet.zh_setting.cols[iCol];
                         if (col.field === 'b_code' || col.field === 'sgfh_qty' || col.field === 'sgfh_tp' ||
                             col.field === 'sjcl_qty' || col.field === 'sjcl_tp' ||
-                            col.field === 'qtcl_qty' || col.field === 'qtcl_tp') {
+                            col.field === 'qtcl_qty' || col.field === 'qtcl_tp' ||
+                            col.field === 'ex_qty1' || col.field === 'ex_tp1') {
                             const lPos = pos.getLedgerPos(node.id);
                             if (lPos && lPos.length > 0) {
                                 toastr.error('不可剪切');

app/public/report/js/rpt_signature.js

@@ -1517,7 +1517,7 @@ function resetStampSignature(pageData, roleRelList, checkAudit = false, stg_audi
                                                 style: sCell.style,
                                                 path: stampPath,
                                                 isStamp: true,
-                                                maxRect,
+                                                maxRect: JSON.parse(JSON.stringify(maxRect)),
                                                 orgArea: JSON.parse(JSON.stringify(sCell.area)),
                                                 area: signatureArea || {Left: sCell.area.Left, Right: sCell.area.Right, Top: sCell.area.Top, Bottom: sCell.area.Bottom},
                                                 signatureName: role_rel.signature_name, // 节点名称

app/service/change_audit_list.js

@@ -1007,8 +1007,9 @@ module.exports = app => {
                             info.sjcl_qty = this.ctx.helper.add(info.sjcl_qty, data.sjcl_qty);
                             info.qtcl_qty = this.ctx.helper.add(info.qtcl_qty, data.qtcl_qty);
                             info.quantity = this.ctx.helper.add(info.quantity, data.quantity);
+                            info.ex_qty1 = this.ctx.helper.add(info.ex_qty1, data.ex_qty1);
                         } else {
-                            needUpdateLedgerList.push({ id: data.lid, sgfh_qty: data.sgfh_qty, sjcl_qty: data.sjcl_qty, qtcl_qty: data.qtcl_qty, quantity: data.quantity });
+                            needUpdateLedgerList.push({ id: data.lid, sgfh_qty: data.sgfh_qty, sjcl_qty: data.sjcl_qty, qtcl_qty: data.qtcl_qty, quantity: data.quantity, ex_qty1: data.ex_qty1 });
                         }
                     } else {
                         const info = this._.find(needUpdateChangeLedgerList, { id: data.lid });
@@ -1017,8 +1018,9 @@ module.exports = app => {
                             info.sjcl_qty = this.ctx.helper.add(info.sjcl_qty, data.sjcl_qty);
                             info.qtcl_qty = this.ctx.helper.add(info.qtcl_qty, data.qtcl_qty);
                             info.quantity = this.ctx.helper.add(info.quantity, data.quantity);
+                            info.ex_qty1 = this.ctx.helper.add(info.ex_qty1, data.ex_qty1);
                         } else {
-                            needUpdateChangeLedgerList.push({ id: data.lid, sgfh_qty: data.sgfh_qty, sjcl_qty: data.sjcl_qty, qtcl_qty: data.qtcl_qty, quantity: data.quantity });
+                            needUpdateChangeLedgerList.push({ id: data.lid, sgfh_qty: data.sgfh_qty, sjcl_qty: data.sjcl_qty, qtcl_qty: data.qtcl_qty, quantity: data.quantity, ex_qty1: data.ex_qty1 });
                         }
                     }
                 }
@@ -1034,6 +1036,8 @@ module.exports = app => {
                         now.sjcl_tp = this.ctx.helper.mul(now.sjcl_qty, now.unit_price, tpDecimal);
                         now.qtcl_tp = this.ctx.helper.mul(now.qtcl_qty, now.unit_price, tpDecimal);
                         now.total_price = this.ctx.helper.mul(now.quantity, now.unit_price, tpDecimal);
+                        now.ex_qty1 = nucl.ex_qty1;
+                        now.ex_tp1 = this.ctx.helper.mul(now.ex_qty1, now.unit_price, tpDecimal);
                     }
                 }
                 // 更新到ledger上
@@ -1048,6 +1052,8 @@ module.exports = app => {
                         ledgerInfo.sjcl_tp = this.ctx.helper.mul(ledgerInfo.sjcl_qty, ledgerInfo.unit_price, tpDecimal);
                         ledgerInfo.qtcl_tp = this.ctx.helper.mul(ledgerInfo.qtcl_qty, ledgerInfo.unit_price, tpDecimal);
                         ledgerInfo.total_price = this.ctx.helper.mul(ledgerInfo.quantity, ledgerInfo.unit_price, tpDecimal);
+                        ledgerInfo.ex_qty1 = this.ctx.helper.add(ledgerInfo.ex_qty1, nul.ex_qty1);
+                        ledgerInfo.ex_tp1 = this.ctx.helper.mul(ledgerInfo.ex_qty1, ledgerInfo.unit_price, tpDecimal);
                         await transaction.update(this.ctx.service.ledger.tableName, ledgerInfo);
                     }
                 }
@@ -1093,6 +1099,7 @@ module.exports = app => {
                         l.sgfh_qty, l.sgfh_tp, l.sjcl_qty, l.sjcl_tp, l.qtcl_qty, l.qtcl_tp, l.node_type, l.crid, l.ccid,
                         l.tender_id, l.sgfh_expr, l.sjcl_expr, l.qtcl_expr, l.check_calc,
                         l.ex_memo1, l.ex_memo2, l.ex_memo3,
+                        l.ex_qty1, l.ex_tp1,
                     ];
                     insertLedgerArr.push('(' + this.ctx.helper.getInArrStrSqlFilter(insertL) + ')');
                     await transaction.delete(this.ctx.service.changeLedger.tableName, { id: l.id });
@@ -1105,7 +1112,7 @@ module.exports = app => {
                     '     quantity, total_price, unit_price, drawing_code, memo, features, dgn_qty1, dgn_qty2, deal_qty, deal_tp,' +
                     '     sgfh_qty, sgfh_tp, sjcl_qty, sjcl_tp, qtcl_qty, qtcl_tp, node_type, crid, ccid, tender_id,' +
                     '     sgfh_expr, sjcl_expr, qtcl_expr, check_calc,' +
-                    '     ex_memo1, ex_memo2, ex_memo3) VALUES ' + insertLedgerArr.join(',') + ';';
+                    '     ex_memo1, ex_memo2, ex_memo3, ex_qty1, ex_tp1) VALUES ' + insertLedgerArr.join(',') + ';';
                 await transaction.query(bSql, []);
             }
             if (posList.length > 0) {
@@ -1115,7 +1122,7 @@ module.exports = app => {
                         p.id, p.tid, p.lid, p.name, p.drawing_code, p.quantity, p.add_stage, p.add_stage_order, p.add_times,
                         p.add_user, p.sgfh_qty, p.sjcl_qty, p.qtcl_qty, p.crid, p.ccid, p.porder, p.position,
                         p.sgfh_expr, p.sjcl_expr, p.qtcl_expr, p.real_qty,
-                        p.ex_memo1, p.ex_memo2, p.ex_memo3,
+                        p.ex_memo1, p.ex_memo2, p.ex_memo3, p.ex_qty1,
                     ];
                     insertPosArr.push('(' + this.ctx.helper.getInArrStrSqlFilter(insertp) + ')');
                     await transaction.delete(this.ctx.service.changePos.tableName, { id: p.id });
@@ -1128,7 +1135,7 @@ module.exports = app => {
                     '  (id, tid, lid, name, drawing_code, quantity, add_stage, add_stage_order, add_times, add_user,' +
                     '     sgfh_qty, sjcl_qty, qtcl_qty, crid, ccid, porder, position, ' +
                     '     sgfh_expr, sjcl_expr, qtcl_expr, real_qty,' +
-                    '     ex_memo1, ex_memo2, ex_memo3)  VALUES ' + insertPosArr.join(',') + ';';
+                    '     ex_memo1, ex_memo2, ex_memo3, ex_qty1)  VALUES ' + insertPosArr.join(',') + ';';
                 await transaction.query(pSql, []);
             }
         }

app/service/change_pos.js

@@ -30,7 +30,7 @@ module.exports = app => {
                 columns: ['id', 'tid', 'lid', 'name', 'quantity', 'position', 'drawing_code', 'sgfh_qty', 'sjcl_qty',
                     'qtcl_qty', 'in_time', 'porder', 'add_stage', 'sgfh_expr', 'sjcl_expr', 'qtcl_expr', 'real_qty',
                     'dagl_status', 'dagl_url', 'gxby_status', 'gxby_limit', 'dagl_limit', 'dagl_status',
-                    'ex_memo1', 'ex_memo2', 'ex_memo3', 'ccid', 'formc'],
+                    'ex_memo1', 'ex_memo2', 'ex_memo3', 'ccid', 'formc', 'ex_qty1'],
                 order: [['porder', 'ASC']],
             });
         }
@@ -77,7 +77,7 @@ module.exports = app => {
         }
 
         async updatePos(tid, data) {
-            if (data.sgfh_qty !== undefined || data.sjcl_qty !== undefined || data.qtcl_qty !== undefined) {
+            if (data.sgfh_qty !== undefined || data.sjcl_qty !== undefined || data.qtcl_qty !== undefined || data.ex_qty1 !== undefined) {
                 const op = await this.getDataById(data.id);
                 let bills = await this.ctx.service.changeLedger.getDataById(op.lid);
                 let newBills = false;
@@ -107,6 +107,11 @@ module.exports = app => {
                     data.qtcl_qty = op.qtcl_qty;
                 }
                 data.quantity = this.ctx.helper.sum([data.sgfh_qty, data.qtcl_qty, data.sjcl_qty]);
+                if (data.ex_qty1 !== undefined) {
+                    data.ex_qty1 = this.round(data.ex_qty1, precision.value);
+                } else if (op) {
+                    data.ex_qty1 = op.ex_qty1;
+                }
 
                 const updateBills = { id: bills.id };
                 for (const bp of billsPos) {
@@ -115,12 +120,14 @@ module.exports = app => {
                     updateBills.sjcl_qty = this.ctx.helper.add(updateBills.sjcl_qty, calcData.sjcl_qty);
                     updateBills.qtcl_qty = this.ctx.helper.add(updateBills.qtcl_qty, calcData.qtcl_qty);
                     updateBills.quantity = this.ctx.helper.add(updateBills.quantity, calcData.quantity);
+                    updateBills.ex_qty1 = this.ctx.helper.add(updateBills.ex_qty1, calcData.ex_qty1);
                 }
                 const info = this.ctx.tender.info;
                 updateBills.sgfh_tp = this.ctx.helper.mul(updateBills.sgfh_qty, bills.unit_price, info.decimal.tp);
                 updateBills.sjcl_tp = this.ctx.helper.mul(updateBills.sjcl_qty, bills.unit_price, info.decimal.tp);
                 updateBills.qtcl_tp = this.ctx.helper.mul(updateBills.qtcl_qty, bills.unit_price, info.decimal.tp);
                 updateBills.total_price = this.ctx.helper.mul(updateBills.quantity, bills.unit_price, info.decimal.tp);
+                updateBills.ex_tp1 = this.ctx.helper.mul(updateBills.ex_qty1, bills.unit_price, info.decimal.tp);
                 const transaction = await this.db.beginTransaction();
                 try {
                     await transaction.update(this.tableName, data);
@@ -167,7 +174,7 @@ module.exports = app => {
             const precision = this.ctx.helper.findPrecision(this.ctx.tender.info.precision, bills.unit);
             let needUpdateBills;
             for (const d of data) {
-                if (d.sgfh_qty !== undefined || d.sjcl_qty !== undefined || d.qtcl_qty !== undefined) {
+                if (d.sgfh_qty !== undefined || d.sjcl_qty !== undefined || d.qtcl_qty !== undefined || d.ex_qty1 !== undefined) {
                     if (d.sgfh_qty !== undefined) {
                         d.sgfh_qty = this.round(d.sgfh_qty, precision.value);
                     } else if (op) {
@@ -184,6 +191,11 @@ module.exports = app => {
                         d.qtcl_qty = op.qtcl_qty;
                     }
                     d.quantity = this.ctx.helper.sum([d.sgfh_qty, d.qtcl_qty, d.sjcl_qty]);
+                    if (d.ex_qty1 !== undefined) {
+                        d.ex_qty1 = this.round(d.ex_qty1, precision.value);
+                    } else if (op) {
+                        d.ex_qty1 = op.ex_qty1;
+                    }
                     needUpdateBills = true;
                 }
             }
@@ -203,12 +215,16 @@ module.exports = app => {
                     updateBills.quantity = newPos && newPos.quantity !== undefined
                         ? this.ctx.helper.add(updateBills.quantity, newPos.quantity)
                         : this.ctx.helper.add(updateBills.quantity, bp.quantity);
+                    updateBills.ex_qty1 = newPos && newPos.ex_qty1 !== undefined
+                        ? this.ctx.helper.add(updateBills.ex_qty1, newPos.ex_qty1)
+                        : this.ctx.helper.add(updateBills.ex_qty1, bp.ex_qty1);
                 }
                 const info = this.ctx.tender.info;
                 updateBills.sgfh_tp = this.ctx.helper.mul(updateBills.sgfh_qty, bills.unit_price, info.decimal.tp);
                 updateBills.sjcl_tp = this.ctx.helper.mul(updateBills.sjcl_qty, bills.unit_price, info.decimal.tp);
                 updateBills.qtcl_tp = this.ctx.helper.mul(updateBills.qtcl_qty, bills.unit_price, info.decimal.tp);
                 updateBills.total_price = this.ctx.helper.mul(updateBills.quantity, bills.unit_price, info.decimal.tp);
+                updateBills.ex_tp1 = this.ctx.helper.mul(updateBills.ex_qty1, bills.unit_price, info.decimal.tp);
             }
 
             const transaction = await this.db.beginTransaction();
@@ -254,19 +270,21 @@ module.exports = app => {
             }
             // const bills = await this.ctx.service.reviseBills.getDataById(pos[0].lid);
             // const billsPos = await this.getAllDataByCondition({ where: {tid: tid, lid: bills.id} });
-            const updateBills = {id: bills.id, sgfh_qty: null, sjcl_qty: null, qtcl_qty: null, quantity: null};
+            const updateBills = {id: bills.id, sgfh_qty: 0, sjcl_qty: 0, qtcl_qty: 0, quantity: 0, ex_qty1: 0};
             for (const bp of billsPos) {
                 if (data.indexOf(bp.id) >= 0) continue;
                 updateBills.sgfh_qty = this.ctx.helper.add(updateBills.sgfh_qty, bp.sgfh_qty);
                 updateBills.sjcl_qty = this.ctx.helper.add(updateBills.sjcl_qty, bp.sjcl_qty);
                 updateBills.qtcl_qty = this.ctx.helper.add(updateBills.qtcl_qty, bp.qtcl_qty);
                 updateBills.quantity = this.ctx.helper.add(updateBills.quantity, bp.quantity);
+                updateBills.ex_qty1 = this.ctx.helper.add(updateBills.ex_qty1, bp.ex_qty1);
             }
             const info = this.ctx.tender.info;
             updateBills.sgfh_tp = this.ctx.helper.mul(updateBills.sgfh_qty, bills.unit_price, info.decimal.tp);
             updateBills.sjcl_tp = this.ctx.helper.mul(updateBills.sjcl_qty, bills.unit_price, info.decimal.tp);
             updateBills.qtcl_tp = this.ctx.helper.mul(updateBills.qtcl_qty, bills.unit_price, info.decimal.tp);
             updateBills.total_price = this.ctx.helper.mul(updateBills.quantity, bills.unit_price, info.decimal.tp);
+            updateBills.ex_tp1 = this.ctx.helper.mul(updateBills.ex_qty1, bills.unit_price, info.decimal.tp);
 
             const transaction = await this.db.beginTransaction();
             try {
@@ -332,12 +350,13 @@ module.exports = app => {
                 updateBills.sjcl_qty = this.ctx.helper.add(updateBills.sjcl_qty, bp.sjcl_qty);
                 updateBills.qtcl_qty = this.ctx.helper.add(updateBills.qtcl_qty, bp.qtcl_qty);
                 updateBills.quantity = this.ctx.helper.add(updateBills.quantity, bp.quantity);
+                updateBills.ex_qty1 = this.ctx.helper.add(updateBills.ex_qty1, bp.ex_qty1);
             }
 
             try {
                 for (const d of data) {
                     const op = d.id ? this._.find(orgPos, { id: d.id }) : null;
-                    if (d.sgfh_qty !== undefined || d.sjcl_qty !== undefined || d.qtcl_qty !== undefined) {
+                    if (d.sgfh_qty !== undefined || d.sjcl_qty !== undefined || d.qtcl_qty !== undefined || d.ex_qty1 !== undefined) {
                         if (d.sgfh_qty !== undefined) {
                             d.sgfh_qty = this.round(d.sgfh_qty, precision.value);
                         } else if (op) {
@@ -358,6 +377,12 @@ module.exports = app => {
                         updateBills.qtcl_qty = this.ctx.helper.add(updateBills.qtcl_qty, d.qtcl_qty);
                         d.quantity = this.ctx.helper.sum([d.sgfh_qty, d.qtcl_qty, d.sjcl_qty]);
                         updateBills.quantity = this.ctx.helper.add(updateBills.quantity, d.quantity);
+                        if (d.ex_qty1) {
+                            d.ex_qty1 = this.round(d.ex_qty1, precision.value);
+                        } else if (op) {
+                            d.ex_qty1 = op.ex_qty1;
+                        }
+                        updateBills.ex_qty1 = this.ctx.helper.add(updateBills.ex_qty1, d.ex_qty1);
                         needUpdateBills = true;
                     }
                     if (d.id) {
@@ -373,6 +398,7 @@ module.exports = app => {
                     updateBills.sjcl_tp = this.ctx.helper.mul(updateBills.sjcl_qty, bills.unit_price, info.decimal.tp);
                     updateBills.qtcl_tp = this.ctx.helper.mul(updateBills.qtcl_qty, bills.unit_price, info.decimal.tp);
                     updateBills.total_price = this.ctx.helper.mul(updateBills.quantity, bills.unit_price, info.decimal.tp);
+                    updateBills.ex_tp1 = this.ctx.helper.mul(updateBills.ex_qty1, bills.unit_price, info.decimal.tp);
                     if (newBills) {
                         const newUpdateBills = this._.cloneDeep(updateBills);
                         delete newUpdateBills.cid;

app/service/financial_pay_tender_audit.js

@@ -89,7 +89,7 @@ module.exports = app => {
                                 fund_pay_permission: subProjPermission.fund_pay_permission.push(1).join(','),
                             };
                             if (!financialPermission.transfer_show) {
-                                upPermission.fund_tran_permission = subProjPermission.fund_trans_permission.push(1).join(',');
+                                upPermission.fund_trans_permission = subProjPermission.fund_trans_permission.push(1).join(',');
                             }
                             updateSubProjPermissionData.push(upPermission);
                         }
@@ -203,7 +203,7 @@ module.exports = app => {
                             };
                             if (!financialPermission.transfer_show) {
                                 fAudit.fund_trans_permission.push(1);
-                                upPermission.fund_tran_permission = fAudit.fund_trans_permission.join(',');
+                                upPermission.fund_trans_permission = fAudit.fund_trans_permission.join(',');
                             }
                             await transaction.update(this.ctx.service.subProjPermission.tableName, upPermission);
                         }

app/view/budget/sub_menu_list.ejs

@@ -5,6 +5,6 @@
 <nav-menu title="施工图预算" url="/sp/<%= ctx.subProject.id %>/budget/yu" ml="3" active="<%= ctx.url.indexOf('/yu') %>"></nav-menu>
 <nav-menu title="招标预算" url="/sp/<%= ctx.subProject.id %>/budget/zb" ml="3" active="<%= ctx.url.indexOf('/zb') %>"></nav-menu>
 <!--<nav-menu title="输出报表" url="/sp/<%= ctx.subProject.id %>/budget/report" ml="3" active="<%= ctx.url.indexOf('/report') %>"></nav-menu>-->
-<% if (!ctx.budget.readOnly && ctx.url.indexOf('/compare') === -1 && ctx.url !== '/budget/' + ctx.budget.id) { %>
+<% if (!ctx.budget.readOnly && (ctx.url.indexOf('/gu') > 0 || ctx.url.indexOf('/gai') > 0 || ctx.url.indexOf('/yu') > 0 || ctx.url.indexOf('/zb') > 0)) { %>
 <div class="contarl-box"><button class="btn btn-primary btn-sm btn-block" data-toggle="modal" data-target="#budget-set">设置</button></div>
 <% } %>

config/menu.js

@@ -117,6 +117,7 @@ const menu = {
         children: null,
         caption: '资料归集',
         controller: 'file',
+        controllers: ['file', 'fm'],
     },
     budget: {
         name: '动态投资',

sql/update.sql

@@ -1,6 +1,6 @@
 -- 请按如下分类提交sql！！！
+-- Version V3.5.48.0401
+-- uat 2025-4-1
 -- prod todo
 
 ------------------------------------
@@ -2101,6 +2101,9 @@ ADD COLUMN `ex_stage_qty1` decimal(24, 8) NOT NULL DEFAULT 0 COMMENT '数量1' A
 ALTER TABLE `zh_stage_pos_final_99`
 ADD COLUMN `ex_stage_qty1` decimal(24, 8) NOT NULL DEFAULT 0 COMMENT '数量1' AFTER `negative_qc_qty`;
 
+ALTER TABLE `zh_project_col_set`
+MODIFY COLUMN `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT FIRST;
+
 ------------------------------------
 -- 表数据
 ------------------------------------