Просмотр исходного кода

关联台账,可关联标段筛选调整

MaiXinRong 3 лет назад
Родитель
Сommit
7681e0a51d

+ 1 - 0
app/controller/stage_rela_controller.js

@@ -35,6 +35,7 @@ module.exports = app => {
             try {
                 const renderData = await this._getDefaultRenderData(ctx);
                 renderData.auditConst = auditConst;
+                console.log(auditConst);
                 renderData.jsFiles = this.app.jsFiles.common.concat(this.app.jsFiles.stageRela.info);
                 renderData.History = await ctx.service.stageRela.getHistoryStageRela(this.ctx.stage.tid, this.ctx.stage.sorder);
                 await this.layout('stage_rela/index.ejs', renderData, 'stage_rela/modal.ejs');

+ 1 - 1
app/public/js/sr_info.js

@@ -131,7 +131,7 @@ const AddRela = function (setting) {
             this.tenderSpread.bind(spreadNS.Events.ButtonClicked, tsObj.asButtonClicked);
             this.resultSpread.bind(spreadNS.Events.EditEnded, tsObj.arEditEnded);
 
-            postData('/list/load2', { type: 'stage-checked' }, function (data) {
+            postData('/list/load2', { type: 'stage' }, function (data) {
                 tsObj.tenderSourceTree = Tender2Tree.convert(data.category, data.tenders, data.ledgerAuditConst, data.stageAuditConst);
                 SpreadJsObj.loadSheetData(tsObj.tenderSheet, SpreadJsObj.DataType.Tree, tsObj.tenderSourceTree);
                 SpreadJsObj.loadSheetData(tsObj.resultSheet, SpreadJsObj.DataType.Data, tsObj.trArray);

+ 0 - 2
app/service/stage_rela.js

@@ -74,12 +74,10 @@ class srCache {
 
     async _loadPosData() {
         const pos = await this.ctx.service.pos.getPosData({tid: this.stage.tid});
-        console.log(this.stage);
         const curPosData = await this.ctx.service.stagePos.getLastestStageData2(this.stage.tid, this.stage.id);
         const preStagePos = this.preRelaStage
             ? this.ctx.service.stageRelaPosFinal.getAllDataByCondition({ where: { sid: this.preRelaStage.sid, rela_tid: this.preRelaStage.rela_tid } })
             : [];
-        console.log(curPosData);
         this.ctx.helper.assignRelaData(pos, [
             { data: curPosData, fields: ['contract_qty', 'qc_qty', 'postil', 'pid'], prefix: '', relaId: 'pid' },
             { data: preStagePos, fields: ['contract_qty', 'qc_qty', 'postil', 'pid'], prefix: 'pre_', relaId: 'pid' },

+ 1 - 1
app/view/stage_rela/index.ejs

@@ -33,7 +33,7 @@
                             <td><%- ctx.moment(sr.add_time).format('YYYY-MM-DD HH:mm:ss') %></td>
                             <td><%- (sr.cache_tp.gather_tp ? sr.cache_tp.gather_tp : '') %></td>
                             <td>
-                                <% if (!ctx.stage.readOnly || [auditConst.stauts.uncheck, auditConst.status.checkNo].indexOf(ctx.stage.status) >= 0) { %>
+                                <% if (!ctx.stage.readOnly || [auditConst.status.uncheck, auditConst.status.checkNo].indexOf(ctx.stage.status) >= 0) { %>
                                 <div class="d-inline-block">
                                     <form method="post" action="/tender/<%= ctx.tender.id %>/measure/stage/<%= ctx.stage.order %>/rela/update">
                                         <input type="hidden" name="_csrf_j" value="<%= ctx.csrf %>" />