MaiXinRong 3 роки тому
батько
коміт
7bf006ed08

+ 0 - 11
app/controller/revise_controller.js

@@ -1011,8 +1011,6 @@ module.exports = app => {
                     return spec;
                 case 'tags':
                     return await this.ctx.service.ledgerTag.getDatas(ctx.tender.id);
-                case 'price':
-                    return await this.ctx.service.revisePriceChange.getAllDataByCondition({ where: { rid: ctx.revise.id } });
             }
         }
 
@@ -1057,15 +1055,6 @@ module.exports = app => {
             };
             await this.layout('revise/bwtz.ejs', renderData);
         }
-
-        async price(ctx) {
-            if (!ctx.revise) throw '台账修订数据有误';
-            const renderData = {
-                revise: ctx.revise,
-                jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.revise.price)
-            };
-            await this.layout('revise/price.ejs', renderData);
-        }
     }
 
     return ReviseController;

+ 0 - 53
app/public/js/revise_price.js

@@ -1,53 +0,0 @@
-'use strict';
-
-/**
- *
- *
- * @author Mai
- * @date
- * @version
- */
-
-$(document).ready(() => {
-    autoFlashHeight();
-
-    const priceSpread = SpreadJsObj.createNewSpread($('#price-spread')[0]);
-    const priceSheet = priceSpread.getActiveSheet();
-
-    const priceSpreadSetting = {
-        cols: [
-            { title: '清单编号', colSpan: '1', rowSpan: '2', field: 'b_code', hAlign: 0, width: 100, formatter: '@', readOnly: true },
-            { title: '名称', colSpan: '1', rowSpan: '2', field: 'name', hAlign: 0, width: 210, formatter: '@', readOnly: true },
-            { title: '单位', colSpan: '1', rowSpan: '2', field: 'unit', hAlign: 1, width: 60, formatter: '@', readOnly: true },
-            { title: '当前单价', colSpan: '1', rowSpan: '2', field: 'unit_price', hAlign: 2, width: 80, type: 'Number', readOnly: true },
-            { title: '变更后单价', colSpan: '1', rowSpan: '2', field: 'new_price', hAlign: 2, width: 80, type: 'Number' },
-            { title: '备注', colSpan: '1', rowSpan: '2', field: 'new_price', hAlign: 2, width: 150, formatter: '@' },
-        ],
-        emptyRows: 0,
-        headRows: 1,
-        headRowHeight: [32],
-        headColWidth: [30],
-        defaultRowHeight: 21,
-        headerFont: '12px 微软雅黑',
-        font: '12px 微软雅黑',
-    };
-    SpreadJsObj.initSheet(priceSheet, priceSpreadSetting);
-
-    $.subMenu({
-        menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
-        toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
-        key: 'menu.1.0.0',
-        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1',
-        callback: function (info) {
-            if (info.mini) {
-                $('.panel-title').addClass('fluid');
-                $('#sub-menu').removeClass('panel-sidebar');
-            } else {
-                $('.panel-title').removeClass('fluid');
-                $('#sub-menu').addClass('panel-sidebar');
-            }
-            autoFlashHeight();
-            priceSpread.refresh();
-        }
-    });
-});

+ 0 - 3
app/router.js

