Преглед изворни кода

1. 样式调整
2. 无用的修改2
3. 删除部位明细,计算问题

MaiXinRong пре 5 година
родитељ
комит
ab7113de0f

+ 1 - 1
app/service/pos.js

@@ -235,7 +235,7 @@ module.exports = app => {
             const pos = await this.getPosData({tid: tid, id: data});
             const bills = await this.ctx.service.ledger.getDataById(pos[0].lid);
             const billsPos = await this.getAllDataByCondition({ where: {lid: bills.id} });
-            const updateBills = {id: bills.id};
+            const updateBills = {id: bills.id, sgfh_qty: null, sjcl_qty: null, qtcl_qty: null, quantity: null};
             for (const bp of billsPos) {
                 if (data.indexOf(bp.id) >= 0) continue;
                 updateBills.sgfh_qty = this.ctx.helper.add(updateBills.sgfh_qty, bp.sgfh_qty);

+ 1 - 1
app/service/revise_pos.js

@@ -245,7 +245,7 @@ module.exports = app => {
             const pos = await this.getPosData({tid: tid, id: data});
             const bills = await this.ctx.service.reviseBills.getDataById(pos[0].lid);
             const billsPos = await this.getAllDataByCondition({ where: {lid: bills.id} });
-            const updateBills = {id: bills.id};
+            const updateBills = {id: bills.id, sgfh_qty: null, sjcl_qty: null, qtcl_qty: null, quantity: null};
             for (const bp of billsPos) {
                 if (data.indexOf(bp.id) >= 0) continue;
                 updateBills.sgfh_qty = this.ctx.helper.add(updateBills.sgfh_qty, bp.sgfh_qty);

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

@@ -16,7 +16,7 @@
             </div>
             <% if (tender.user_id === uid) { %>
             <div class="ml-auto">
-                <a href="#add-bj" data-toggle="modal" data-target="#add-bj" class="btn btn-sm btn-primary pull-right">新建变更令</a>
+                <a href="#add-bj" data-toggle="modal" data-target="#add-bj" class="btn btn-sm btn-primary pull-right ml-1">新建变更令</a>
                 <a href="#setting" data-toggle="modal" data-target="#setting" class="btn btn-sm btn-outline-primary pull-right ml-1"><i class="fa fa-cog"></i></a>
             </div>
             <% } %>

+ 1 - 5
app/view/change/info.ejs

@@ -131,12 +131,8 @@
                     <div class="d-inline-block">
                         <a href="javascript:void(0);" class="btn btn-sm btn-light text-primary" id="add-white-btn" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> 添加空白清单</a>
                     </div>
-                    <% } else { %>
-                    <div class="d-inline-block">
-                        <h2 class="change-title">变更清单</h2>
-                    </div>
                     <% } %>
-                    <div class="d-inline-block ml-3">
+                    <div class="d-inline-block">
                         <div class="custom-control custom-checkbox" style="line-height: normal;">
                             <input type="checkbox" class="custom-control-input change-detail-checkbox" id="customCheck1" checked>
                             <label class="custom-control-label" for="customCheck1">变更详情</label>

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

@@ -13,7 +13,7 @@
                     </div>
                 </div>
             </div>
-            <div>
+            <div class="ml-1">
                 <% if (addValid) { %>
                 <div class="d-inline-block">
                     <a href="#add-bg" data-toggle="modal" data-target="#add-bg" class="btn btn-primary btn-sm pull-right">新建修订</a>

+ 2 - 2
app/view/stage/detail.ejs

@@ -103,7 +103,7 @@
                             <div class="sjs-bottom">
                                 <ul class="nav nav-tabs">
                                     <li class="nav-item">
-                                        <a class="nav-link active">部位明细</a>
+                                        <a class="nav-link active">计量单元</a>
                                     </li>
                                 </ul>
                                 <div class="tab-content">
@@ -111,7 +111,7 @@
                                         <div class="sjs-bottom-2">
                                             <table class="table table-sm table-bordered">
                                                 <thead>
-                                                <tr><th>部位</th><th>台帐数量</th><th>本期计量数量</th></tr>
+                                                <tr><th>名称</th><th>台帐数量</th><th>本期计量数量</th></tr>
                                                 </thead>
                                                 <tbody id="pos-list">
                                                 <tr><td>0#桥台1#桩</td><td>126</td><td>40</td></tr>