搜索调整

app/public/js/change_information_set.js

@@ -779,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);
@@ -813,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 {

app/view/change/information_modal.ejs

@@ -116,8 +116,16 @@
                 <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">
+                                    <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 +138,17 @@
                     <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">
+                            <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>