Sfoglia il codice sorgente

部分界面修改

MaiXinRong 1 giorno fa
parent
commit
01e261ee8c

+ 1 - 0
app/public/js/cost_stage_ledger.js

@@ -343,6 +343,7 @@ $(document).ready(function() {
                             sheet.setSelection(tree.nodes.indexOf(refreshData.create[0]), sel.col, sel.rowCount, sel.colCount);
                             SpreadJsObj.reloadRowsBackColor(sheet, [sel.row, tree.nodes.indexOf(refreshData.create[0])]);
                         }
+                        detailObj.loadDetailData(SpreadJsObj.getSelectObject(sheet));
                     }
                     self.refreshOperationValid();
                 });

+ 1 - 1
app/service/cost_stage_detail.js

@@ -284,7 +284,7 @@ module.exports = app => {
             const usedFilter = !used || used === '全部' ? '' : this.db.format(` AND cp.used = ?`, [used]);
             const paySql = `SELECT cp.*, c.c_code, c.name, c.party_b, c.tax FROM ${this.ctx.service.contractPay.tableName} cp LEFT JOIN ${this.ctx.service.contract.tableName} c ON cp.cid = c.id ` +
                            `    WHERE cp.cid IN(${ids.map(x => { return `'${x}'`}).join(', ')}) AND cp.pay_time >= ? AND cp.pay_time <= ?` + usedFilter +
-                           '    ORDER BY c.code asc';
+                           '    ORDER BY c.c_code ASC';
             const validPays = (ids && ids.length > 0) ? await this.db.query(paySql, [beginTime, endTime]) : [];
 
             const insertDetails = [];

+ 1 - 1
app/view/cost/ledger_menu_list.ejs

@@ -1,3 +1,3 @@
 <nav-menu title="返回" url="/sp/<%= ctx.subProject.id %>/cost/tender/<%- ctx.tender.id %>/ledger" tclass="text-primary" ml="1" icon="fa-chevron-left"></nav-menu>
-<nav-menu title="成本审" url="/sp/<%= ctx.subProject.id %>/cost/tender/<%- ctx.tender.id %>/ledger/<%- ctx.costStage.stage_order %>/stage" ml="3" active="<%= (ctx.url.indexOf('ledger') >= 0 ? 1 : -1) %>"></nav-menu>
+<nav-menu title="成本审" url="/sp/<%= ctx.subProject.id %>/cost/tender/<%- ctx.tender.id %>/ledger/<%- ctx.costStage.stage_order %>/stage" ml="3" active="<%= (ctx.url.indexOf('ledger') >= 0 ? 1 : -1) %>"></nav-menu>
 <% include ./audit_btn.ejs %>