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

app/const/page_show.js

@@ -33,6 +33,7 @@ const defaultSetting = {
     closeWatermark: 0,
     openSign: 0,
     openNetCaSign: 0,
+    openChangeRevise: 0,
 };
 
 

app/controller/change_controller.js

@@ -938,9 +938,9 @@ module.exports = app => {
                 const lastRevise = await ctx.service.ledgerRevise.getLastestRevise(ctx.tender.id);
                 const data = JSON.parse(ctx.request.body.data);
                 const ledgerData = await ctx.service.ledger.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 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 posData = await ctx.service.pos.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 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 dealBills = await ctx.service.dealBills.getAllDataByCondition({ where: { tender_id: ctx.tender.id } });
                 // 标记ledger，搜索需求
                 if (changePosData.length > 0) {
@@ -1521,6 +1521,9 @@ module.exports = app => {
          */
         async reviseInfo(ctx) {
             try {
+                if (!ctx.session.sessionProject.page_show.openChangeRevise) {
+                    throw '该功能已关闭';
+                }
                 const change = ctx.change;
                 let edit = true;
                 let changing = false;
@@ -1606,6 +1609,9 @@ 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/public/js/change_information_set.js

@@ -441,6 +441,15 @@ $(document).ready(() => {
                 gclGatherData.splice(ggd, 1);
             }
             gclGatherData[ggd].code = gclGatherData[ggd].b_code;
+            let hadcid = 0;
+            for (const xmj of gclGatherData[ggd].leafXmjs) {
+                if (_.findIndex(changeLedgerList, { id: xmj.gcl_id }) !== -1 || _.findIndex(changePosList, { id: xmj.mx_id, lid: xmj.gcl_id }) !== -1) {
+                    xmj.cid = 1;
+                    hadcid = 1;
+                }
+            }
+
+            if (hadcid !== 0) gclGatherData[ggd].cid = 1;
         }
         // 数组去重
         const dealBillList = result.dealBills;
@@ -467,7 +476,7 @@ $(document).ready(() => {
             const lid = gcl.leafXmjs !== undefined && gcl.leafXmjs !== null ? (gcl.leafXmjs.length !== 0 ? gcl.leafXmjs[0].gcl_id : false) : gcl.id;
             if (lid) {
                 listHtml += '<tr data-lid="' + lid + '"' + gclhtml + ' data-index="' + list_index + '" data-bwmx="">' +
-                    '<td class="text-center">' + list_index + '</td>' +
+                    '<td class="text-center">' + list_index + (gcl.cid ? '<i class="text-danger" style="font-weight: 900">*</i>' : '') + '</td>' +
                     '<td>' + gcl.code + '</td>' +
                     '<td class="text-left">' + gcl.name + '</td>' +
                     '<td class="text-center">' + unit + '</td>' +
@@ -628,7 +637,7 @@ $(document).ready(() => {
         const isCheck = $(this).hasClass('table-success') ? true : false;
         const data_bwmx = $(this).attr('data-bwmx').split('$#$');
         const isDeal = $(this).data('gcl') !== undefined ? true : false;
-        let codeHtml = '<tr quantity="'+ $(this).children('td').eq(5).text() +'" gcl_id="" mx_id=""><td colspan="7" class="colspan_1">&nbsp;</td><td class="colspan_2"><input type="checkbox"></td></tr>';
+        let codeHtml = '<tr quantity="'+ $(this).children('td').eq(5).text() +'" gcl_id="" mx_id=""><td class="text-center">1</td><td colspan="7" class="colspan_1">&nbsp;</td><td class="colspan_2"><input type="checkbox"></td></tr>';
         if (isDeal) {
             const lid = $(this).data('lid');
             let gcl = _.find(gclGatherData, function (item) {
@@ -638,7 +647,7 @@ $(document).ready(() => {
                 gcl = gclGatherData[$(this).data('gcl')];
             }
             codeHtml = '';
-            for (const leaf of gcl.leafXmjs) {
+            for (const [index, leaf] of gcl.leafXmjs.entries()) {
                 const quantity = leaf.quantity !== undefined && leaf.quantity !== null ? leaf.quantity : 0;
                 const gcl_id = leaf.gcl_id ? leaf.gcl_id : '';
                 const mx_id = leaf.mx_id ? leaf.mx_id : '';
@@ -651,7 +660,9 @@ $(document).ready(() => {
                     'checked' : '';
                 const isUsed = _.find(changeUsedData, { gcl_id: leaf.gcl_id, bwmx: (bwmx ? bwmx : leaf.jldy ? leaf.jldy : ''), oamount: leaf.quantity });
                 const isDisabled = isUsed ? 'disabled ' : '';
-                codeHtml += '<tr quantity="' + quantity + '" gcl_id="' + gcl_id + '" mx_id="' + mx_id + '"><td>' + leaf.code + '</td>' +
+                codeHtml += '<tr quantity="' + quantity + '" gcl_id="' + gcl_id + '" mx_id="' + mx_id + '">' +
+                    '<td class="text-center">' + (index+1) + (leaf.cid ? '<i class="text-danger" style="font-weight: 900">*</i>' : '') + '</td>' +
+                    '<td>' + leaf.code + '</td>' +
                     '<td>' + (leaf.jldy ? leaf.jldy: '') + '</td>' +
                     '<td>' + (leaf.dwgc ? leaf.dwgc : '') + '</td>' +
                     '<td>' + (leaf.fbgc ? leaf.fbgc : '') + '</td>' +
@@ -662,9 +673,9 @@ $(document).ready(() => {
                     '></td></tr>';
             }
         } else if (!isDeal && isCheck) {
-            codeHtml = '<tr quantity="'+ $(this).children('td').eq(5).text() +'" gcl_id="" mx_id=""><td colspan="7" class="colspan_1">&nbsp;</td><td class="colspan_2"><input type="checkbox" checked></td></tr>';
+            codeHtml = '<tr quantity="'+ $(this).children('td').eq(5).text() +'" gcl_id="" mx_id=""><td class="text-center">1</td><td colspan="7" class="colspan_1">&nbsp;</td><td class="colspan_2"><input type="checkbox" checked></td></tr>';
         }
-        $('#code-list').attr('data-index', $(this).children('td').eq(0).text());
+        $('#code-list').attr('data-index', parseInt($(this).children('td').eq(0).text()));
         $('#code-input').val('');
         $('#code-input').siblings('a').hide();
         $('#code-list').html(codeHtml);
@@ -687,13 +698,13 @@ $(document).ready(() => {
                 const length = tr.children('td').length;
                 const gcl_id = tr.attr('gcl_id');
                 const mx_id = tr.attr('mx_id');
-                const bwmx = length === 8 ?
-                    tr.children('td').eq(0).text() + '!_!' +
+                const bwmx = length === 9 ?
                     tr.children('td').eq(1).text() + '!_!' +
                     tr.children('td').eq(2).text() + '!_!' +
                     tr.children('td').eq(3).text() + '!_!' +
-                    tr.children('td').eq(4).text() + '!_!' + gcl_id + '!_!' + mx_id + '!_!' +
-                    (tr.children('td').eq(5).text() !== '' ? tr.children('td').eq(5).text() : tr.children('td').eq(1).text()) : '0';
+                    tr.children('td').eq(4).text() + '!_!' +
+                    tr.children('td').eq(5).text() + '!_!' + gcl_id + '!_!' + mx_id + '!_!' +
+                    (tr.children('td').eq(6).text() !== '' ? tr.children('td').eq(6).text() : tr.children('td').eq(2).text()) : '0';
                 const quantity = tr.attr('quantity');
                 const de_qu = bwmx + '*;*' + quantity;
                 data_bwmx.push(de_qu);
@@ -710,13 +721,13 @@ $(document).ready(() => {
                     const length = tr.children('td').length;
                     const gcl_id = tr.attr('gcl_id');
                     const mx_id = tr.attr('mx_id');
-                    const bwmx = length === 8 ?
-                        tr.children('td').eq(0).text() + '!_!' +
+                    const bwmx = length === 9 ?
                         tr.children('td').eq(1).text() + '!_!' +
                         tr.children('td').eq(2).text() + '!_!' +
                         tr.children('td').eq(3).text() + '!_!' +
-                        tr.children('td').eq(4).text() + '!_!' + gcl_id + '!_!' + mx_id + '!_!' +
-                        (tr.children('td').eq(5).text() !== '' ? tr.children('td').eq(5).text() : tr.children('td').eq(1).text()) : '0';
+                        tr.children('td').eq(4).text() + '!_!' +
+                        tr.children('td').eq(5).text() + '!_!' + gcl_id + '!_!' + mx_id + '!_!' +
+                        (tr.children('td').eq(6).text() !== '' ? tr.children('td').eq(6).text() : tr.children('td').eq(2).text()) : '0';
                     const quantity = tr.attr('quantity');
                     const de_qu = bwmx + '*;*' + quantity;
                     data_bwmx.push(de_qu);
@@ -768,10 +779,55 @@ $(document).ready(() => {
         $('input[name="code"]').val(code);
     });
 
+    $('#select-list').change(function () {
+        const select = parseInt($(this).val());
+        let showListData = changeListData;
+        const value = $('#list-input').val();
+        if (select === 1) {
+            if (value !== '') {
+                $('#list-input').siblings('a').show();
+                showListData = _.filter(changeListData, function (c) {
+                    return ((c.code && c.code.indexOf(value) !== -1) || (c.name && c.name.indexOf(value) !== -1)) && c.cid;
+                });
+            } else {
+                $('#list-input').siblings('a').hide();
+                showListData = _.filter(changeListData, function (c) {
+                    return c.cid;
+                });
+            }
+        } else {
+            if (value !== '') {
+                $('#list-input').siblings('a').show();
+                showListData = _.filter(changeListData, function (c) {
+                    return (c.code && c.code.indexOf(value) !== -1) || (c.name && c.name.indexOf(value) !== -1);
+                });
+            } else {
+                $('#list-input').siblings('a').hide();
+            }
+        }
+        makeListTable(changeListData, showListData);
+        $('#table-list-select tr').removeClass('table-warning');
+        $('#code-input').val('');
+        $('#code-input').siblings('a').hide();
+        $('#code-list').html('');
+        $('#code-select-all').prop('checked', false);
+    });
+
     $('#list-input').on('valuechange', function (e, previous) {
+        const select = parseInt($('#select-list').val());
         const value = $(this).val();
         let showListData = changeListData;
-        if (value !== '') {
+        if (select === 1 && value !== '') {
+            $(this).siblings('a').show();
+            showListData = _.filter(changeListData, function (c) {
+                return ((c.code && c.code.indexOf(value) !== -1) || (c.name && c.name.indexOf(value) !== -1)) && c.cid;
+            });
+        } else if (select === 1 && value === '') {
+            $(this).siblings('a').hide();
+            showListData = _.filter(changeListData, function (c) {
+                return c.cid;
+            });
+        } else if (value !== '') {
             $(this).siblings('a').show();
             showListData = _.filter(changeListData, function (c) {
                 return (c.code && c.code.indexOf(value) !== -1) || (c.name && c.name.indexOf(value) !== -1);
@@ -802,7 +858,14 @@ $(document).ready(() => {
         $(this).hide();
         $(this).siblings('input').val('');
         if ($(this).data('btn') === 'list') {
-            makeListTable(changeListData);
+            const select = parseInt($('#select-list').val());
+            let showListData = changeListData;
+            if (select === 1) {
+                showListData = _.filter(changeListData, function (c) {
+                    return c.cid;
+                });
+            }
+            makeListTable(changeListData, showListData);
             $('#table-list-select tr').removeClass('table-warning');
             $('#code-list').html('');
         } else {
@@ -837,13 +900,13 @@ $(document).ready(() => {
                     const length = tr.children('td').length;
                     const gcl_id = tr.attr('gcl_id');
                     const mx_id = tr.attr('mx_id');
-                    const bwmx = length === 8 ?
-                        tr.children('td').eq(0).text() + '!_!' +
+                    const bwmx = length === 9 ?
                         tr.children('td').eq(1).text() + '!_!' +
                         tr.children('td').eq(2).text() + '!_!' +
                         tr.children('td').eq(3).text() + '!_!' +
-                        tr.children('td').eq(4).text() + '!_!' + gcl_id + '!_!' + mx_id + '!_!' +
-                        (tr.children('td').eq(5).text() !== '' ? tr.children('td').eq(5).text() : tr.children('td').eq(1).text()) : '0';
+                        tr.children('td').eq(4).text() + '!_!' +
+                        tr.children('td').eq(5).text() + '!_!' + gcl_id + '!_!' + mx_id + '!_!' +
+                        (tr.children('td').eq(6).text() !== '' ? tr.children('td').eq(6).text() : tr.children('td').eq(2).text()) : '0';
                     const quantity = tr.attr('quantity');
                     const de_qu = bwmx + '*;*' + quantity;
                     data_bwmx.push(de_qu);
@@ -1174,10 +1237,10 @@ function makeCodeTable(search = '') {
     }
     for(let i = 0; i < $('#code-list tr').length; i++) {
         const length = $('#code-list tr').eq(i).children('td').length;
-        if (length === 8) {
-            const code = $('#code-list tr').eq(i).children('td').eq(0).text();
-            const name = $('#code-list tr').eq(i).children('td').eq(1).text();
-            const jldy = $('#code-list tr').eq(i).children('td').eq(5).text();
+        if (length === 9) {
+            const code = $('#code-list tr').eq(i).children('td').eq(1).text();
+            const name = $('#code-list tr').eq(i).children('td').eq(2).text();
+            const jldy = $('#code-list tr').eq(i).children('td').eq(6).text();
             const isShow = code.indexOf(search) !== -1 || name.indexOf(search) !== -1 || jldy.indexOf(search) !== -1;
             $('#code-list tr').eq(i).css('display', (isShow ? 'table-row' : 'none'));
         } else {

app/public/js/change_revise.js

@@ -336,7 +336,7 @@ $(document).ready(() => {
                 && first.level > 2 && ((!posRange || posRange.length === 0) || tree.isLastSibling(last)) && upPower && first.ccid);
             const preNodePosRange = preNode ? pos.getLedgerPos(preNode.id) : [];
             setObjEnable($('a[name=base-opr][type=down-level]'), valid && first && sameParent
-                && first.level > 1 && preNode && preNode.ccid && (!preNodePosRange || preNodePosRange.length === 0) && !preNode.used && first.ccid);
+                && first.level > 1 && preNode && (preNode.code || (!preNode.code && preNode.ccid && (!preNodePosRange || preNodePosRange.length === 0))) && !preNode.used && first.ccid);
             setObjEnable($('#cut'), valid);
             setObjEnable($('#paste'), valid);
         },

app/view/change/information_modal.ejs

@@ -116,8 +116,18 @@
                 <div class="row">
                     <div class="col-12">
                         <div class="mb-2 col-6 p-0 search-group">
-                            <input class="form-control form-control-sm" 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>
+                            <div class="input-group input-group-sm pb-1">
+                                <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>
+                                    <% } %>
+                                </div>
+                                <input class="form-control form-control-sm" 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>
+                            </div>
                         </div>
                         <div style="overflow-y:auto" class="sjs-biangeng-height">
                             <table class="table table-striped table-bordered table-hover table-sm fixed_headers">
@@ -130,14 +140,19 @@
                     <div class="col-12">
                         <div class="row mb-2 mt-3 mx-0 p-0">
                             <div class="col-6 p-0 search-group">
-                                <input class="form-control form-control-sm" id="code-input" 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 class="input-group input-group-sm pb-1">
+                                    <div class="input-group-prepend"></div>
+                                    <input class="form-control form-control-sm" id="code-input" 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>
                             </div>
-                            <div class="col-3 pl-3 mt-1">
+                            <% if (ctx.session.sessionProject.page_show.openChangeRevise) { %>
+                            <div class="col-3 pl-3">
                                 <a href="/tender/<%- change.tid %>/change/<%- change.cid %>/information/revise" class="btn btn-primary btn-sm">新增部位</a>
                             </div>
-                            <div class="ml-auto mt-1">
-                                <div class="custom-control custom-checkbox mt-1">
+                            <% } %>
+                            <div class="ml-auto">
+                                <div class="custom-control custom-checkbox">
                                     <input type="checkbox" id="code-select-all" class="custom-control-input">
                                     <label class="custom-control-label" for="code-select-all">全选</label>
                                 </div>
@@ -146,7 +161,7 @@
                         <div style="overflow-y:auto" class="sjs-biangeng-height">
                             <table class="table table-striped table-bordered table-hover table-sm fixed_headers2">
                                 <thead>
-                                <tr class="text-center"><th width="100">项目节编号</th><th>细目</th><th>单位工程</th><th>分部工程</th><th>分项工程</th><th>计量单元</th><th width="70">数量</th><th width="40">选择</th></tr>
+                                <tr class="text-center"><th>序号</th><th width="100">项目节编号</th><th>细目</th><th>单位工程</th><th>分部工程</th><th>分项工程</th><th>计量单元</th><th width="70">数量</th><th width="40">选择</th></tr>
                                 </thead>
                                 <tbody id="code-list" data-index="">
                                 </tbody>