'commit'

WebRoot/view/tb/zbdc/zbxx.html

@@ -78,18 +78,29 @@
                 <div class="layui-input-inline" id="kmView">
                 </div>
                 <script id="kmScript" type="text/html">
-                      <select id="kmId" lay-filter="km">                        
-                        {{#  layui.each(d, function(index, item){ }}
-                          <option value="{{item.km_code}}">{{item.km_name}}</option>
-                        {{#  }); }}
-                      </select>
-                    </script>
+                    <select id="kmId" lay-filter="km">                        
+                    {{#  layui.each(d, function(index, item){ }}
+                        <option value="{{item.km_code}}">{{item.km_name}}</option>
+                    {{#  }); }}
+                    </select>
+                </script>
             </div>
             <div class="layui-form-item layui-inline">
                 <label class="layui-form-label" style="width: auto;">分类：</label>
                 <div class="layui-input-inline" id="fenlei" style="width: 241px;">
                 </div>
             </div>
+            <div class="layui-form-item layui-inline">
+                <label class="layui-form-label" style="width: auto;">学科：</label>
+                <div class="layui-input-inline">
+                    <select id="pbyqId" lay-filter="pbyq">
+                        <option value="0">全部</option>
+                        <option value="1">必配</option>
+                        <option value="2">选配</option>
+                    </select>
+                </div>
+
+            </div>
             <!-- <div class="layui-form-item layui-inline">
                 <button class="layui-btn layui-btn-sm" lay-submit lay-filter="user-query">
                     <i class="layui-icon layui-icon-search"></i>
@@ -141,7 +152,7 @@
                     });
                     form.render();
                     getXmSelect();
-                    tableRender("");
+                    tableRender();
                 }
             });
 
@@ -173,15 +184,7 @@
                         name: "level_name"
                     },
                     on: function (data) {
-                        var selectArr = data.arr;
-                        if (selectArr.length > 0) {
-                            const levelName = selectArr[0].level_name;
-                            const result = findNodeAndParents(levelName);
-                            tableRender(result.join(','));
-                        }
-                        else {
-                            tableRender("");
-                        }
+                        tableRender();
                     }
                 });
                 $.ajax({
@@ -200,21 +203,14 @@
 
 
             form.on('select(km)', function (data) {
-                var selectArr = fenleiSelect.getValue();
-                if (selectArr.length > 0) {
-                    const levelName = selectArr[0].level_name;
-                    const result = findNodeAndParents(levelName);
-                    tableRender(result.join(','));
-                }
-                else {
-                    tableRender("");
-                }
+                tableRender();
                 getXmSelect();
             });
 
 
-
-
+            form.on('select(pbyq)', function (data) {
+                tableRender();
+            });
 
 
             function findNodeAndParents(levelName) {
@@ -244,28 +240,28 @@
             }
 
             form.on('submit(user-query)', function () {
+                tableRender();
+                // 阻止表单的默认提交行为
+                return false;
+            });
+
+
+            function tableRender() {
+                var fenlei_name = "";
 
                 var selectArr = fenleiSelect.getValue();
                 if (selectArr.length > 0) {
                     const levelName = selectArr[0].level_name;
                     const result = findNodeAndParents(levelName);
-                    tableRender(result.join(','));
-                }
-                else {
-                    tableRender("");
+                    fenlei_name = result.join(',');
                 }
 
-                // 阻止表单的默认提交行为
-                return false;
-            });
-
-
-            function tableRender(fenlei_name) {
                 table.render({
                     elem: '#myTable',
                     url: '/QingLong/zbdc/getFill',
                     where: {
                         km_code: $("#kmId").val(),
+                        pbyq: $("#pbyqId").val(),
                         level_filter: fenlei_name
                     },
                     cellExpandedMode: "tips",