diff --git a/src/main/resources/templates/config/filterConfigDetail/filterConfigDetail.html b/src/main/resources/templates/config/filterConfigDetail/filterConfigDetail.html index b26417d..c47d919 100644 --- a/src/main/resources/templates/config/filterConfigDetail/filterConfigDetail.html +++ b/src/main/resources/templates/config/filterConfigDetail/filterConfigDetail.html @@ -30,7 +30,7 @@ createUrl: prefix + "/add", updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", - modalName: "订单分析明细", + modalName: "规则明细", queryParams:function(params) { return { // 传递参数查询参数 diff --git a/src/main/resources/templates/config/filterConfigHeader/add.html b/src/main/resources/templates/config/filterConfigHeader/add.html index edf4339..5fdaef0 100644 --- a/src/main/resources/templates/config/filterConfigHeader/add.html +++ b/src/main/resources/templates/config/filterConfigHeader/add.html @@ -8,7 +8,9 @@ <div class="form-group"> <label class="col-sm-3 control-label">模块:</label> <div class="col-sm-8"> - <input id="moduleType" name="moduleType" class="form-control" type="text"> + <select class="form-control" name="moduleType" th:with="moduleType=${@dict.getType('moduleType')}"> + <option th:each="e : ${moduleType}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> + </select> </div> </div> <div class="form-group"> @@ -81,6 +83,7 @@ submitHandler: function (form) { // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize()); var tableValue = $.common.getTableValue("#form-filterConfigHeader-add"); + tableValue = formValueReplace(tableValue, "moduleType", $("#moduleType option:selected").val()); $.operate.save(prefix + "/add", tableValue); } }); diff --git a/src/main/resources/templates/config/filterConfigHeader/edit.html b/src/main/resources/templates/config/filterConfigHeader/edit.html index 5018cda..36b8b31 100644 --- a/src/main/resources/templates/config/filterConfigHeader/edit.html +++ b/src/main/resources/templates/config/filterConfigHeader/edit.html @@ -9,7 +9,9 @@ <div class="form-group"> <label class="col-sm-3 control-label">模块:</label> <div class="col-sm-8"> - <input id="moduleType" name="moduleType" class="form-control" type="text" th:field="*{moduleType}"> + <select class="form-control" name="moduleType" th:with="moduleType=${@dict.getType('moduleType')}" th:field="*{moduleType}"> + <option th:each="e : ${moduleType}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> + </select> </div> </div> <div class="form-group"> @@ -90,6 +92,7 @@ }, submitHandler: function(form) { var tableValue = $.common.getTableValue("#form-filterConfigHeader-edit"); + tableValue = formValueReplace(tableValue, "moduleType", $("#moduleType option:selected").val()); $.operate.save(prefix + "/edit", tableValue); } }); diff --git a/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html b/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html index f162b82..c396b23 100644 --- a/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html +++ b/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html @@ -74,14 +74,14 @@ var editFlag = [[${@permission.hasPermi('config:filterConfigHeader:edit')}]]; var removeFlag = [[${@permission.hasPermi('config:filterConfigHeader:remove')}]]; var datas = [[${@dict.getType('sys_normal_disable')}]]; - + var moduleType = [[${@dict.getType('moduleType')}]]; $(function() { var options = { url: prefix + "/list", createUrl: prefix + "/add", updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", - modalName: "订单分析主表", + modalName: "规则配置主表", search: false, sortName: "id", sortOrder: "desc", @@ -97,7 +97,11 @@ }, { field : 'moduleType', - title : '模块' + title : '模块', + align : "center", + formatter: function (value, item, index) { + return $.table.selectDictLabel(moduleType, value); + } }, { field : 'recordType',