MaiXinRong 3 rokov pred
rodič
commit
7b83a1fd4f

+ 2 - 3
app/controller/stage_rela_controller.js

@@ -27,7 +27,6 @@ module.exports = app => {
         }
 
         async _getDefaultRenderData(ctx) {
-            console.log(ctx.stage.id);
             const stageRela = await ctx.service.stageRela.getStageRela(ctx.stage.id);
             return { stageRela };
         }
@@ -51,8 +50,8 @@ module.exports = app => {
                 if (!tid || !sorder) throw '参数错误';
                 const stage = await this.ctx.service.stage.getDataByCondition({ tid, order: sorder});
                 if (!stage) throw '关联标段/期不存在';
-                await this.ctx.service.stageRela.addStageRela(stage);
-                ctx.redirect(ctx.request.header.referer + '/' + tid);
+                const trid = await this.ctx.service.stageRela.addStageRela(stage);
+                ctx.redirect(ctx.request.header.referer + '/detail/' + trid);
             } catch (err) {
                 ctx.log(err);
                 ctx.postError(err, '新增关联失败');

+ 2 - 1
app/service/stage_rela.js

@@ -448,7 +448,7 @@ module.exports = app => {
                     add_time: addTime, update_time: addTime,
                     cache_tp: JSON.stringify(calcModel.cache_tp), cache_org_tp: JSON.stringify(calcModel.cache_org_tp),
                 };
-                await conn.insert(this.tableName, data);
+                const addRela = await conn.insert(this.tableName, data);
                 if (calcModel.stageBills.length > 0) await conn.insert(this.ctx.service.stageRelaBills.tableName, calcModel.stageBills);
                 if (calcModel.stageBillsFinal.length > 0) await conn.insert(this.ctx.service.stageRelaBillsFinal.tableName, calcModel.stageBillsFinal);
                 if (calcModel.stagePos.length > 0) await conn.insert(this.ctx.service.stageRelaPos.tableName, calcModel.stagePos);
@@ -457,6 +457,7 @@ module.exports = app => {
                 if (calcModel.stageImBills.length > 0) await conn.insert(this.ctx.service.stageRelaImBills.tableName, calcModel.stageImBills);
                 await conn.update(this.ctx.service.stage.tableName, { id: this.ctx.stage.id, check_calc: 1 });
                 await conn.commit();
+                return addRela.insertId;
             } catch (err) {
                 await conn.rollback();
                 throw err;

+ 2 - 0
app/view/stage_rela/index.ejs

@@ -27,6 +27,7 @@
                         </thead>
                         <tbody>
                             <% for (const sr of stageRela) { %>
+                            <tr>
                             <td><%- sr.rela_tname %></td>
                             <td>第<%- sr.rela_sorder %>期</td>
                             <td><%- ctx.moment(sr.add_time).format('YYYY-MM-DD HH:mm:ss') %></td>
@@ -43,6 +44,7 @@
                                 <a href="javascript: void(0);" srid="<%- sr.id %>" class="btn btn-danger btn-sm ">删除</a>
                                 <% } %>
                             </td>
+                            </tr>
                             <% } %>
                         </tbody>
                     </table>