1. 查找定位问题

2. 合同支付，新增一期时，不继承上一期输入记录
3. 开放部位台账，下载Excel功能

app/public/js/ledger_search.js

@@ -201,12 +201,12 @@
             SpreadJsObj.loadSheetData(resultSpread.getActiveSheet(), 'data', searchResult);
         };
 
-        $('input', this.obj).bind('keydown', function (e) {
+        $('input', obj).bind('keydown', function (e) {
             if (e.keyCode == 13) searchBills();
         });
-        $('button', this.obj).bind('click', () => {searchBills()});
-        $('#over', this.obj).bind('change', () => {searchOver()});
-        $('#empty', this.obj).bind('change', () => {searchLess()});
+        $('button', obj).bind('click', () => {searchBills()});
+        $('#over', obj).bind('change', () => {searchOver()});
+        $('#empty', obj).bind('change', () => {searchLess()});
         resultSpread.getActiveSheet().bind(spreadNS.Events.CellDoubleClick, function (e, info) {
             const sheet = info.sheet;
             const data = sheet.zh_data;

app/service/stage_pay.js

@@ -99,7 +99,9 @@ module.exports = app => {
                     stagePays.push({
                         tid: p.tid, sid: stage.id, pid: p.id,
                         stimes: stage.times, sorder: 0,
-                        name: pp.name, expr: pp.expr, pause: pp.pause,
+                        name: pp.name,
+                        expr: (p.ptype === payConst.payType.normal || p.ptype === payConst.payType.wc) ? pp.expr : null,
+                        pause: pp.pause,
                         pre_tp: pp.end_tp,
                         pre_used: pp.pre_used || !this.ctx.helper.checkZero(pp.tp),
                         pre_finish: pp.pre_finish || (pp.rprice ? pp.end_tp === pp.rprice : false),

app/view/ledger/bwtz.ejs

@@ -19,11 +19,9 @@
                         </div>
                     </div>
                 </div>
-                <% if (ctx.app.config.is_debug) { %>
                 <div class="d-inline-block ml-3">
                     <a id="exportBwtz" class="btn btn-primary btn-sm" href="javascript: void(0)">导出部位台账Excel</a>
                 </div>
-                <% } %>
             </div>
             <div class="ml-auto">
             </div>

app/view/stage/bwtz.ejs

@@ -32,11 +32,9 @@
                         </div>
                     </div>
                 </div>
-                <% if (ctx.app.config.is_debug) { %>
                 <div class="d-inline-block ml-3">
                     <a id="exportBwtz" class="btn btn-primary btn-sm" href="javascript: void(0)">导出部位台账Excel</a>
                 </div>
-                <% } %>
             </div>
             <div class="ml-auto">
             </div>