@@ -227,9 +227,6 @@ module.exports = app => {
     app.get('/tender/:id/revise/compare', sessionAuth, tenderCheck, uncheckTenderCheck, reviseAuditCheck, 'reviseController.compare');
     app.get('/tender/:id/revise/gcl-compare', sessionAuth, tenderCheck, uncheckTenderCheck, reviseAuditCheck, 'reviseController.gclCompare');
     app.post('/tender/:id/revise/load', sessionAuth, tenderCheck, uncheckTenderCheck, reviseCheck, reviseAuditCheck, 'reviseController.loadData');
-    // 单价调整
-    app.get('/tender/:id/revise/price', sessionAuth, tenderCheck, uncheckTenderCheck, reviseCheck, reviseAuditCheck, 'reviseController.price');
-
 
     // 查看修订数据
     app.get('/tender/:id/revise/history/:rid', sessionAuth, tenderCheck, uncheckTenderCheck, reviseCheck, 'reviseController.history');

+ 0 - 27
app/service/revise_price_change.js

@@ -1,27 +0,0 @@
-'use strict';
-
-/**
- *
- *
- * @author Mai
- * @date
- * @version
- */
-
-module.exports = app => {
-    class RevisePriceChange extends app.BaseService {
-
-        /**
-         * 构造函数
-         *
-         * @param {Object} ctx - egg全局变量
-         * @return {void}
-         */
-        constructor(ctx) {
-            super(ctx);
-            this.tableName = 'revise_price_change';
-        }
-    }
-
-    return RevisePriceChange;
-};

+ 0 - 42
app/view/revise/price.ejs

@@ -1,42 +0,0 @@
-<% include ./sub_menu.ejs %>
-<div class="panel-content">
-    <div class="panel-title">
-        <div class="title-main  d-flex">
-            <% include ./sub_mini_menu.ejs %>
-            单价调整
-        </div>
-    </div>
-    <div class="content-wrap row pr-46">
-        <div class="c-header p-0 col-12"></div>
-        <!--核心内容(两栏)-->
-        <div class="row w-100 sub-content">
-            <!--左栏-->
-            <div class="c-body" id="left-view" style="width: 100%">
-                <!--0号台账模式-->
-                <div class="sjs-height-0" style="overflow: hidden" id="price-spread">
-                </div>
-            </div>
-            <!--右栏-->
-            <div class="c-body" id="right-view" style="display: none; width: 33%;">
-                <div class="resize-x" id="revise-right-spr" r-Type="width" div1="#left-view" div2="#right-view" title="调整大小" a-type="percent"><!--调整左右高度条--></div>
-                <div class="tab-content">
-                    <div id="ledgerGcl" class="tab-pane">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!--右侧菜单-->
-        <div class="side-menu">
-            <!--右侧菜单-->
-            <ul class="nav flex-column right-nav" id="side-menu">
-                <li class="nav-item">
-                    <a class="nav-link" content="#ledgerGcl" href="javascript: void(0);">台账清单</a>
-                </li>
-            </ul>
-        </div>
-    </div>
-</div>
-<script src="/public/js/moment/moment.min.js"></script>
-<script>
-    const readOnly = <%- ctx.revise.readOnly %>;
-</script>

+ 0 - 1
app/view/revise/sub_menu_list.ejs

@@ -1,5 +1,4 @@
 <nav-menu title="返回" url="/tender/<%= ctx.tender.id %>/revise" tclass="text-primary" ml="1" icon="fa-chevron-left"></nav-menu>
 <nav-menu title="台账修订" url="/tender/<%= ctx.tender.id %>/revise/info" ml="3" active="<%= ctx.url.indexOf('revise/info') %>"></nav-menu>
-<nav-menu title="单价调整" url="/tender/<%= ctx.tender.id %>/revise/price" ml="3" active="<%= ctx.url.indexOf('revise/price') %>"></nav-menu>
 <nav-menu title="台账对比" url="/tender/<%= ctx.tender.id %>/revise/compare" ml="3" active="<%= ctx.url.indexOf('revise/compare') %>"></nav-menu>
 <nav-menu title="清单对比" url="/tender/<%= ctx.tender.id %>/revise/gcl-compare" ml="3" active="<%= ctx.url.indexOf('revise/gcl-compare') %>"></nav-menu>

+ 0 - 14
config/web.js

@@ -261,20 +261,6 @@ const JsFiles = {
                 ],
                 mergeFile: 'revise_history',
             },
-            price: {
-                files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/component/menu.js'],
-                mergeFiles: [
-                    '/public/js/sub_menu.js',
-                    '/public/js/div_resizer.js',
-                    '/public/js/spreadjs_rela/spreadjs_zh.js',
-                    '/public/js/shares/sjs_setting.js',
-                    '/public/js/zh_calc.js',
-                    '/public/js/gcl_gather.js',
-                    '/public/js/path_tree.js',
-                    '/public/js/revise_price.js',
-                ],
-                mergeFile: 'revise_price',
-            },
             compare: {
                 files: [
                     '/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js',