Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/const/spread.js

@@ -124,7 +124,7 @@ const BaseSetCol = {
         { key: 'unit_price', name: '单价', fixed: ['alias'], bills: 1, pos: 0 },
         { key: 'dgn_qty', name: '项目节数量', fixed: [], bills: 1, pos: 0, },
         { key: 'dgn_price', name: '经济指标', fixed: ['alias'], bills: 1, pos: 0},
-        { key: 'deal_calc', name: '签约', fixed: [], bills: 1, pos: 1, },
+        { key: 'deal_calc', name: '签约', fixed: [], bills: 1, pos: 0, },
         { key: 'tz_calc', name: '台账', fixed: ['alias'], bills: 1, pos: 1, },
         { key: 'drawing_code', name: '图册号', fixed: ['alias'], bills: 1, pos: 1 },
         { key: 'node_type', name: '费用类别', fixed: ['alias'], bills: 1, pos: 0 },
@@ -155,7 +155,6 @@ const BaseSetCol = {
         { key: 'memo', name: '备注', fixed: [], bills: 1, pos: 0 },
         { key: 'ex_memo2', name: '备注2', fixed: [], bills: 1, pos: 1, },
         { key: 'ex_memo3', name: '备注3', fixed: [], bills: 1, pos: 1, },
-        { key: 'add_stage_order', name: '添加期数', fixed: [], bills: 1, pos: 1, },
         { key: 'is_tp', name: '总额计量', fixed: [], bills: 1, pos: 0 },
         { key: 'gxby', name: '工序报验', fixed: ['valid', 'alias'], bills: 1, pos: 1, },
         { key: 'dagl', name: '档案管理', fixed: ['valid', 'alias'], bills: 1, pos: 1, },
@@ -171,7 +170,7 @@ const BaseSetCol = {
         { key: 'unit_price', name: '单价', fixed: ['alias'], bills: 1, pos: 0 },
         { key: 'dgn_qty', name: '项目节数量', fixed: [], bills: 1, pos: 0, },
         { key: 'dgn_price', name: '经济指标', fixed: ['alias'], bills: 1, pos: 0},
-        { key: 'deal_calc', name: '签约', fixed: [], bills: 1, pos: 1, },
+        { key: 'deal_calc', name: '签约', fixed: [], bills: 1, pos: 0, },
         { key: 'tz_calc', name: '台账', fixed: ['alias'], bills: 1, pos: 1, },
         { key: 'drawing_code', name: '图册号', fixed: ['alias'], bills: 1, pos: 1 },
         { key: 'node_type', name: '费用类别', fixed: ['alias'], bills: 1, pos: 0 },
@@ -202,7 +201,7 @@ const BaseSetCol = {
         { key: 'memo', name: '备注', fixed: [], bills: 1, pos: 0 },
         { key: 'ex_memo2', name: '备注2', fixed: [], bills: 1, pos: 1, },
         { key: 'ex_memo3', name: '备注3', fixed: [], bills: 1, pos: 1, },
-        { key: 'add_stage_order', name: '添加期数', fixed: [], bills: 1, pos: 1, },
+        { key: 'add_stage_order', name: '添加期数', fixed: [], bills: 0, pos: 1, },
         { key: 'is_tp', name: '总额计量', fixed: [], bills: 1, pos: 0 },
         { key: 'gxby', name: '工序报验', fixed: ['valid', 'alias'], bills: 1, pos: 1, },
         { key: 'dagl', name: '档案管理', fixed: ['valid', 'alias'], bills: 1, pos: 1, },
@@ -752,7 +751,7 @@ const BaseSpreadColSetting = {
             position: [{title: '位置', colSpan: '1', rowSpan: '2', field: 'position', hAlign: 0, width: 60, formatter: '@'}],
             real_qty: [{title: '现场实际数量', colSpan: '1', rowSpan: '2', field: 'real_qty', hAlign: 2, width: 60, type: 'Number'}],
             estimate_qty: [{title: '预计变更数量', colSpan: '1', rowSpan: '2', field: 'estimate_qty', hAlign: 2, width: 60, type: 'Number', readOnly: true}],
-            tz_calc: [{title: '台账数量', colSpan: '1', rowSpan: '2', field: 'sgfh_qty', hAlign: 2, width: 60, formatter: '@', type: 'Number', aliasFormat: '{%s}数量'}],
+            tz_calc: [{title: '台账数量', colSpan: '1', rowSpan: '2', field: 'sgfh_qty', hAlign: 2, width: 60, type: 'Number', aliasFormat: '{%s}数量'}],
             cur_calc: [
                 {title: '本期计量|合同', colSpan: '4|1', rowSpan: '1|1', field: 'contract_qty', hAlign: 2, width: 60, type: 'Number'},
                 {title: '|数量变更', colSpan: '|1', rowSpan: '|1', field: 'qc_qty', hAlign: 2, width: 80, type: 'Number'},

app/controller/revise_controller.js

@@ -588,7 +588,7 @@ module.exports = app => {
 
         }
         async _updatePos(revise, data) {
-            await this.checkMeasureType(measureType.tz.value);
+            // await this.checkMeasureType(measureType.tz.value);
             if (!data.posPostType) throw '数据错误';
             switch (data.posPostType) {
                 case 'add':
@@ -939,7 +939,6 @@ module.exports = app => {
                     ]);
                     return billsData;
                 case 'pos':
-                    if (ctx.tender.data.measure_type === measureType.gcl.value) return [];
                     const posData = ctx.revise.preHis ? await this.ctx.helper.loadLedgerDataFromOss(ctx.revise.preHis.pos_file) : [];
                     const settleStatusPos = ctx.revise.readySettle ? await ctx.service.settlePos.getAllDataByCondition({ where: { settle_id: ctx.revise.readySettle.id }}) : [];
                     this.ctx.helper.assignRelaData(posData, [
@@ -956,7 +955,6 @@ module.exports = app => {
                     ]);
                     return reviseBillsData;
                 case 'revisePos':
-                    if (ctx.tender.data.measure_type === measureType.gcl.value) return [];
                     const revisePosData = ctx.revise.readOnly && ctx.revise.curHis
                         ? await this.ctx.helper.loadLedgerDataFromOss(ctx.revise.curHis.pos_file)
                         : await ctx.service.revisePos.getAllDataByCondition({ where: { tid: ctx.tender.id } });

app/controller/stage_controller.js

@@ -229,7 +229,7 @@ module.exports = app => {
             if (this.ctx.session.sessionProject.dagl) this.ledgerExtraColumn.push('dagl_status', 'dagl_url', 'dagl_limit');
             this.ledgerMemoColumn = ['memo'];
 
-            this.posColumn = ['id', 'tid', 'lid', 'name', 'position', 'porder', 'quantity', 'add_stage_order', 'drawing_code'];
+            this.posColumn = ['id', 'tid', 'lid', 'name', 'position', 'porder', 'sgfh_qty', 'quantity', 'add_stage_order', 'drawing_code'];
             if (tender.info.display.stage.realComplete) this.posColumn.push('real_qty');
 
             this.posExtraColumn = [];

app/lib/dsk.js

@@ -9,6 +9,8 @@
  */
 const crypto = require('crypto');
 const moment = require('moment');
+const jwt = require('jsonwebtoken');
+const privateKey = 'zhzhjwtqwerty';
 class DSK {
 
     /**
@@ -24,7 +26,8 @@ class DSK {
     }
 
     getToken() {
-        return crypto.createHash('md5').update(crypto.createHash('md5').update(this.tokenKey).digest('hex') + moment().format('DD-HH')).digest('hex');
+        // return crypto.createHash('md5').update(crypto.createHash('md5').update(this.tokenKey).digest('hex') + moment().format('DD-HH')).digest('hex');
+        return jwt.sign({ iat: Date.now() }, privateKey);
     }
 
     async sendSms(mobile) {

app/public/js/change_information.js

@@ -3596,6 +3596,7 @@ $(document).ready(() => {
                 };
                 const refreshData = ledgerTree.loadPostData(loadResult);
                 ledgerTreeSpreadObj.refreshTree(ledgerSheet, refreshData);
+                ledgerTreeSpreadObj.loadExprToInput();
             }, function () {
                 select[col.field] = orgValue;
                 if (col.field === 'b_code') {
@@ -4128,6 +4129,7 @@ $(document).ready(() => {
                 };
                 const refreshData = ledgerTree.loadPostData(loadResult);
                 ledgerTreeSpreadObj.refreshTree(ledgerSheet, refreshData);
+                posSpreadObj.loadExprToInput();
             }, function () {
                 select[col.field] = orgValue;
                 cInfo[col.field] = orgValue;
@@ -5499,7 +5501,7 @@ $(document).ready(() => {
             showMode(type);
         });
     });
-
+    let firstLoad = true;
     function showMode(type) {
         if (type === 0) {
             $('.judge-hide').show();
@@ -5518,6 +5520,14 @@ $(document).ready(() => {
         } else {
             $('.judge-hide').attr("style","display:none !important");
             $('.judge-show').show();
+            if (firstLoad) {
+                const [newChangeList, updateOrderList] = changeSpreadObj.makeNewChangeList();
+                if (updateOrderList.length > 0) {
+                    postData(window.location.pathname + '/save', { type:'changeOrder', postData: updateOrderList }, function (result) {
+                    });
+                }
+                firstLoad = false;
+            }
             const {changeLedgers, changePoss} = makeLedgerAndPosData();
             ledgerTree.loadDatas(changeLedgers);
             pos.loadDatas(changePoss);
@@ -6061,7 +6071,105 @@ $(document).ready(() => {
             });
         };
     }
+    // 重新审批获取手机验证码
+    // 获取验证码
+    let isPosting = false;
+    $(".get-code").on('click', function() {
+        if (isPosting) {
+            return false;
+        }
+        const btn = $(this);
+
+        $.ajax({
+            url: '/profile/code?_csrf_j=' + csrf,
+            type: 'post',
+            data: { mobile: authMobile, type: 'shenpi' },
+            dataTye: 'json',
+            error: function() {
+                isPosting = false;
+            },
+            beforeSend: function() {
+                isPosting = true;
+            },
+            success: function(response) {
+                isPosting = false;
+                if (response.err === 0) {
+                    codeSuccess(btn);
+                    $("input[name='code']").removeAttr('readonly');
+                    $("#re-shenpi-btn").removeAttr('disabled');
+                    $("#re-shenpi-btn2").removeAttr('disabled');
+                } else {
+                    toast(response.msg, 'error');
+                }
+            }
+        });
+    });
+
+    if (readOnly && !shenpiPower) {
+        // 记录变更信息操作
+        $('body').on('valuechange', '#w_code', function (e, previous) {
+            const new_w_code = $(this).val();
+            if (new_w_code !== w_code) {
+                $('#show-save-btn').show();
+                $('#sp-btn').hide();
+                $('.title-main').addClass('bg-warning');
+            } else {
+                $('#show-save-btn').hide();
+                $('#sp-btn').show();
+                $('.title-main').removeClass('bg-warning');
+            }
+        });
+
+        // 保存修改ajax提交（不刷新页面）
+        $('.save_change_btn').on('click', function () {
+            const new_w_code = $('#w_code').val();
+            // 后改为br
+            // 更新至服务器
+            postData(window.location.pathname + '/save', { type:'info', updateData: { w_code: new_w_code } }, function (result) {
+                toastr.success(result ? result.msg : '');
+                $('#show-save-btn').hide();
+                $('#sp-btn').show();
+                $('.title-main').removeClass('bg-warning');
+                w_code = new_w_code;
+            });
+            return false;
+        });
+
+        $('#cancel_change').on('click', function () {
+            $('#show-save-btn').hide();
+            $('#sp-btn').show();
+            $('.title-main').removeClass('bg-warning');
+            $('#w_code').val(w_code);
+            // toastr.success('已还原到上次保存状态');
+        });
+    }
 });
+/**
+ * 获取成功后的操作
+ *
+ * @param {Object} btn - 点击的按钮
+ * @return {void}
+ */
+function codeSuccess(btn) {
+    let counter = 60;
+    btn.addClass('disabled').text('重新获取 ' + counter + 'S');
+    btn.parent().siblings('input').removeAttr('readonly').attr('placeholder', '输入短信中的6位验证码');
+    const bindBtn = $("#bind-btn");
+    bindBtn.removeClass('btn-secondary disabled').addClass('btn-primary');
+
+    const countDown = setInterval(function() {
+        const countString = counter - 1 <= 0 ? '' : ' ' + (counter - 1) + 'S';
+        // 倒数结束后
+        if (countString === '') {
+            clearInterval(countDown);
+            btn.removeClass('disabled');
+        }
+        const text = '重新获取' + countString;
+        btn.text(text);
+        counter -= 1;
+    }, 1000);
+}
+
 
 function calcChangePrice() {
     let positive_tp = 0;

app/public/js/phase_pay_detail.js

@@ -612,7 +612,7 @@ $(document).ready(() => {
                         break;
                     case 'tp':
                     case 'is_gather':
-                        info.cancel = select.children && select.children.length > 0;
+                        info.cancel = !payUtils.check.isGatherValid(select);
                         break;
                     case 'start_tp':
                     case 'range_tp':
@@ -823,7 +823,7 @@ $(document).ready(() => {
                 payTree.loadDatas(datas);
                 SpreadJsObj.loadSheetData(sheet, SpreadJsObj.DataType.Tree, payTree);
                 payEvent.refreshActn();
-            }
+            },
         };
         spread.bind(spreadNS.Events.SelectionChanged, payEvent.selectionChanged);
         if (!readOnly) {

app/public/js/project_spread.js

@@ -40,6 +40,7 @@ $(document).ready(() => {
         const data = [];
         colSet.forEach(x => {
             const baseCol = BaseSetCol.find(b => { return x.key === b.key });
+            if (!baseCol) return;
             const colData = { ...x, ...baseCol };
             if (colData.bills && colData.bills_valid === undefined) colData.bills_valid = colData.valid;
             if (colData.pos && colData.pos_valid === undefined) colData.pos_valid = colData.valid;
@@ -112,6 +113,12 @@ $(document).ready(() => {
                 return;
             }
             switch (col.field) {
+                case 'bills_valid':
+                    info.cancel = !node.bills;
+                    break;
+                case 'pos_valid':
+                    info.cancel = !node.pos;
+                    break;
                 case 'alias':
                     info.cancel = node.fixed.indexOf('alias') >= 0;
                     break;
@@ -174,6 +181,8 @@ $(document).ready(() => {
             if (col.field.indexOf('valid') < 0) return;
 
             const node = SpreadJsObj.getSelectObject(info.sheet);
+            if (col.field === 'pos_valid' && !node.pos) return;
+            if (col.field === 'bills_valid' && !node.bills) return;
             if (node.fixed.indexOf('valid') >= 0) return;
             if (col.field === 'valid') {
                 node.valid = !node.valid;
@@ -207,7 +216,6 @@ $(document).ready(() => {
             const baseCol = BaseSetCol.find(x => { return x.key === keyName; });
             if (!baseCol) continue;
 
-            console.log(baseCol);
             const valid = colSheet.getText(iRow, cols.valid);
             const colSet = { key: keyName, valid: valid === '1' || valid === 'TRUE' ? 1 : 0 };
             if (baseCol.bills) {

app/public/js/revise.js

@@ -166,9 +166,6 @@ $(document).ready(() => {
         markExpandKey: 'revise-bills-expand',
         markExpandSubKey: window.location.pathname.split('/')[2],
     };
-    if (!isTz) {
-        treeSetting.calcFields.push('deal_tp');
-    }
     treeSetting.calcFun = function (node) {
         node.dgn_price = ZhCalc.round(ZhCalc.div(node.total_price, node.dgn_qty1), 2);
     };
@@ -542,7 +539,7 @@ $(document).ready(() => {
                     return;
                 }
                 // 台账模式，检查计量单元相关
-                if (isTz) {
+                // if (isTz) {
                     if (col.field === 'sgfh_qty' || col.field === 'sgfh_tp' ||
                         col.field === 'sjcl_qty' || col.field === 'sjcl_tp' ||
                         col.field === 'qtcl_qty' || col.field === 'qtcl_tp') {
@@ -563,7 +560,7 @@ $(document).ready(() => {
                             return;
                         }
                     }
-                }
+                // }
                 if (col.field === 'node_type' && newValue && newValue !== '0' && newValue !== '19') {
                     const sameNodeType = sortData.find(x => { return x.node_type == newValue; });
                     if (sameNodeType) {
@@ -691,10 +688,10 @@ $(document).ready(() => {
                         if (colSetting.field === 'sgfh_qty' || colSetting.field === 'sgfh_tp' ||
                             colSetting.field === 'sjcl_qty' || colSetting.field === 'sjcl_tp' ||
                             colSetting.field === 'qtcl_qty' || colSetting.field === 'qtcl_tp') {
-                            if (isTz) {
+                            // if (isTz) {
                                 toastMessageUniq(hint.posQty);
                                 continue;
-                            }
+                            // }
                         }
                         if (value !== '' && invalidFields.posXmj.indexOf(colSetting.field) >= 0) {
                             toastMessageUniq(hint.posXmj);
@@ -2035,7 +2032,7 @@ $(document).ready(() => {
         }
     };
     posSpread.bind(spreadNS.Events.SelectionChanged, posSpreadObj.selectionChanged);
-    if (!readOnly && isTz) {
+    if (!readOnly) {
         $('a[name="pos-opr"]').click(function () {
             posSpreadObj.baseOpr(posSheet, this.getAttribute('type'));
         });
@@ -2135,9 +2132,6 @@ $(document).ready(() => {
                     },
                     callback: function (key, opt) {
                         mergePeg.show();
-                    },
-                    visible: function (key, opt) {
-                        return isTz;
                     }
                 }
             }

app/public/js/stage.js

@@ -35,7 +35,7 @@ function customColDisplay () {
         { title: '本期数量变更', fields: ['qc_qty', 'qc_tp', 'qc_bgl', 'qc_minus_qty'], visible: true },
         { title: '本期完成计量', fields: ['gather_qty', 'gather_tp'], visible: true },
         { title: '截止本期计量合同', fields: ['end_contract_qty', 'end_contract_tp'], visible: true },
-        { title: '截止本期数量变更', fields: ['end_qc_qty', 'end_qc_tp', 'end_qc_bgl'], visible: true },
+        { title: '截止本期数量变更', fields: ['end_qc_qty', 'end_qc_tp', 'end_qc_bgl', 'end_qc_minus_qty'], visible: true },
         { title: '截止本期完成计量', fields: ['end_gather_qty', 'end_gather_tp', 'end_gather_percent', 'end_final_1_precent'], visible: true },
         { title: '本期批注', fields: ['postil'], visible: true },
         { title: '图册号', fields: ['drawing_code'], visible: true },

app/public/js/tender_list_info.js

@@ -62,9 +62,11 @@ const tenderListSpec = (function(){
                     ? transFormToChinese(node.cur_flow[0].audit_order) + '审'
                     : node.cur_flow instanceof Array ? (node.cur_flow[0].name + (node.cur_flow[0].role ? '-' + node.cur_flow[0].role : '')) : (node.cur_flow.name + (node.cur_flow.role ? '-' + node.cur_flow.role : ''));
                 if (node.stage_status !== undefined) {
+                    let stageOrder = node.stage_count;
+                    if (node.cur_flow) stageOrder = node.cur_flow instanceof Array ? node.cur_flow[0].order : node.cur_flow.order;
                     html.push(((node.stage_count && node.stage_status === auditConst.stage.status.uncheck) || node.ledger_status === auditConst.ledger.status.uncheck)
                         ? curUser
-                        : `<a href="#sp-list" data-toggle="modal" data-target="#sp-list"  data-type="${node.stage_count ? 'stage' : 'ledger'}" data-tender="${node.id}" data-order="${node.stage_count ? node.stage_count + '' : ''}">${curUser}</a>`
+                        : `<a href="#sp-list" data-toggle="modal" data-target="#sp-list"  data-type="${node.stage_count ? 'stage' : 'ledger'}" data-tender="${node.id}" data-order="${stageOrder ? stageOrder + '' : ''}">${curUser}</a>`
                     );
                     html.push(`<span class="${node.progress.status_class} ml-1">${node.progress.status}</span>`);
                 } else {

app/service/ledger_history.js

@@ -8,6 +8,7 @@
  * @version
  */
 const Ledger = require('../lib/ledger');
+const tenderConst = require('../const/tender');
 
 module.exports = app => {
 
@@ -72,10 +73,12 @@ module.exports = app => {
          * @private
          */
         async checkBackupLedgerHistory(tid, sid = 0, rid = '') {
-            const sbCount = await this.ctx.service.ledger.count({ tender_id: tid });
-            const spCount = await this.ctx.service.pos.count({ tid: tid });
-            const ledgerHis = await this.ctx.service.ledgerHistory.getLatestHistory(tid);
-            if (sbCount === ledgerHis.bills_count && spCount === ledgerHis.pos_count) return ledgerHis.id;
+            if (this.ctx.tender.data.measure_type === tenderConst.measureType.tz.value) {
+                const sbCount = await this.ctx.service.ledger.count({ tender_id: tid });
+                const spCount = await this.ctx.service.pos.count({ tid: tid });
+                const ledgerHis = await this.ctx.service.ledgerHistory.getLatestHistory(tid);
+                if (sbCount === ledgerHis.bills_count && spCount === ledgerHis.pos_count) return ledgerHis.id;
+            }
 
             const now = new Date();
             const timestamp = (now).getTime();

app/service/phase_pay_detail.js

@@ -297,6 +297,7 @@ class PayCalculator {
             x.org_tp = x.tp || 0;
             x.org_start_tp = x.start_tp || 0;
             x.org_range_tp = x.range_tp || 0;
+            x.org_end_tp = x.end_tp || 0;
         });
         this.getCalcBase();
         this.getCalcAdd();
@@ -304,7 +305,8 @@ class PayCalculator {
         const calcPays = this.sortPaysByCalc(payTree);
         this.calculate(calcPays);
         payTree.nodes.forEach(p => {
-            p.calcUpdate = !this.ctx.helper.numEqual(p.org_tp, p.tp) || !this.ctx.helper.numEqual(p.org_start_tp, p.start_tp) || !this.ctx.helper.numEqual(p.org_range_tp, p.range_tp);
+            p.calcUpdate = !this.ctx.helper.numEqual(p.org_tp, p.tp) || !this.ctx.helper.numEqual(p.org_end_tp, p.end_tp)
+                || !this.ctx.helper.numEqual(p.org_start_tp, p.start_tp) || !this.ctx.helper.numEqual(p.org_range_tp, p.range_tp) ;
         });
     }
 }
@@ -493,7 +495,7 @@ class PhasePayDetail extends TreeService {
 
         // 查询应返回的结果
         const resultData = {};
-        resultData.create = await this.getNextsData(masterId, select.tree_id, children.length);
+        resultData.create = await this.getNextsData(masterId, select.tree_id, children.length + 1);
         if (children.length === 0) resultData.update = await this.getDataByKid(masterId, select.tree_id);
         return resultData;
     }

app/service/stage_pos.js

@@ -276,9 +276,9 @@ module.exports = app => {
                     if (d.name !== undefined) p.name = d.name;
                     if (d.position !== undefined) p.position = d.position;
                     if (d.sgfh_qty !== undefined || d.qtcl_qty !== undefined || d.sjcl_qty !== undefined) {
-                        p.sgfh_qty = d.sgfh_qty !== undefined ? d.sgfh_qty : op.sgfh_qty;
-                        p.sjcl_qty = d.sjcl_qty !== undefined ? d.sjcl_qty : op.sjcl_qty;
-                        p.qtcl_qty = d.qtcl_qty !== undefined ? d.qtcl_qty : op.qtcl_qty;
+                        p.sgfh_qty = d.sgfh_qty !== undefined ? this.ctx.helper.round(d.sgfh_qty, precision.value) : op.sgfh_qty;
+                        p.sjcl_qty = d.sjcl_qty !== undefined ? this.ctx.helper.round(d.sjcl_qty, precision.value) : op.sjcl_qty;
+                        p.qtcl_qty = d.qtcl_qty !== undefined ? this.ctx.helper.round(d.qtcl_qty, precision.value) : op.qtcl_qty;
                         if (d.sgfh_expr !== undefined) p.sgfh_expr = d.sgfh_expr;
                         if (d.sjcl_expr !== undefined) p.sjcl_expr = d.sjcl_expr;
                         if (d.qtcl_expr !== undefined) p.qtcl_expr = d.qtcl_expr;

app/view/ledger/explode_modal.ejs

@@ -82,7 +82,7 @@
                             <div class="text-center my-3">上传yup/ybpx文件</div>
                         </div>
                     </div>
-                    <div class="card card-upload-width p-2" data-toggle="modal" data-target="#binddskuser" id="id-post-dsk">
+                    <div class="card card-upload-width p-2" id="id-post-dsk">
                         <div class="card-body p-0">
                             <div class="m-2"><img src="/public/images/dsk.png" class="rounded m-auto d-block"></div>
                             <div class="text-center mt-3 ">获取在线计价文件</div>

app/view/revise/compare.ejs

@@ -45,7 +45,6 @@
                 <!--0号台账模式-->
                 <div class="sjs-height-1" style="overflow: hidden" id="bills-spread">
                 </div>
-                <% if (ctx.tender.data.measure_type === measureType.tz.value) { %>
                 <div class="bcontent-wrap">
                     <div id="revise-resize" class="resize-y" id="top-spr" r-Type="height" div1=".sjs-height-1" div2=".bcontent-wrap" title="调整大小"><!--调整上下高度条--></div>
                     <div class="bc-bar mb-1">
@@ -68,7 +67,6 @@
                     <div class="sp-wrap" id="pos-spread">
                     </div>
                 </div>
-                <% } %>
             </div>
             <!--右栏-->
             <div class="c-body" id="right-view" style="display: none; width: 33%;">

app/view/revise/info.ejs

@@ -75,10 +75,8 @@
         <div class="row w-100 sub-content">
             <!--左栏-->
             <div class="c-body" id="left-view" style="width: 100%">
-                <!--0号台账模式-->
                 <div class="sjs-height-1" style="overflow: hidden" id="bills-spread">
                 </div>
-                <% if (ctx.tender.data.measure_type === measureType.tz.value) { %>
                 <div class="bcontent-wrap">
                     <div id="revise-resize" class="resize-y" id="top-spr" r-Type="height" div1=".sjs-height-1" div2=".bcontent-wrap" title="调整大小"><!--调整上下高度条--></div>
                     <div class="bc-bar mb-1">
@@ -109,7 +107,6 @@
                     <div class="sp-wrap" id="pos-spread">
                     </div>
                 </div>
-                <% } %>
             </div>
             <!--右栏-->
             <div class="c-body" id="right-view" style="display: none; width: 33%;">