不计价相关调整

app/controller/stage_controller.js

@@ -583,12 +583,12 @@ module.exports = app => {
                 }
                 let result;
                 if (data.target.pos) {
-                    result = await ctx.service.stageChange.posChange(data.target.pos, data.target.minus, data.change);
+                    result = await ctx.service.stageChange.posChange(data.target.pos, data.target.noValue, data.change);
                     result.change = { target: { lid: data.target.pos.lid, pid: data.target.pos.id } };
                     result.change.data = await ctx.service.stageChange.getLastestStageData(ctx.tender.id,
                         ctx.stage.id, data.target.pos.lid, data.target.pos.id);
                 } else {
-                    result = await ctx.service.stageChange.billsChange(data.target.bills, data.target.minus, data.change);
+                    result = await ctx.service.stageChange.billsChange(data.target.bills, data.target.noValue, data.change);
                     result.change = { target: { lid: data.target.bills.id, pid: '-1' } };
                     result.change.data = await ctx.service.stageChange.getLastestStageData(ctx.tender.id,
                         ctx.stage.id, data.target.bills.id, '-1');

app/service/change.js

@@ -1243,7 +1243,7 @@ module.exports = app => {
          * @param pos - 查询的部位
          * @return {Promise<*>} - 可用的变更令列表
          */
-        async getValidChanges(tender, stage, data, minusNoValue) {
+        async getValidChanges(tender, stage, data, noValue) {
             const bills = data.bills, pos = data.pos;
             const self = this;
             const getFilterPart = function(field, value) {
@@ -1258,8 +1258,8 @@ module.exports = app => {
             // if (data.pos) filter = filter + ' And ' + getFilterPart('cb.bwmx', pos.name);
             const sql =
                 'SELECT c.cid, c.code, c.name, c.w_code, c.p_code, c.peg, c.org_name, c.org_code, c.new_name, c.new_code,' +
-                '    c.content, c.basis, c.memo, c.type, c.class, c.quality, c.company, c.charge, ' +
-                '    cb.id As cbid, cb.code As b_code, cb.name As b_name, cb.unit As b_unit, cb.samount As b_amount, cb.detail As b_detail, cb.bwmx As b_bwmx, cb.gcl_id, ' +
+                '    c.content, c.basis, c.memo, c.type, c.class, c.quality, c.company, c.charge,' +
+                '    cb.id As cbid, cb.code As b_code, cb.name As b_name, cb.unit As b_unit, cb.samount As b_amount, cb.detail As b_detail, cb.bwmx As b_bwmx, cb.gcl_id, cb.is_valuation, cb.delimit' +
                 '    scb.used_amount' +
                 '  FROM ' + this.tableName + ' As c ' +
                 '  Left Join ' + this.ctx.service.changeAuditList.tableName + ' As cb On c.cid = cb.cid ' +
@@ -1273,16 +1273,14 @@ module.exports = app => {
                 '  ORDER BY c.in_time';
             const sqlParam = [tender.id, stage.order, tender.id, audit.flow.status.checked];
             let changes = await this.db.query(sql, sqlParam);
-            if (minusNoValue) {
-                if (data.minus) {
+            if (noValue) {
+                if (data.noValue) {
                     changes = changes.filter(c => {
-                        c.bamount = c.b_amount ? parseFloat(c.b_amount) : 0;
-                        return c.bamount < 0;
+                        return !c.is_valuation;
                     });
                 } else {
                     changes = changes.filter(c => {
-                        c.bamount = c.b_amount ? parseFloat(c.b_amount) : 0;
-                        return c.bamount >= 0;
+                        return c.is_valuation;
                     });
                 }
             }

app/view/setting/fun.ejs

@@ -42,19 +42,12 @@
                                                 </div>
                                                 <div class="alert-warning p-1"><i class="fa Example of exclamation-circle fa-exclamation-circle "></i> 变更令开始调用后，负变更清单必须在本期全部调用</div>
                                             </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="card mb-3">
-                            <div class="card-body">
-                                <h5 class="card-title">负变更</h5>
-                                <div class="form-group mb-4">
-                                    <div>
-                                        <div class="form-check form-check-inline">
-                                            <input class="form-check-input" type="checkbox" id="minusNoValue" name="minusNoValue" <% if (funRela.minusNoValue) { %>checked<% } %> onchange="updateSetting();">
-                                            <label class="form-check-label" for="minusNoValue">计量不计价</label>
+                                            <div>
+                                                <div class="form-check form-check-inline">
+                                                    <input class="form-check-input" type="checkbox" id="minusNoValue" name="minusNoValue" <% if (funRela.minusNoValue) { %>checked<% } %> onchange="updateSetting();">
+                                                    <label class="form-check-label" for="minusNoValue">计量不计价</label>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>

app/view/tender/detail_modal.ejs

@@ -1914,7 +1914,7 @@
                 <div class="form-group">
                     <div class="custom-control custom-checkbox mb-2">
                         <input type="checkbox" class="custom-control-input" id="sc_minusNoValue" checked="">
-                        <label class="custom-control-label" for="sc_minusNoValue">计量台账-负变更-计量不计价</label>
+                        <label class="custom-control-label" for="sc_minusNoValue">计量台账-变更-计量不计价</label>
                     </div>
                 </div>
                 <div class="form-group">