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

app/public/js/financial_transfer_tender.js

@@ -521,6 +521,78 @@ $(function () {
         tenderListOrder.reOrderTenders('', '#copyModalContent', false, tenderList);
         initTenderListTree();
         $('#add-tender-list').html(getTenderListTreeHtml());
+        $('#search-audit').val('');
+        $('#search-result').text('0/0');
+        $('#up-search').attr('disabled', true);
+        $('#down-search').attr('disabled', true);
+    });
+
+    let timer2 = null;
+    let oldSearchVal2 = null;
+    $('body').on('input propertychange', '#add-ftt input[name="audit-name"]', function(e) {
+        oldSearchVal2 = e.target.value;
+        timer2 && clearTimeout(timer2);
+        timer2 = setTimeout(() => {
+            const newVal = $(this).val();
+            const resultLength = $('#add-tender-list').find('.result').length;
+            if (resultLength > 0) {
+                let content = $('#add-tender-list').html();
+                const replaceStr = $('#add-tender-list').find('.result').eq(0).html();
+                const regExp2 = new RegExp('<span class="result" style="background: yellow;">' + replaceStr + '</span>', 'g');
+                content = content.replace(regExp2, replaceStr);
+                const regExp3 = new RegExp('<span class="result" style="background: orange;">' + replaceStr + '</span>', 'g');
+                content = content.replace(regExp3, replaceStr);
+                $('#add-tender-list').html(content);
+            }
+            $('#search-result').text('0/0');
+            $('#up-search').attr('disabled', true);
+            $('#down-search').attr('disabled', true);
+            if (newVal && newVal === oldSearchVal2) {
+                const regExp = new RegExp(newVal, 'g');
+                for (let i = 0; i < $('#add-tender-list tr').length; i++) {
+                    if (_.includes($('#add-tender-list tr').eq(i).children('td').eq(1).html(), newVal)) {
+                        $('#add-tender-list tr').eq(i).children('td').eq(1).html($('#add-tender-list tr').eq(i).children('td').eq(1).html().replace(regExp, '<span class="result" style="background: yellow;">' + newVal + '</span>'))
+                    }
+                }
+                const resultLength2 = $('#add-tender-list').find('.result').length;
+                if (resultLength2 > 0) {
+                    $('#add-tender-list').find('.result').eq(0).css('background', 'orange');
+                    $('#search-result').text('1/' + resultLength2);
+                    $('#up-search').attr('disabled', false);
+                    $('#down-search').attr('disabled', false);
+                }
+            }
+            if($('#add-tender-list').find('.result').length > 0) {
+                const X = $('#add-tender-list').find('.result').eq(0).offset().top;
+                $('#add-tender-list').scrollTop(X - $('#add-tender-list').offset().top + $('#add-tender-list').scrollTop() - 30);
+            }
+        }, 400);
+    });
+
+    $('#up-search').on('click', function () {
+        const cur = parseInt($('#search-result').text().split('/')[0]);
+        const total = parseInt($('#search-result').text().split('/')[1]);
+        const now = cur - 1 !== 0 ? cur - 1: total;
+        $('#add-tender-list').find('.result').eq(cur-1).css('background', 'yellow');
+        $('#add-tender-list').find('.result').eq(now-1).css('background', 'orange');
+        // $('#tender-list tr').eq(searchUser[cur-1]).children('td').eq(2).html($('#tender-list tr').eq(searchUser[cur-1]).children('td').eq(2).html().replace('<span class="result" style="background:orange;">', '<span class="result" style="background:yellow;">'))
+        // $('#tender-list tr').eq(searchUser[now-1]).children('td').eq(2).html($('#tender-list tr').eq(searchUser[now-1]).children('td').eq(2).html().replace('<span class="result" style="background:yellow;">', '<span class="result" style="background:orange;">'))
+        $('#search-result').text(now + '/' + total);
+        const X = $('#add-tender-list').find('.result').eq(now-1).offset().top;
+        $('#add-tender-list').scrollTop(X - $('#add-tender-list').offset().top + $('#add-tender-list').scrollTop() - 30);
+    });
+
+    $('#down-search').on('click', function () {
+        const cur = parseInt($('#search-result').text().split('/')[0]);
+        const total = parseInt($('#search-result').text().split('/')[1]);
+        const now = cur + 1 > total ? 1: cur + 1;
+        $('#add-tender-list').find('.result').eq(cur-1).css('background', 'yellow');
+        $('#add-tender-list').find('.result').eq(now-1).css('background', 'orange');
+        // $('#tender-list tr').eq(searchUser[cur-1]).children('td').eq(2).html($('#tender-list tr').eq(searchUser[cur-1]).children('td').eq(2).html().replace('<span class="result" style="background:orange;">', '<span class="result" style="background:yellow;">'))
+        // $('#tender-list tr').eq(searchUser[now-1]).children('td').eq(2).html($('#tender-list tr').eq(searchUser[now-1]).children('td').eq(2).html().replace('<span class="result" style="background:yellow;">', '<span class="result" style="background:orange;">'))
+        $('#search-result').text(now + '/' + total);
+        const X = $('#add-tender-list').find('.result').eq(now-1).offset().top;
+        $('#add-tender-list').scrollTop(X - $('#add-tender-list').offset().top + $('#add-tender-list').scrollTop() -30);
     });
 })
 /**

app/view/financial/transfer_tender_modal.ejs

@@ -44,7 +44,17 @@
             <div class="modal-header">
                 <h5 class="modal-title">添加标段</h5>
             </div>
-            <div class="modal-body pt-0 mt-1" style="max-height: 500px;overflow: auto;" id="add-tender-list">
+            <div class="modal-body pt-0 mt-1">
+                <div class="input-group input-group-sm mb-2">
+                    <input class="form-control" placeholder="输入名称搜索" type="text" name="audit-name" id="search-audit">
+                    <div class="input-group-append">
+                        <span class="input-group-text" id="search-result">0/0</span>
+                        <button class="btn btn-outline-secondary" id="up-search" disabled><i class="fa fa-arrow-up" aria-hidden="true"></i></button>
+                        <button class="btn btn-outline-secondary" id="down-search" disabled><i class="fa fa-arrow-down" aria-hidden="true"></i></button>
+                    </div>
+                </div>
+                <div style="max-height: 500px;overflow: auto;" id="add-tender-list">
+                </div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>