工料机选择界面搜索

web/building_saas/main/html/main.html

@@ -622,7 +622,7 @@
     </div>-->
     <div class="modal fade" id="glj_tree_div" data-backdrop="static">
         <div class="modal-dialog modal-lg" role="document" id="modalCon">
-            <div class="modal-content" style="width: 910px;">
+            <div class="modal-content" style="width: 1020px;">
                 <div class="modal-header">
                     <h5 class="modal-title">请选择工料机</h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
@@ -643,9 +643,17 @@
                         <div style="width:67%; padding-left: 8px; float: left;">
                             <div class="row">
                                 <div class="col-12" id="gljRadios">
-                                    <input type="radio" class="glj-radio" name="glj" value="allGljs" checked>所有工料机&nbsp;&nbsp;
-                                    <input type="radio" class="glj-radio" name="glj" value="stdGLJ">标准工料机&nbsp;&nbsp;
-                                    <input type="radio" class="glj-radio" name="glj" value="complementaryGLJs">补充工料机&nbsp;&nbsp;
+                                    <div class="row">
+                                        <div class="col-7" style="margin-top: 5px;">
+                                            <input type="radio" class="glj-radio" name="glj" value="allGljs" checked>所有工料机&nbsp;&nbsp;
+                                            <input type="radio" class="glj-radio" name="glj" value="stdGLJ">标准工料机&nbsp;&nbsp;
+                                            <input type="radio" class="glj-radio" name="glj" value="complementaryGLJs">补充工料机&nbsp;&nbsp;
+                                        </div>
+                                        <div class="input-group col-5" style="margin-bottom: 5px;">
+                                            <input type="text" class="form-control form-control-sm" placeholder="请输入筛选编码或名称" value="" id="gljSearchKeyword">
+                                            <!--  <span class="input-group-btn"><button class="btn btn-secondary btn-sm" type="button" id="gljSearch"><i class="fa fa-search" aria-hidden="true"></i></button></span>-->
+                                        </div>
+                                    </div>
                                     <!-- <div class="form-group"><input id="searchGlj" type="text" class="form-control-sm" placeholder="查询工料机"></div>-->
                                 </div>
                                 <div class="modal-auto-height col-12" style="overflow: hidden" id="gljLibSheet">

web/building_saas/main/js/views/glj_view.js

@@ -249,6 +249,15 @@ var gljOprObj = {
                 dataType: "String",
                 hAlign: "center",
                 vAlign: "center"
+            },
+            {
+                headerName: "是否新增",
+                headerWidth: 80,
+                dataCode: "isComplementary",
+                dataType: "String",
+                hAlign: "center",
+                vAlign: "center",
+                cellType: "checkBox"
             }
         ],
         view: {
@@ -387,6 +396,9 @@ var gljOprObj = {
         }
     },
     onButtonClick: function (sender, args) {
+        if(args.sheet.isEditing()){
+            args.sheet.endEdit();
+        }
         var me = gljOprObj;
         var sheet = args.sheet, row = args.row, col = args.col;
         var cellType = sheet.getCellType(row, col);
@@ -1206,6 +1218,14 @@ var gljOprObj = {
         if ($('#actionType').val() == 'replace' || $('#actionType').val() == 'm_replace') {
             me.filterLibGLJByType();
         }
+        //文本筛选
+        let searchStr = $('#gljSearchKeyword').val();
+        if(searchStr && searchStr.trim() != ''){
+            let reg = new RegExp(searchStr);
+            me.gljLibSheetData = _.filter(me.gljLibSheetData, function (data) {
+                return reg.test(data.code) || reg.test(data.name);
+            });
+        }
         if (me.gljCurTypeId == undefined) {
             return;
         }
@@ -1632,6 +1652,10 @@ $(function () {
         gljOprObj.showLibGLJSheetData();
     });
 
+    $('#glj_tree_div').on('hidden.bs.modal', function () {
+        $('#gljSearchKeyword').val('');
+    });
+
     $('.glj-radio').change(function () {
         let val = $("input[name='glj']:checked").val();
         if (val == 'allGljs') {
@@ -1644,6 +1668,18 @@ $(function () {
             gljOprObj.showLibGLJSheetData();
         }
     })
+    //工料机搜索
+    $('#gljSearchKeyword').change(function () {
+        gljOprObj.filterLibGLJSheetData();
+        gljOprObj.showLibGLJSheetData();
+    });
+    $('#gljSearchKeyword').bind('keypress', function (e) {
+        if(e.keyCode === 13){
+            $(this).blur();
+            return false;
+        }
+    });
+
     $('#glj_selected_conf').click(function () {
         if (gljOprObj.GLJSelection.length < 1) {
             return;

web/building_saas/main/js/views/glj_view_contextMenu.js

@@ -204,6 +204,10 @@ function getGLJData(actionType) {
         zTreeHelper.createTree(result.datas.treeData, gljOprObj.gljTreeSetting, "gljTree", gljOprObj);
         gljOprObj.stdGLJ=result.datas.stdGLJ;
         gljOprObj.complementaryGLJs=result.datas.complementaryGLJs;
+        for(let compleGlj of gljOprObj.complementaryGLJs){
+            //是否新增
+            compleGlj.isComplementary = true;
+        }
         gljOprObj.AllRecode=gljOprObj.stdGLJ.concat(gljOprObj.complementaryGLJs);
         gljOprObj.distTypeTree=gljOprObj.getComboData(result.datas.distTypeTree);
         $('#modalCon').width($(window).width()*0.5);