Browse Source

报表签名搜索

laiguoran 5 years ago
parent
commit
5c96908dbd
2 changed files with 35 additions and 26 deletions
  1. 25 22
      app/public/report/js/rpt_signature.js
  2. 10 4
      app/view/report/rpt_all_popup.ejs

+ 25 - 22
app/public/report/js/rpt_signature.js

@@ -17,6 +17,7 @@ let rptSignatureHelper = {
         // $("#project_account_select_div").empty();
         let accDiv = $('#project_account_select_div');
         let accSelect = $('#project_account_select_dom'); //绑定成员
+        let searchInput = $('#search_account').val();
         accDiv.empty();
         accSelect.empty();
         //2. 一个个加可选用户项
@@ -25,29 +26,31 @@ let rptSignatureHelper = {
         const acc_role_keys = [];
         for (let accIdx = 0; accIdx < PRJ_ACCOUNT_LIST.length; accIdx++) {
             const prjAccount = PRJ_ACCOUNT_LIST[accIdx];
-            let companyKey = prjAccount.account_group;
-            let roleKey = prjAccount.role;
-            if (companyKey === '') {
-                companyKey = '其他单位';
-            }
-            if (roleKey === '') {
-                roleKey = DFT_ROLE_NAME;
-            }
-            let keyIdx = acc_role_keys.indexOf(companyKey);
-            if (keyIdx < 0) {
-                acc_role_keys.push(companyKey);
-                prj_accounts.push([]);
-                prj_sel_option_accounts.push([]);
-                keyIdx = prj_accounts.length - 1;
-                //这里先push一些 html prefix,在后面统一在push html suffix
-                prj_accounts[keyIdx].push('<ul class="list-group">');
-                prj_accounts[keyIdx].push('<li class="px-2 text-muted"><i class="fa fa-caret-down"></i> ' + companyKey + '</li>');
-                prj_sel_option_accounts[keyIdx].push('<optgroup label=" ' + companyKey + '">');
+            if (searchInput === '' || (searchInput !== '' && prjAccount.name.indexOf(searchInput) !== -1)) {
+                let companyKey = prjAccount.account_group;
+                let roleKey = prjAccount.role;
+                if (companyKey === '') {
+                    companyKey = '其他单位';
+                }
+                if (roleKey === '') {
+                    roleKey = DFT_ROLE_NAME;
+                }
+                let keyIdx = acc_role_keys.indexOf(companyKey);
+                if (keyIdx < 0) {
+                    acc_role_keys.push(companyKey);
+                    prj_accounts.push([]);
+                    prj_sel_option_accounts.push([]);
+                    keyIdx = prj_accounts.length - 1;
+                    //这里先push一些 html prefix,在后面统一在push html suffix
+                    prj_accounts[keyIdx].push('<ul class="list-group">');
+                    prj_accounts[keyIdx].push('<li class="px-2 text-muted"><i class="fa fa-caret-down"></i> ' + companyKey + '</li>');
+                    prj_sel_option_accounts[keyIdx].push('<optgroup label=" ' + companyKey + '">');
+                }
+                //push item
+                prj_accounts[keyIdx].push('<li class="add-sign-list-item"><a href="javascript:void(0)" onclick="rptSignatureHelper.createEsignatureByAccIdx(' + accIdx + ')" class="btn-link pull-right" title="添加" data-dismiss="modal"><i class="fa fa-plus"></i></a>' +
+                    prjAccount.name + '-<small class="text-muted">' + roleKey + '</small></li>');
+                prj_sel_option_accounts[keyIdx].push('<option value="' + accIdx + '">' + prjAccount.name + '-' + roleKey + '</option>');
             }
-            //push item
-            prj_accounts[keyIdx].push('<li class="add-sign-list-item"><a href="javascript:void(0)" onclick="rptSignatureHelper.createEsignatureByAccIdx(' + accIdx + ')" class="btn-link pull-right" title="添加" data-dismiss="modal"><i class="fa fa-plus"></i></a>' +
-                prjAccount.name + '-<small class="text-muted">' + roleKey + '</small></li>');
-            prj_sel_option_accounts[keyIdx].push('<option value="' + accIdx + '">' + prjAccount.name + '-' + roleKey + '</option>');
         }
         for (const prjAccList of prj_accounts) {
             prjAccList.push('</ul>');

+ 10 - 4
app/view/report/rpt_all_popup.ejs

@@ -169,7 +169,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" onclick="rptSignatureHelper.removeSelectSignature()">取消</button>
-                <a onclick="rptSignatureHelper.setupAfterSelectSignature()" class="btn btn-primary btn-sm" data-dismiss="modal">确定</a>
+                <a href="javascript:void(0);" onclick="rptSignatureHelper.setupAfterSelectSignature()" class="btn btn-primary btn-sm" data-dismiss="modal">确定</a>
             </div>
         </div>
     </div>
@@ -200,9 +200,9 @@
                     <div class="tab-pane fade show active" id="adst-1" role="tabpanel" aria-labelledby="home-tab">
                         <div class="input-group input-group-sm mt-1 mb-2">
                             <div class="input-group-prepend">
-                                <span class="input-group-text" id="inputGroup-sizing-sm"><i class="fa fa-search"></i></span>
+                                <span class="input-group-text" id="inputGroup-sizing-sm"><i class="fa fa-search" onclick="rptSignatureHelper.buildSelectableAccount(this);"></i></span>
                             </div>
-                            <input type="text" class="form-control form-control-sm" placeholder="搜索...">
+                            <input type="text" id="search_account" class="form-control form-control-sm" placeholder="搜索..."  onkeypress="searchAccount()">
                         </div>
                         <div class="modal-height-300" id="project_account_select_div">
                         </div>
@@ -248,4 +248,10 @@
 <script>
     zTreeOprObj.getCustomerCfg();
     zTreeOprObj.iniFontCfgDom(CUST_CFG);
-</script>
+
+    function searchAccount() {
+        if (event.keyCode == 13) {
+            rptSignatureHelper.buildSelectableAccount(this);
+        }
+    }
+</script>