投资进度及变更新增部位功能开关调整

app/controller/change_controller.js

@@ -927,9 +927,9 @@ module.exports = app => {
                 const readySettle = await ctx.service.settle.getReadySettle(ctx.tender.id);
                 if (data.from === 'revise') await ctx.service.change.checkSettleUpdate(ctx.tender.id, readySettle);
                 const ledgerData = await ctx.service.ledger.getData(ctx.tender.id);
-                const changeLedgerData = !ctx.session.sessionProject.page_show.openChangeRevise ? [] : (lastRevise && lastRevise.status !== audit.revise.status.checked && data.from !== 'revise' ? [] : await ctx.service.changeLedger.getData(ctx.tender.id));
+                const changeLedgerData = lastRevise && lastRevise.status !== audit.revise.status.checked && data.from !== 'revise' ? [] : await ctx.service.changeLedger.getData(ctx.tender.id);
                 const posData = await ctx.service.pos.getPosData({ tid: ctx.tender.id });
-                const changePosData = !ctx.session.sessionProject.page_show.openChangeRevise ? [] : (lastRevise && lastRevise.status !== audit.revise.status.checked && data.from !== 'revise' ? [] : await ctx.service.changePos.getPosData({ tid: ctx.tender.id }));
+                const changePosData = lastRevise && lastRevise.status !== audit.revise.status.checked && data.from !== 'revise' ? [] : await ctx.service.changePos.getPosData({ tid: ctx.tender.id });
                 const dealBills = await ctx.service.dealBills.getAllDataByCondition({ where: { tender_id: ctx.tender.id } });
                 // const settleStatus = ctx.service.settle.settleStatus;
                 const settleBills = readySettle ? await this.ctx.service.settleBills.getAllDataByCondition({ where: { settle_id: readySettle.id } }) : [];
@@ -1794,9 +1794,6 @@ module.exports = app => {
         async updateRevise(ctx) {
             try {
                 if (!ctx.tender.data) throw '标段数据错误';
-                if (!ctx.session.sessionProject.page_show.openChangeRevise) {
-                    throw '该功能已关闭';
-                }
                 const data = JSON.parse(ctx.request.body.data);
                 if (!data.postType || !data.postData) throw '数据错误';
                 const responseData = { err: 0, msg: '', data: {} };

app/controller/tender_controller.js

@@ -628,7 +628,7 @@ module.exports = app => {
                     renderData.accountList = accountList;
                     renderData.accountGroup = accountGroupList;
                 }
-                if (ctx.subProject.page_show.xxjd && ctx.session.sessionUser.is_admin) {
+                if (ctx.session.sessionProject.page_show.xxjd && ctx.session.sessionUser.is_admin) {
                     // 投资进度内容
                     renderData.scheduleAuditList = await ctx.service.scheduleAudit.getAllDataByCondition({ where: { tid: tender.id } });
                     renderData.scPermission = scheduleConst.permission;

app/middleware/tender_check.js

@@ -87,7 +87,7 @@ module.exports = options => {
             const changePlanAuditorsId = this.helper._.map(changePlanAuditors, 'aid');
             const tenderPermission = this.session.sessionUser.permission ? this.session.sessionUser.permission.tender : null;
             const isTenderTourist = yield this.service.tenderTourist.getDataByCondition({ tid: tender.id, user_id: accountId });
-            const scheduleUser = subProject.page_show.xxjd ? yield this.service.scheduleAudit.getDataByCondition({ tid: tender.id, audit_id: this.session.sessionUser.accountId }) : [];
+            const scheduleUser = this.session.sessionProject.page_show.xxjd ? yield this.service.scheduleAudit.getDataByCondition({ tid: tender.id, audit_id: this.session.sessionUser.accountId }) : [];
             // 判断访问人是否具有游客身份
             tender.isTourist = isTenderTourist !== null;
             // 游客权限

app/public/js/change_revise.js

@@ -4458,517 +4458,516 @@ $(document).ready(() => {
             }, 100);
         });
     })('a[name=showLevel]', billsSheet);
-    if (openRevise) {
-        const dataChecker = DataChecker({
-            checkUrl: window.location.pathname + '/check',
-            completeData: function (data) {
-                pos.updateDatas({update: data.source.pos});
-                const loadResult = billsTree.loadPostData({update: data.source.bills});
-                billsTreeSpreadObj.refreshTree(billsSheet, loadResult);
-                posSpreadObj.loadCurPosData();
-                for (const e of data.error) {
-                    e.serialNo = billsTree.getNodeIndex(billsTree.getItems(e.ledger_id)) + 1;
-                }
-            },
-            errorList: errorList,
-        });
 
-        $('#ledger-check2').click(() => {
-            ledgerCheck2({
-                ledgerTree: billsTree,
-                ledgerPos: pos,
+    const dataChecker = DataChecker({
+        checkUrl: window.location.pathname + '/check',
+        completeData: function (data) {
+            pos.updateDatas({update: data.source.pos});
+            const loadResult = billsTree.loadPostData({update: data.source.bills});
+            billsTreeSpreadObj.refreshTree(billsSheet, loadResult);
+            posSpreadObj.loadCurPosData();
+            for (const e of data.error) {
+                e.serialNo = billsTree.getNodeIndex(billsTree.getItems(e.ledger_id)) + 1;
+            }
+        },
+        errorList: errorList,
+    });
+
+    $('#ledger-check2').click(() => {
+        ledgerCheck2({
+            ledgerTree: billsTree,
+            ledgerPos: pos,
+            checkList: checkList,
+            decimal: decimal,
+            checkOption: checkOption,
+        }).then(result => {
+            check2Viewing({
+                extra: ZhCalc.div(billsTree.datas.length + pos.datas.length, 10000, 0),
+                randomWait: true,
+                prefix: 'check2-',
+                checks: result,
                 checkList: checkList,
-                decimal: decimal,
-                checkOption: checkOption,
-            }).then(result => {
-                check2Viewing({
-                    extra: ZhCalc.div(billsTree.datas.length + pos.datas.length, 10000, 0),
-                    randomWait: true,
-                    prefix: 'check2-',
-                    checks: result,
-                    checkList: checkList,
-                });
             });
         });
-        if (isYb) {
-            let compilationList = [];
-            $('#get-dsk-btn').click(function () {
-                // 判断是否已绑定dsk用户
-                postData('/profile/dsk/api', {type: 'hadbind'}, function (result) {
-                    if (result === 1) {
-                        $('#error-dsk .modal-body').find('h5').eq(0).show();
-                        $('#error-dsk .modal-body').find('h5').eq(1).hide();
-                        $('#error-dsk').modal('show');
-                        $('#error-dsk .modal-footer').find('a').eq(0).text('绑定手机');
-                    } else if (result === 2) {
-                        $('#error-dsk .modal-body').find('h5').eq(1).show();
-                        $('#error-dsk .modal-body').find('h5').eq(0).hide();
-                        $('#error-dsk').modal('show');
-                        $('#error-dsk .modal-footer').find('a').eq(0).text('绑定账号');
-                    } else {
-                        postData('/profile/dsk/api', {
-                            type: 'compilation',
-                            getProject: 1,
-                            compilationId: getLocalCache(dskCompilation)
-                        }, function (result) {
-                            let html = '';
-                            for (const data of result.compilation) {
-                                if (data.ID !== '5c66649650da2d000d8d37ba' && data.ID !== '5b52b027fd3bb0000b257cf8') {
-                                    html += `<option value="${data.ID}" ${result.select_compilation === data.ID ? 'selected' : ''}>${data.name}</option>`;
-                                }
+    });
+    if (isYb) {
+        let compilationList = [];
+        $('#get-dsk-btn').click(function () {
+            // 判断是否已绑定dsk用户
+            postData('/profile/dsk/api', {type: 'hadbind'}, function (result) {
+                if (result === 1) {
+                    $('#error-dsk .modal-body').find('h5').eq(0).show();
+                    $('#error-dsk .modal-body').find('h5').eq(1).hide();
+                    $('#error-dsk').modal('show');
+                    $('#error-dsk .modal-footer').find('a').eq(0).text('绑定手机');
+                } else if (result === 2) {
+                    $('#error-dsk .modal-body').find('h5').eq(1).show();
+                    $('#error-dsk .modal-body').find('h5').eq(0).hide();
+                    $('#error-dsk').modal('show');
+                    $('#error-dsk .modal-footer').find('a').eq(0).text('绑定账号');
+                } else {
+                    postData('/profile/dsk/api', {
+                        type: 'compilation',
+                        getProject: 1,
+                        compilationId: getLocalCache(dskCompilation)
+                    }, function (result) {
+                        let html = '';
+                        for (const data of result.compilation) {
+                            if (data.ID !== '5c66649650da2d000d8d37ba' && data.ID !== '5b52b027fd3bb0000b257cf8') {
+                                html += `<option value="${data.ID}" ${result.select_compilation === data.ID ? 'selected' : ''}>${data.name}</option>`;
                             }
-                            dskAccountData = result.dskAccountData;
-                            compilationList = result.compilation;
-                            console.log(compilationList);
-                            $('#dsk-compilation-list').html(html);
-                            $('#add-dsk').modal('show');
-                            setLocalCache(dskCompilation, result.select_compilation);
-                            makeDskProjectSjsHtml(result.project);
-                        });
-                    }
-                })
-            });
-            $('#get-dsk-bills-btn').click(function () {
-                const projectInfo = _.find(dskProjects, {pid: dskAccountData.select_project ? dskAccountData.select_project : null});
-                changeDskProjectTree(projectInfo, dskAccountData.select_tree ? dskAccountData.select_tree : null);
-            });
+                        }
+                        dskAccountData = result.dskAccountData;
+                        compilationList = result.compilation;
+                        console.log(compilationList);
+                        $('#dsk-compilation-list').html(html);
+                        $('#add-dsk').modal('show');
+                        setLocalCache(dskCompilation, result.select_compilation);
+                        makeDskProjectSjsHtml(result.project);
+                    });
+                }
+            })
+        });
+        $('#get-dsk-bills-btn').click(function () {
+            const projectInfo = _.find(dskProjects, {pid: dskAccountData.select_project ? dskAccountData.select_project : null});
+            changeDskProjectTree(projectInfo, dskAccountData.select_tree ? dskAccountData.select_tree : null);
+        });
 
-            $('body').on('change', '#dsk-compilation-list', function () {
-                const compilationId = $(this).val();
-                setLocalCache(dskCompilation, compilationId);
-                dskProjectSpreadObj.refreshSourceTree();
-            });
+        $('body').on('change', '#dsk-compilation-list', function () {
+            const compilationId = $(this).val();
+            setLocalCache(dskCompilation, compilationId);
+            dskProjectSpreadObj.refreshSourceTree();
+        });
 
-            $('.hide-dsk-modal').click(function () {
-                $('#error-dsk').modal('hide');
-            });
-            let dp = false;
-            let gsObj = {
-                setting: null,
+        $('.hide-dsk-modal').click(function () {
+            $('#error-dsk').modal('hide');
+        });
+        let dp = false;
+        let gsObj = {
+            setting: null,
 
-                gsSheet: null,
-                grSheet: null,
+            gsSheet: null,
+            grSheet: null,
 
-                tenderSourceTree: null,
-                grArray: dskProjects ? dskProjects : [],
-                orgSelect: null,
-            };
+            tenderSourceTree: null,
+            grArray: dskProjects ? dskProjects : [],
+            orgSelect: null,
+        };
 
-            function makeDskProjectSjsHtml(datas) {
-                if (!dp) {
-                    initDskProjectTree();
-                    dp = true;
-                }
-                gsObj.tenderSourceTree = dskProject2Tree.convert(datas);
-                SpreadJsObj.loadSheetData(gsObj.gsSheet, SpreadJsObj.DataType.Tree, gsObj.tenderSourceTree);
-                SpreadJsObj.loadSheetData(gsObj.grSheet, SpreadJsObj.DataType.Data, gsObj.grArray);
-                if (datas.length === 0) {
-                    $('#show-project-0').show();
-                } else {
-                    $('#show-project-0').hide();
-                }
+        function makeDskProjectSjsHtml(datas) {
+            if (!dp) {
+                initDskProjectTree();
+                dp = true;
+            }
+            gsObj.tenderSourceTree = dskProject2Tree.convert(datas);
+            SpreadJsObj.loadSheetData(gsObj.gsSheet, SpreadJsObj.DataType.Tree, gsObj.tenderSourceTree);
+            SpreadJsObj.loadSheetData(gsObj.grSheet, SpreadJsObj.DataType.Data, gsObj.grArray);
+            if (datas.length === 0) {
+                $('#show-project-0').show();
+            } else {
+                $('#show-project-0').hide();
             }
+        }
 
-            const dskProjectSpreadObj = {
-                _addTender: function (tender) {
-                    const gr = gsObj.grArray.find(function (x) {
-                        return x.pid === tender.pid;
-                    });
-                    const c_id = getLocalCache(dskCompilation);
-                    const t = {
-                        pid: tender.pid,
-                        name: tender.name,
-                        compilationId: c_id,
-                        compilationName: _.find(compilationList, {ID: c_id}).name
-                    };
-                    if (!gr) gsObj.grArray.push(t);
-                    return t;
-                },
-                _removeTender: function (tender) {
-                    const gri = gsObj.grArray.findIndex(function (x, i, arr) {
-                        return x.pid === tender.pid;
+        const dskProjectSpreadObj = {
+            _addTender: function (tender) {
+                const gr = gsObj.grArray.find(function (x) {
+                    return x.pid === tender.pid;
+                });
+                const c_id = getLocalCache(dskCompilation);
+                const t = {
+                    pid: tender.pid,
+                    name: tender.name,
+                    compilationId: c_id,
+                    compilationName: _.find(compilationList, {ID: c_id}).name
+                };
+                if (!gr) gsObj.grArray.push(t);
+                return t;
+            },
+            _removeTender: function (tender) {
+                const gri = gsObj.grArray.findIndex(function (x, i, arr) {
+                    return x.pid === tender.pid;
+                });
+                if (gri >= 0) gsObj.grArray.splice(gri, 1);
+            },
+            reloadResultData: function () {
+                SpreadJsObj.reLoadSheetData(gsObj.grSheet);
+            },
+            refreshSourceTree: function () {
+                const c_id = getLocalCache(dskCompilation);
+                if (c_id) {
+                    postData('/profile/dsk/api', {type: 'project', compilationId: c_id}, function (result) {
+                        makeDskProjectSjsHtml(result);
                     });
-                    if (gri >= 0) gsObj.grArray.splice(gri, 1);
-                },
-                reloadResultData: function () {
-                    SpreadJsObj.reLoadSheetData(gsObj.grSheet);
-                },
-                refreshSourceTree: function () {
-                    const c_id = getLocalCache(dskCompilation);
-                    if (c_id) {
-                        postData('/profile/dsk/api', {type: 'project', compilationId: c_id}, function (result) {
-                            makeDskProjectSjsHtml(result);
-                        });
-                    }
-                },
-                gsButtonClicked: function (e, info) {
-                    if (!info.sheet.zh_setting) return;
+                }
+            },
+            gsButtonClicked: function (e, info) {
+                if (!info.sheet.zh_setting) return;
 
-                    const col = info.sheet.zh_setting.cols[info.col];
-                    if (col.field !== 'selected') return;
+                const col = info.sheet.zh_setting.cols[info.col];
+                if (col.field !== 'selected') return;
 
-                    const node = SpreadJsObj.getSelectObject(info.sheet);
-                    node.selected = !node.selected;
-                    if (node.children && node.children.length > 0) {
-                        const posterity = gsObj.tenderSourceTree.getPosterity(node);
-                        for (const p of posterity) {
-                            p.selected = node.selected;
-                            if ((!p.children || p.children.length === 0) && p.type === 2) {
-                                if (p.selected) {
-                                    dskProjectSpreadObj._addTender(p);
-                                } else {
-                                    dskProjectSpreadObj._removeTender(p);
-                                }
+                const node = SpreadJsObj.getSelectObject(info.sheet);
+                node.selected = !node.selected;
+                if (node.children && node.children.length > 0) {
+                    const posterity = gsObj.tenderSourceTree.getPosterity(node);
+                    for (const p of posterity) {
+                        p.selected = node.selected;
+                        if ((!p.children || p.children.length === 0) && p.type === 2) {
+                            if (p.selected) {
+                                dskProjectSpreadObj._addTender(p);
+                            } else {
+                                dskProjectSpreadObj._removeTender(p);
                             }
                         }
-                        SpreadJsObj.reLoadRowData(info.sheet, info.row, posterity.length + 1);
-                    } else if (node.type === 2) {
-                        if (node.selected) {
-                            dskProjectSpreadObj._addTender(node);
-                        } else {
-                            dskProjectSpreadObj._removeTender(node);
-                        }
-                        SpreadJsObj.reLoadRowData(info.sheet, info.row, 1);
                     }
-                    dskProjectSpreadObj.reloadResultData();
-                },
-                deleteGr: function () {
-                    if (gsObj.grArray.length === 0) return;
-                    if (gsObj.grSheet.getSelections().length === 0) return;
-                    const selections = gsObj.grSheet.getSelections();
-                    const sel = selections ? selections[0] : gsObj.grSheet.getSelections()[0];
-                    const row = sel && sel.row !== undefined ? sel.row : -1;
-                    if (row === -1 || sel.row + sel.rowCount > gsObj.grArray.length) {
-                        return false;
-                    }
-                    const delList = [];
-                    for (let r = 0; r < sel.rowCount; r++) {
-                        const select = gsObj.grArray[row + r];
-                        delList.push(select);
+                    SpreadJsObj.reLoadRowData(info.sheet, info.row, posterity.length + 1);
+                } else if (node.type === 2) {
+                    if (node.selected) {
+                        dskProjectSpreadObj._addTender(node);
+                    } else {
+                        dskProjectSpreadObj._removeTender(node);
                     }
-                    _.pullAll(gsObj.grArray, delList);
-                    dskProjectSpreadObj.reloadResultData();
-                    dskProjectSpreadObj.refreshSourceTree();
-                },
+                    SpreadJsObj.reLoadRowData(info.sheet, info.row, 1);
+                }
+                dskProjectSpreadObj.reloadResultData();
+            },
+            deleteGr: function () {
+                if (gsObj.grArray.length === 0) return;
+                if (gsObj.grSheet.getSelections().length === 0) return;
+                const selections = gsObj.grSheet.getSelections();
+                const sel = selections ? selections[0] : gsObj.grSheet.getSelections()[0];
+                const row = sel && sel.row !== undefined ? sel.row : -1;
+                if (row === -1 || sel.row + sel.rowCount > gsObj.grArray.length) {
+                    return false;
+                }
+                const delList = [];
+                for (let r = 0; r < sel.rowCount; r++) {
+                    const select = gsObj.grArray[row + r];
+                    delList.push(select);
+                }
+                _.pullAll(gsObj.grArray, delList);
+                dskProjectSpreadObj.reloadResultData();
+                dskProjectSpreadObj.refreshSourceTree();
+            },
+        };
+
+        const initDskProjectTree = function () {
+            const gsSpread = SpreadJsObj.createNewSpread($('#dsk-project-source-spread')[0]);
+            gsObj.gsSheet = gsSpread.getActiveSheet();
+            const gsSpreadSetting = {
+                cols: [
+                    {
+                        title: '选择',
+                        field: 'selected',
+                        hAlign: 1,
+                        width: 40,
+                        formatter: '@',
+                        cellType: 'checkbox',
+                        readOnly: true,
+                    },
+                    {
+                        title: '名称',
+                        field: 'name',
+                        hAlign: 0,
+                        width: 400,
+                        formatter: '@',
+                        readOnly: true,
+                        folderCell: true,
+                        cellType: 'tree'
+                    },
+                ],
+                emptyRows: 0,
+                headRows: 1,
+                headRowHeight: [32],
+                defaultRowHeight: 21,
+                headerFont: '12px 微软雅黑',
+                font: '12px 微软雅黑',
+                headColWidth: [0],
+                selectedBackColor: '#fffacd',
             };
+            SpreadJsObj.initSheet(gsObj.gsSheet, gsSpreadSetting);
+            gsSpread.bind(spreadNS.Events.ButtonClicked, dskProjectSpreadObj.gsButtonClicked);
 
-            const initDskProjectTree = function () {
-                const gsSpread = SpreadJsObj.createNewSpread($('#dsk-project-source-spread')[0]);
-                gsObj.gsSheet = gsSpread.getActiveSheet();
-                const gsSpreadSetting = {
-                    cols: [
-                        {
-                            title: '选择',
-                            field: 'selected',
-                            hAlign: 1,
-                            width: 40,
-                            formatter: '@',
-                            cellType: 'checkbox',
-                            readOnly: true,
-                        },
-                        {
-                            title: '名称',
-                            field: 'name',
-                            hAlign: 0,
-                            width: 400,
-                            formatter: '@',
-                            readOnly: true,
-                            folderCell: true,
-                            cellType: 'tree'
-                        },
-                    ],
-                    emptyRows: 0,
-                    headRows: 1,
-                    headRowHeight: [32],
-                    defaultRowHeight: 21,
-                    headerFont: '12px 微软雅黑',
-                    font: '12px 微软雅黑',
-                    headColWidth: [0],
-                    selectedBackColor: '#fffacd',
-                };
-                SpreadJsObj.initSheet(gsObj.gsSheet, gsSpreadSetting);
-                gsSpread.bind(spreadNS.Events.ButtonClicked, dskProjectSpreadObj.gsButtonClicked);
+            const grSpread = SpreadJsObj.createNewSpread($('#dsk-project-result-spread')[0]);
+            gsObj.grSheet = grSpread.getActiveSheet();
+            const grSpreadSetting = {
+                cols: [
+                    {
+                        title: '名称',
+                        colSpan: '1',
+                        rowSpan: '1',
+                        field: 'name',
+                        hAlign: 0,
+                        width: 250,
+                        formatter: '@',
+                        readOnly: true,
+                        cellType: 'ellipsisAutoTip',
+                        scrollHeightClass: '.modal-height-500'
+                    },
+                    {
+                        title: '所属编办',
+                        colSpan: '1',
+                        rowSpan: '1',
+                        field: 'compilationName',
+                        hAlign: 0,
+                        width: 150,
+                        formatter: '@',
+                        readOnly: true
+                    },
+                ],
+                emptyRows: 0,
+                headRows: 1,
+                headRowHeight: [32],
+                defaultRowHeight: 21,
+                headerFont: '12px 微软雅黑',
+                font: '12px 微软雅黑',
+                headColWidth: []
+            };
+            SpreadJsObj.initSheet(gsObj.grSheet, grSpreadSetting);
 
-                const grSpread = SpreadJsObj.createNewSpread($('#dsk-project-result-spread')[0]);
-                gsObj.grSheet = grSpread.getActiveSheet();
-                const grSpreadSetting = {
-                    cols: [
-                        {
-                            title: '名称',
-                            colSpan: '1',
-                            rowSpan: '1',
-                            field: 'name',
-                            hAlign: 0,
-                            width: 250,
-                            formatter: '@',
-                            readOnly: true,
-                            cellType: 'ellipsisAutoTip',
-                            scrollHeightClass: '.modal-height-500'
-                        },
-                        {
-                            title: '所属编办',
-                            colSpan: '1',
-                            rowSpan: '1',
-                            field: 'compilationName',
-                            hAlign: 0,
-                            width: 150,
-                            formatter: '@',
-                            readOnly: true
+            // 右键删除已选项目
+            const gsContextMenuOptions = {
+                selector: '#dsk-project-result-spread',
+                build: function ($trigger, e) {
+                    const target = SpreadJsObj.safeRightClickSelection($trigger, e, grSpread);
+                    return target.hitTestType === spreadNS.SheetArea.viewport || target.hitTestType === spreadNS.SheetArea.rowHeader;
+                },
+                items: {
+                    delete: {
+                        name: '删除',
+                        icon: 'fa-remove',
+                        callback: function (key, opt) {
+                            dskProjectSpreadObj.deleteGr();
                         },
-                    ],
-                    emptyRows: 0,
-                    headRows: 1,
-                    headRowHeight: [32],
-                    defaultRowHeight: 21,
-                    headerFont: '12px 微软雅黑',
-                    font: '12px 微软雅黑',
-                    headColWidth: []
-                };
-                SpreadJsObj.initSheet(gsObj.grSheet, grSpreadSetting);
-
-                // 右键删除已选项目
-                const gsContextMenuOptions = {
-                    selector: '#dsk-project-result-spread',
-                    build: function ($trigger, e) {
-                        const target = SpreadJsObj.safeRightClickSelection($trigger, e, grSpread);
-                        return target.hitTestType === spreadNS.SheetArea.viewport || target.hitTestType === spreadNS.SheetArea.rowHeader;
-                    },
-                    items: {
-                        delete: {
-                            name: '删除',
-                            icon: 'fa-remove',
-                            callback: function (key, opt) {
-                                dskProjectSpreadObj.deleteGr();
-                            },
-                            disabled: function (key, opt) {
-                                const selection = gsObj.grSheet.getSelections();
-                                const sel = selection ? selection[0] : gsObj.grSheet.getSelections()[0];
-                                const row = sel && sel.row !== undefined ? sel.row : -1;
-                                if (row === -1 || sel.row + sel.rowCount > gsObj.grArray.length) {
-                                    return true;
-                                }
-                                return false;
+                        disabled: function (key, opt) {
+                            const selection = gsObj.grSheet.getSelections();
+                            const sel = selection ? selection[0] : gsObj.grSheet.getSelections()[0];
+                            const row = sel && sel.row !== undefined ? sel.row : -1;
+                            if (row === -1 || sel.row + sel.rowCount > gsObj.grArray.length) {
+                                return true;
                             }
-                        },
-                    }
-                };
-                $.contextMenu(gsContextMenuOptions);
-
-                $('#add-dsk').bind('shown.bs.modal', function () {
-                    if (gsSpread) gsSpread.refresh();
-                    if (grSpread) grSpread.refresh();
-                });
+                            return false;
+                        }
+                    },
+                }
             };
+            $.contextMenu(gsContextMenuOptions);
 
-            const dskProject2Tree = (function () {
-                const treeSetting = {
-                    id: 'tmt_id',
-                    pid: 'tmt_pid',
-                    order: 'seq',
-                    level: 'level',
-                    rootId: '-1',
-                    fullPath: 'full_path',
-                };
-                const tenderTree = createNewPathTree('gather', treeSetting);
+            $('#add-dsk').bind('shown.bs.modal', function () {
+                if (gsSpread) gsSpread.refresh();
+                if (grSpread) grSpread.refresh();
+            });
+        };
 
-                function setChildrenNode(node, files, tenders) {
-                    const children = _.filter(files, {parentID: node.pid});
-                    const tenderChildren = _.filter(tenders, {parentID: node.pid});
-                    const checkChildren = _.orderBy([...children, ...tenderChildren], ['seq', 'asc']);
-                    for (const c of checkChildren) {
-                        // if (c.type === 1 && _.filter(files, { parentID: c.ID }).length === 0 && _.filter(tenders, { parentID: c.ID }).length === 0) {
-                        //     // 判断文件夹下有无东西，没有就不插入
-                        //     continue;
-                        // }
-                        const child = {
-                            pid: c.ID,
-                            parentID: c.parentID,
-                            name: c.name,
-                            type: c.type,
-                            selected: _.findIndex(gsObj.grArray, {pid: c.ID}) >= 0
-                        };
-                        tenderTree.addNode(child, node);
-                        if (c.type === 1) setChildrenNode(child, files, tenders);
-                    }
+        const dskProject2Tree = (function () {
+            const treeSetting = {
+                id: 'tmt_id',
+                pid: 'tmt_pid',
+                order: 'seq',
+                level: 'level',
+                rootId: '-1',
+                fullPath: 'full_path',
+            };
+            const tenderTree = createNewPathTree('gather', treeSetting);
+
+            function setChildrenNode(node, files, tenders) {
+                const children = _.filter(files, {parentID: node.pid});
+                const tenderChildren = _.filter(tenders, {parentID: node.pid});
+                const checkChildren = _.orderBy([...children, ...tenderChildren], ['seq', 'asc']);
+                for (const c of checkChildren) {
+                    // if (c.type === 1 && _.filter(files, { parentID: c.ID }).length === 0 && _.filter(tenders, { parentID: c.ID }).length === 0) {
+                    //     // 判断文件夹下有无东西，没有就不插入
+                    //     continue;
+                    // }
+                    const child = {
+                        pid: c.ID,
+                        parentID: c.parentID,
+                        name: c.name,
+                        type: c.type,
+                        selected: _.findIndex(gsObj.grArray, {pid: c.ID}) >= 0
+                    };
+                    tenderTree.addNode(child, node);
+                    if (c.type === 1) setChildrenNode(child, files, tenders);
                 }
+            }
 
-                function convert(projects) {
-                    tenderTree.clearDatas();
-                    const result = filterFolders(projects);
-                    const topLevel = _.orderBy(_.filter(result, {parentID: '-1'}), ['seq', 'asc']);
-                    const files = _.filter(result, {type: 1});
-                    const tenders = _.filter(result, {type: 2});
+            function convert(projects) {
+                tenderTree.clearDatas();
+                const result = filterFolders(projects);
+                const topLevel = _.orderBy(_.filter(result, {parentID: '-1'}), ['seq', 'asc']);
+                const files = _.filter(result, {type: 1});
+                const tenders = _.filter(result, {type: 2});
 
-                    for (const t of topLevel) {
-                        const node = {
-                            pid: t.ID,
-                            parentID: t.parentID,
-                            name: t.name,
-                            type: t.type,
-                            selected: t.type === 2 ? _.findIndex(gsObj.grArray, {pid: t.ID}) >= 0 : false,
-                        };
-                        tenderTree.addNode(node, null);
-                        if (t.type === 1) setChildrenNode(node, files, tenders);
-                    }
-                    tenderTree.sortTreeNode(true);
-                    return tenderTree;
+                for (const t of topLevel) {
+                    const node = {
+                        pid: t.ID,
+                        parentID: t.parentID,
+                        name: t.name,
+                        type: t.type,
+                        selected: t.type === 2 ? _.findIndex(gsObj.grArray, {pid: t.ID}) >= 0 : false,
+                    };
+                    tenderTree.addNode(node, null);
+                    if (t.type === 1) setChildrenNode(node, files, tenders);
                 }
+                tenderTree.sortTreeNode(true);
+                return tenderTree;
+            }
 
-                return {tenderTree, convert}
-            })();
+            return {tenderTree, convert}
+        })();
 
-            function filterFolders(data) {
-                // 构建ID到节点的映射
-                const idMap = data.reduce((map, node) => {
-                    map[node.ID] = node;
-                    return map;
-                }, {});
+        function filterFolders(data) {
+            // 构建ID到节点的映射
+            const idMap = data.reduce((map, node) => {
+                map[node.ID] = node;
+                return map;
+            }, {});
 
-                // 建立父子关系映射
-                const parentMap = data.reduce((map, node) => {
-                    if (node.parentID !== '-1') {
-                        if (!map[node.parentID]) {
-                            map[node.parentID] = [];
-                        }
-                        map[node.parentID].push(node.ID);
+            // 建立父子关系映射
+            const parentMap = data.reduce((map, node) => {
+                if (node.parentID !== '-1') {
+                    if (!map[node.parentID]) {
+                        map[node.parentID] = [];
                     }
-                    return map;
-                }, {});
+                    map[node.parentID].push(node.ID);
+                }
+                return map;
+            }, {});
 
-                // 检查节点及其子节点是否包含清单(type=1)
-                const hasChecklist = (id) => {
-                    const node = idMap[id];
-                    if (node.type === 2) {
-                        return true;
-                    }
-                    if (!parentMap[id]) {
-                        return false;
-                    }
-                    return parentMap[id].some(childID => hasChecklist(childID));
-                };
+            // 检查节点及其子节点是否包含清单(type=1)
+            const hasChecklist = (id) => {
+                const node = idMap[id];
+                if (node.type === 2) {
+                    return true;
+                }
+                if (!parentMap[id]) {
+                    return false;
+                }
+                return parentMap[id].some(childID => hasChecklist(childID));
+            };
 
-                // 过滤节点
-                const filteredIDs = new Set();
-                data.forEach(node => {
-                    if (node.type === 2 || hasChecklist(node.ID)) {
-                        let currentID = node.ID;
-                        while (currentID !== '-1') {
-                            filteredIDs.add(currentID);
-                            currentID = idMap[currentID].parentID;
-                        }
+            // 过滤节点
+            const filteredIDs = new Set();
+            data.forEach(node => {
+                if (node.type === 2 || hasChecklist(node.ID)) {
+                    let currentID = node.ID;
+                    while (currentID !== '-1') {
+                        filteredIDs.add(currentID);
+                        currentID = idMap[currentID].parentID;
                     }
-                });
+                }
+            });
 
-                // 返回过滤后的数据
-                return data.filter(node => filteredIDs.has(node.ID));
-            }
+            // 返回过滤后的数据
+            return data.filter(node => filteredIDs.has(node.ID));
+        }
 
-            $('#set-dsk-project').click(function () {
-                postData('/profile/dsk/api', {
-                    type: 'save_projects',
-                    tid: window.location.pathname.split('/')[2],
-                    project_list: gsObj.grArray
-                }, function (result) {
-                    // dskAccountData.select_project = result;
-                    dskProjects = gsObj.grArray;
-                    if (!dskAccountData.select_project || dskAccountData.select_project !== result) {
-                        dskAccountData.select_project = result;
-                        changeDskProject(result);
-                        dskBills.spread.refresh();
-                    }
-                    setDskProjectSelect(gsObj.grArray);
-                    $('#add-dsk').modal('hide');
-                });
-            });
-            $('#add-dsk').on('hide.bs.modal', function () {
-                $('#autoTip').hide();
+        $('#set-dsk-project').click(function () {
+            postData('/profile/dsk/api', {
+                type: 'save_projects',
+                tid: window.location.pathname.split('/')[2],
+                project_list: gsObj.grArray
+            }, function (result) {
+                // dskAccountData.select_project = result;
+                dskProjects = gsObj.grArray;
+                if (!dskAccountData.select_project || dskAccountData.select_project !== result) {
+                    dskAccountData.select_project = result;
+                    changeDskProject(result);
+                    dskBills.spread.refresh();
+                }
+                setDskProjectSelect(gsObj.grArray);
+                $('#add-dsk').modal('hide');
             });
+        });
+        $('#add-dsk').on('hide.bs.modal', function () {
+            $('#autoTip').hide();
+        });
 
-            function setDskProjectSelect(projects) {
-                let html = '';
-                for (const project of projects) {
-                    html += `<option value="${project.pid}" ${project.pid === dskAccountData.select_project ? 'selected' : ''}>${project.name}</option>`;
-                }
-                $('#change-dsk-project').html(html);
+        function setDskProjectSelect(projects) {
+            let html = '';
+            for (const project of projects) {
+                html += `<option value="${project.pid}" ${project.pid === dskAccountData.select_project ? 'selected' : ''}>${project.name}</option>`;
             }
+            $('#change-dsk-project').html(html);
+        }
 
-            // 选中所有新增部位/清单
-            $('#add-all-revise').click(function() {
-                const this_cid = window.location.pathname.split('/')[4];
-                makeGclGatherData();
-                postData('/tender/' + window.location.pathname.split('/')[2] + '/change/' + window.location.pathname.split('/')[4] + '/information/save', {
-                    type: 'get-revise-list',
-                }, function (result) {
-                    const addDatas = [];
-                    for (const ggd in gclGatherData) {
-                        gclGatherData[ggd].code = gclGatherData[ggd].b_code;
-                        let hadcid = 0;
-                        for (const xmj of gclGatherData[ggd].leafXmjs) {
-                            const changeLedger = _.find(result.changeLedgerList, {id: xmj.gcl_id});
-                            const changePos = _.find(result.changePosList, {id: xmj.mx_id, lid: xmj.gcl_id});
-                            if (changeLedger || changePos) {
-                                xmj.cid = 1;
-                                xmj.ccid = changePos ? changePos.ccid : changeLedger ? changeLedger.ccid : 0;
-                                hadcid = 1;
-                            }
+        // 选中所有新增部位/清单
+        $('#add-all-revise').click(function() {
+            const this_cid = window.location.pathname.split('/')[4];
+            makeGclGatherData();
+            postData('/tender/' + window.location.pathname.split('/')[2] + '/change/' + window.location.pathname.split('/')[4] + '/information/save', {
+                type: 'get-revise-list',
+            }, function (result) {
+                const addDatas = [];
+                for (const ggd in gclGatherData) {
+                    gclGatherData[ggd].code = gclGatherData[ggd].b_code;
+                    let hadcid = 0;
+                    for (const xmj of gclGatherData[ggd].leafXmjs) {
+                        const changeLedger = _.find(result.changeLedgerList, {id: xmj.gcl_id});
+                        const changePos = _.find(result.changePosList, {id: xmj.mx_id, lid: xmj.gcl_id});
+                        if (changeLedger || changePos) {
+                            xmj.cid = 1;
+                            xmj.ccid = changePos ? changePos.ccid : changeLedger ? changeLedger.ccid : 0;
+                            hadcid = 1;
                         }
-                        if (hadcid !== 0) gclGatherData[ggd].cid = 1;
                     }
-                    for (const gclInfo of _.filter(gclGatherData, {cid: 1})) {
-                        const leafXmjs = _.filter(gclInfo.leafXmjs, {ccid: this_cid});
-                        if (leafXmjs.length > 0) {
-                            gclInfo.is_change = 1;
-                            for (const xmj of leafXmjs) {
-                                if (_.findIndex(changeList, function (item) {
-                                    return item.gcl_id === xmj.gcl_id && item.mx_id === (xmj.mx_id || '');
-                                }) === -1) {
-                                    addDatas.push({
-                                        lid: xmj.gcl_id,
-                                        code: gclInfo.code,
-                                        name: gclInfo.name || '',
-                                        unit: gclInfo.unit || '',
-                                        unit_price: gclInfo.unit_price,
-                                        oamount: xmj.quantity,
-                                        oamount2: xmj.quantity,
-                                        bwmx: xmj.bwmx || xmj.jldy || '',
-                                        xmj_code: xmj.code || '',
-                                        xmj_jldy: xmj.jldy || '',
-                                        xmj_dwgc: xmj.dwgc || '',
-                                        xmj_fbgc: xmj.fbgc || '',
-                                        xmj_fxgc: xmj.fxgc || '',
-                                        gcl_id: xmj.gcl_id,
-                                        mx_id: xmj.mx_id || '',
-                                    });
-                                }
+                    if (hadcid !== 0) gclGatherData[ggd].cid = 1;
+                }
+                for (const gclInfo of _.filter(gclGatherData, {cid: 1})) {
+                    const leafXmjs = _.filter(gclInfo.leafXmjs, {ccid: this_cid});
+                    if (leafXmjs.length > 0) {
+                        gclInfo.is_change = 1;
+                        for (const xmj of leafXmjs) {
+                            if (_.findIndex(changeList, function (item) {
+                                return item.gcl_id === xmj.gcl_id && item.mx_id === (xmj.mx_id || '');
+                            }) === -1) {
+                                addDatas.push({
+                                    lid: xmj.gcl_id,
+                                    code: gclInfo.code,
+                                    name: gclInfo.name || '',
+                                    unit: gclInfo.unit || '',
+                                    unit_price: gclInfo.unit_price,
+                                    oamount: xmj.quantity,
+                                    oamount2: xmj.quantity,
+                                    bwmx: xmj.bwmx || xmj.jldy || '',
+                                    xmj_code: xmj.code || '',
+                                    xmj_jldy: xmj.jldy || '',
+                                    xmj_dwgc: xmj.dwgc || '',
+                                    xmj_fbgc: xmj.fbgc || '',
+                                    xmj_fxgc: xmj.fxgc || '',
+                                    gcl_id: xmj.gcl_id,
+                                    mx_id: xmj.mx_id || '',
+                                });
                             }
                         }
                     }
-                    console.log(addDatas);
-                    if (addDatas.length > 0) {
-                        // 更新至服务器
-                        postData('/tender/' + window.location.pathname.split('/')[2] + '/change/' + window.location.pathname.split('/')[4] + '/information/save', {
-                            type: 'add-change-list',
-                            postData: addDatas,
-                        }, function (result) {
-                            toastr.success('已新增当前变更令新增的所有部位/清单');
-                            changeList = result.changeList;
-                            const sortData = SpreadJsObj.getSortData(billsSheet);
-                            const billsNodes = _.filter(sortData, function (item) {
-                                return _.findIndex(addDatas, {gcl_id: item.id}) !== -1;
-                            });
-                            for (const billsNode of billsNodes) {
-                                billsNode.is_change = 1;
-                            }
-                            const loadResult = { update: billsNodes };
-                            billsTreeSpreadObj.refreshTree(billsSheet, loadResult);
-                            posSpreadObj.loadCurPosData();
+                }
+                console.log(addDatas);
+                if (addDatas.length > 0) {
+                    // 更新至服务器
+                    postData('/tender/' + window.location.pathname.split('/')[2] + '/change/' + window.location.pathname.split('/')[4] + '/information/save', {
+                        type: 'add-change-list',
+                        postData: addDatas,
+                    }, function (result) {
+                        toastr.success('已新增当前变更令新增的所有部位/清单');
+                        changeList = result.changeList;
+                        const sortData = SpreadJsObj.getSortData(billsSheet);
+                        const billsNodes = _.filter(sortData, function (item) {
+                            return _.findIndex(addDatas, {gcl_id: item.id}) !== -1;
                         });
-                    } else {
-                        toastr.warning('未存在当前变更令新增的部位/清单');
-                    }
-                });
+                        for (const billsNode of billsNodes) {
+                            billsNode.is_change = 1;
+                        }
+                        const loadResult = { update: billsNodes };
+                        billsTreeSpreadObj.refreshTree(billsSheet, loadResult);
+                        posSpreadObj.loadCurPosData();
+                    });
+                } else {
+                    toastr.warning('未存在当前变更令新增的部位/清单');
+                }
             });
-        }
+        });
     }
 });
 function findDecimal(unit) {

app/service/tender.js

@@ -123,7 +123,7 @@ module.exports = app => {
                     '        t.id IN ( SELECT cpla.`tid` FROM ' + this.ctx.service.changePlanAudit.tableName + ' AS cpla WHERE cpla.`aid` = ' + session.sessionUser.accountId + ' GROUP BY cpla.`tid`))' : '';
                 const changeProjectXsSql = this.ctx.subProject.page_show.openChangeProject ? '    OR (t.`ledger_status` = ' + auditConst.ledger.status.checked + ' AND ' +
                     '        t.id IN ( SELECT cpxa.`tid` FROM ' + this.ctx.service.changeProjectXsAudit.tableName + ' AS cpxa WHERE cpxa.`aid` = ' + session.sessionUser.accountId + ' GROUP BY cpxa.`tid`))' : '';
-                const xxjdSql = this.ctx.subProject.page_show.xxjd ? '    OR (t.id IN ( SELECT xxjd.`tid` FROM ' + this.ctx.service.scheduleAudit.tableName + ' AS xxjd WHERE xxjd.`permission` != 0 AND xxjd.`audit_id` = ' + session.sessionUser.accountId + ' GROUP BY xxjd.`tid`))' : '';
+                const xxjdSql = session.sessionProject.page_show.xxjd ? '    OR (t.id IN ( SELECT xxjd.`tid` FROM ' + this.ctx.service.scheduleAudit.tableName + ' AS xxjd WHERE xxjd.`permission` != 0 AND xxjd.`audit_id` = ' + session.sessionUser.accountId + ' GROUP BY xxjd.`tid`))' : '';
                 sql = 'SELECT t.`id`, t.`project_id`, t.`name`, t.`status`, t.`category`, t.`ledger_times`, t.`ledger_status`, t.`measure_type`, t.`user_id`, t.`create_time`, t.`total_price`, t.`deal_tp`,' +
                     '    pa.`name` As `user_name`, pa.`role` As `user_role`, pa.`company` As `user_company` ' +
                     // '  FROM ?? As t, ?? As pa ' +

app/view/change/addlist.ejs

@@ -16,11 +16,9 @@
                     </div>
                 </div>
             </div>
-            <% if (ctx.session.sessionProject.page_show.openChangeRevise) { %>
             <div class="ml-auto">
                 <a class="btn btn-sm btn-primary mr-1" id="add-all-revise" href="javascript: void(0);">勾选当前新增部位/清单</a>
             </div>
-            <% } %>
         </div>
     </div>
     <div class="content-wrap row pr-46">

app/view/change/information_modal.ejs

@@ -51,12 +51,10 @@
                                 <div class="search-group">
                                     <div class="input-group input-group-sm">
                                         <div class="input-group-prepend">
-                                            <% if (ctx.session.sessionProject.page_show.openChangeRevise) { %>
-                                                <select class="input-group-text" id="select-list">
-                                                    <option value="0" selected>所有清单</option>
-                                                    <option value="1">新增清单</option>
-                                                </select>
-                                            <% } %>
+                                            <select class="input-group-text" id="select-list">
+                                                <option value="0" selected>所有清单</option>
+                                                <option value="1">新增清单</option>
+                                            </select>
                                         </div>
                                         <input class="form-control form-control-sm" style="width:300px;" id="list-input" placeholder="输入 清单编号、名称 检索" value="">
                                         <a href="javascript:void(0);" style="display: none" data-btn="list" class="text-danger remove-btn" title="移除关键词"><i class="fa fa-times-circle "></i></a>
@@ -92,11 +90,9 @@
                             <div class="d-flex justify-content-between align-items-center">
                                 <div>请选择清单所属部位</div>
                                 <div class="d-flex justify-content-start search-group">
-                                    <% if (ctx.session.sessionProject.page_show.openChangeRevise) { %>
                                         <span>
                                 <a href="/tender/<%- change.tid %>/change/<%- change.cid %>/information/revise" class="btn btn-primary btn-sm mr-2" style="padding: 0.25rem 0.5rem;">新增部位/清单</a>
                             </span>
-                                    <% } %>
                                     <input class="form-control form-control-sm" id="code-input" style="width:350px;" placeholder="输入 项目节编号、细目、计量单元 检索">
                                     <a href="javascript:void(0);" style="display: none" data-btn="code" class="text-danger remove-btn" title="移除关键词"><i class="fa fa-times-circle "></i></a>
                                 </div>

app/view/change/revise.ejs

@@ -26,7 +26,6 @@
                         </div>
                     </div>
                 </div>
-                <% if (ctx.session.sessionProject.page_show.openChangeRevise) { %>
                 <div class="d-inline-block">
                     <a href="javascript: void(0);" name="base-opr" type="add" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="新增"><i class="fa fa-plus" aria-hidden="true"></i></a>
                     <a href="javascript: void(0);" name="base-opr" type="delete" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
@@ -38,7 +37,6 @@
                     <a href="javascript: void(0);" name="cpc" type="cut" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="剪切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
                     <a href="javascript: void(0);" name="cpc" type="paste" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="粘贴"><i class="fa fa-clipboard" aria-hidden="true"></i></a>
                 </div>
-                <% } %>
                 <div class="d-inline-block">
                     <div class="input-group input-group-sm ml-2">
                         <div class="input-group-prepend">
@@ -48,12 +46,10 @@
                     </div>
                 </div>
             </div>
-            <% if (ctx.session.sessionProject.page_show.openChangeRevise) { %>
             <div class="ml-auto">
                 <a class="btn btn-sm btn-primary mr-1" id="add-all-revise" href="javascript: void(0);">勾选当前新增部位/清单</a>
                 <a class="btn btn-sm btn-primary mr-1" id="ledger-check2" href="javascript: void(0);">数据检查</a>
             </div>
-            <% } %>
         </div>
     </div>
     <div class="content-wrap row pr-46">
@@ -72,14 +68,12 @@
                             <li class="nav-item">
                                 <a class="nav-link active" href="javascript:void(0)">计量单元</a>
                             </li>
-                            <% if (ctx.session.sessionProject.page_show.openChangeRevise) { %>
                             <li class="ml-2 nav-item">
                                 <div class="d-inline-flex">
                                     <a href="javascript: void(0);" name="pos-opr" type="down-move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
                                     <a href="javascript: void(0);" name="pos-opr" type="up-move" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
                                 </div>
                             </li>
-                            <% } %>
                             <li class="nav-item" id="pos-search">
                             </li>
                             <li class="nav-item">
@@ -104,7 +98,6 @@
                 <div class="tab-content">
                     <div id="search" class="tab-pane">
                     </div>
-                    <% if (ctx.session.sessionProject.page_show.openChangeRevise) { %>
                     <div id="std-xmj" class="tab-pane">
                     </div>
                     <div id="std-gcl" class="tab-pane">
@@ -141,7 +134,6 @@
                             </div>
                         </div>
                     </div>
-                    <% } %>
                 </div>
             </div>
         </div>
@@ -152,7 +144,6 @@
                 <li class="nav-item">
                     <a class="nav-link" content="#search" href="javascript: void(0);">查找定位</a>
                 </li>
-                <% if (ctx.session.sessionProject.page_show.openChangeRevise) { %>
                 <li class="nav-item">
                     <a class="nav-link" content="#std-xmj" href="javascript: void(0);">项目节</a>
                 </li>
@@ -171,7 +162,6 @@
                 <li class="nav-item">
                     <a class="nav-link" content="#dsk-list" href="javascript: void(0);">新增清单</a>
                 </li>
-                <% } %>
             </ul>
         </div>
     </div>
@@ -196,6 +186,5 @@
     const oldChangeList = _.cloneDeep(changeList);
     const settleBills = JSON.parse(unescape('<%- escape(JSON.stringify(settleBills)) %>'));
     const settlePos = JSON.parse(unescape('<%- escape(JSON.stringify(settlePos)) %>'));
-    const openRevise = <%- ctx.session.sessionProject.page_show.openChangeRevise %>;
     const precision = JSON.parse('<%- JSON.stringify(precision) %>');
 </script>

app/view/change/revise_modal.ejs

@@ -17,7 +17,6 @@
     </div>
     <script type="text/javascript">$('#unedit2').modal('show');</script>
 <% } %>
-<% if (ctx.session.sessionProject.page_show.openChangeRevise) { %>
 <!--批量添加清单部位-->
 <div class="modal fade" id="batch" data-backdrop="static">
     <div class="modal-dialog modal-xl" role="document">
@@ -130,4 +129,3 @@
 <% include ../shares/delete_hint_modal.ejs %>
 <% include ../shares/check_data_modal.ejs %>
 <% include ../shares/check_modal2.ejs %>
-<% } %>

app/view/tender/detail.ejs

@@ -64,7 +64,7 @@
                             管理员
                         </a>
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
-                            <% if (ctx.subProject.page_show !== null && parseInt(ctx.subProject.page_show.xxjd) === 1) { %>
+                            <% if (ctx.session.sessionProject.page_show !== null && parseInt(ctx.session.sessionProject.page_show.xxjd) === 1) { %>
                                 <a href="#xxjd-set" data-toggle="modal" data-target="#xxjd-set" class="dropdown-item">投资进度</a>
                             <% } %>
                             <a href="/tender/<%- tender.id %>/shenpi" class="dropdown-item">审批流程</a>

app/view/tender/detail_modal.ejs

@@ -3016,7 +3016,7 @@
         })
     </script>
 <% } %>
-<% if (ctx.subProject.page_show.xxjd && ctx.session.sessionUser.is_admin) { %>
+<% if (ctx.session.sessionProject.page_show.xxjd && ctx.session.sessionUser.is_admin) { %>
     <!--标段设置-投资进度-->
     <div class="modal fade" id="xxjd-set" data-backdrop="static">
         <div class="modal-dialog" role="document">

app/view/tender/tender_sub_menu.ejs

@@ -61,7 +61,7 @@
             </ul>
         </div>
         <% } %>
-        <% if (ctx.subProject.page_show.xxjd && (ctx.tender.schedule_permission !== 0 || ctx.tender.isTourist)) { %>
+        <% if (ctx.session.sessionProject.page_show.xxjd && (ctx.tender.schedule_permission !== 0 || ctx.tender.isTourist)) { %>
         <div class="nav-box">
             <h3><i class="fa fa-bar-chart fa-fw"></i> 投资进度</h3>
             <ul class="nav-list list-unstyled sub-list">

app/view/tender/tender_sub_mini_menu.ejs

@@ -55,7 +55,7 @@
             </ul>
         </div>
         <% } %>
-        <% if (ctx.subProject.page_show.xxjd && (ctx.tender.schedule_permission !== 0 || ctx.tender.isTourist)) { %>
+        <% if (ctx.session.sessionProject.page_show.xxjd && (ctx.tender.schedule_permission !== 0 || ctx.tender.isTourist)) { %>
             <div class="nav-box">
                 <h3><i class="fa fa-bar-chart fa-fw"></i> 投资进度</h3>
                 <ul class="nav-list list-unstyled sub-list">