Pārlūkot izejas kodu

台账修订,台账对比,加载计量数据问题

MaiXinRong 4 gadi atpakaļ
vecāks
revīzija
034183b763

+ 1 - 1
app/controller/revise_controller.js

@@ -966,7 +966,7 @@ module.exports = app => {
             const preStageData = ctx.lastStage.order > 1
             const preStageData = ctx.lastStage.order > 1
                 ? await ctx.service.stagePosFinal.getFinalData(ctx.tender.data, ctx.lastStage.order - 1)
                 ? await ctx.service.stagePosFinal.getFinalData(ctx.tender.data, ctx.lastStage.order - 1)
                 : [];
                 : [];
-            this._loadPreData(curStageData, preStageData, ['contract_qty', 'qc_qty'], 'pre_', 'lid');
+            this._loadPreData(curStageData, preStageData, ['contract_qty', 'qc_qty'], 'pre_', 'pid');
             return curStageData;
             return curStageData;
         }
         }
 
 

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

@@ -454,7 +454,7 @@ $(document).ready(() => {
                 //pos.end_gather_qty = ZhCalc.add(pos.gather_qty, pos.pre_gather_qty);
                 //pos.end_gather_qty = ZhCalc.add(pos.gather_qty, pos.pre_gather_qty);
             }
             }
             posSpreadObj.loadCurPosData();
             posSpreadObj.loadCurPosData();
-            //$('[data-target=#load-stage]').hide();
+            $('#load-stage-btn').hide();
             $('#load-stage').modal('hide');
             $('#load-stage').modal('hide');
         });
         });
     });
     });

+ 3 - 1
app/view/revise/compare.ejs

@@ -28,8 +28,10 @@
                 <span class="ml-2"><i class="fa fa-stop text-success-50 border-success-50 bg-success-50"></i> 文字修改</span>
                 <span class="ml-2"><i class="fa fa-stop text-success-50 border-success-50 bg-success-50"></i> 文字修改</span>
             </div>
             </div>
             <div class="ml-auto">
             <div class="ml-auto">
+                <% if (ctx.app.config.is_debug) { %>
                 <% if (lastStage) { %>
                 <% if (lastStage) { %>
-                <a class="btn btn-sm btn-primary mr-1" href="#load-stage" data-toggle="modal" data-target="#load-stage">加载计量数据</a>
+                <a class="btn btn-sm btn-primary mr-1" id="load-stage-btn" href="#load-stage" data-toggle="modal" data-target="#load-stage">加载计量数据</a>
+                <% } %>
                 <% } %>
                 <% } %>
             </div>
             </div>
         </div>
         </div>