Commit 911c8601639bb87db93d47d9d88f0bd4fe9c8ebd

Authored by mahuandong
1 parent 165dcdf8

修改入库首选项修改添加模块为select

src/main/resources/templates/config/filterConfigDetail/filterConfigDetail.html
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 createUrl: prefix + "/add", 30 createUrl: prefix + "/add",
31 updateUrl: prefix + "/edit/{id}", 31 updateUrl: prefix + "/edit/{id}",
32 removeUrl: prefix + "/remove", 32 removeUrl: prefix + "/remove",
33 - modalName: "订单分析明细", 33 + modalName: "规则明细",
34 queryParams:function(params) { 34 queryParams:function(params) {
35 return { 35 return {
36 // 传递参数查询参数 36 // 传递参数查询参数
src/main/resources/templates/config/filterConfigHeader/add.html
@@ -8,7 +8,9 @@ @@ -8,7 +8,9 @@
8 <div class="form-group"> 8 <div class="form-group">
9 <label class="col-sm-3 control-label">模块:</label> 9 <label class="col-sm-3 control-label">模块:</label>
10 <div class="col-sm-8"> 10 <div class="col-sm-8">
11 - <input id="moduleType" name="moduleType" class="form-control" type="text"> 11 + <select class="form-control" name="moduleType" th:with="moduleType=${@dict.getType('moduleType')}">
  12 + <option th:each="e : ${moduleType}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
  13 + </select>
12 </div> 14 </div>
13 </div> 15 </div>
14 <div class="form-group"> 16 <div class="form-group">
@@ -81,6 +83,7 @@ @@ -81,6 +83,7 @@
81 submitHandler: function (form) { 83 submitHandler: function (form) {
82 // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize()); 84 // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
83 var tableValue = $.common.getTableValue("#form-filterConfigHeader-add"); 85 var tableValue = $.common.getTableValue("#form-filterConfigHeader-add");
  86 + tableValue = formValueReplace(tableValue, "moduleType", $("#moduleType option:selected").val());
84 $.operate.save(prefix + "/add", tableValue); 87 $.operate.save(prefix + "/add", tableValue);
85 } 88 }
86 }); 89 });
src/main/resources/templates/config/filterConfigHeader/edit.html
@@ -9,7 +9,9 @@ @@ -9,7 +9,9 @@
9 <div class="form-group"> 9 <div class="form-group">
10 <label class="col-sm-3 control-label">模块:</label> 10 <label class="col-sm-3 control-label">模块:</label>
11 <div class="col-sm-8"> 11 <div class="col-sm-8">
12 - <input id="moduleType" name="moduleType" class="form-control" type="text" th:field="*{moduleType}"> 12 + <select class="form-control" name="moduleType" th:with="moduleType=${@dict.getType('moduleType')}" th:field="*{moduleType}">
  13 + <option th:each="e : ${moduleType}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
  14 + </select>
13 </div> 15 </div>
14 </div> 16 </div>
15 <div class="form-group"> 17 <div class="form-group">
@@ -90,6 +92,7 @@ @@ -90,6 +92,7 @@
90 }, 92 },
91 submitHandler: function(form) { 93 submitHandler: function(form) {
92 var tableValue = $.common.getTableValue("#form-filterConfigHeader-edit"); 94 var tableValue = $.common.getTableValue("#form-filterConfigHeader-edit");
  95 + tableValue = formValueReplace(tableValue, "moduleType", $("#moduleType option:selected").val());
93 $.operate.save(prefix + "/edit", tableValue); 96 $.operate.save(prefix + "/edit", tableValue);
94 } 97 }
95 }); 98 });
src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html
@@ -74,14 +74,14 @@ @@ -74,14 +74,14 @@
74 var editFlag = [[${@permission.hasPermi('config:filterConfigHeader:edit')}]]; 74 var editFlag = [[${@permission.hasPermi('config:filterConfigHeader:edit')}]];
75 var removeFlag = [[${@permission.hasPermi('config:filterConfigHeader:remove')}]]; 75 var removeFlag = [[${@permission.hasPermi('config:filterConfigHeader:remove')}]];
76 var datas = [[${@dict.getType('sys_normal_disable')}]]; 76 var datas = [[${@dict.getType('sys_normal_disable')}]];
77 - 77 + var moduleType = [[${@dict.getType('moduleType')}]];
78 $(function() { 78 $(function() {
79 var options = { 79 var options = {
80 url: prefix + "/list", 80 url: prefix + "/list",
81 createUrl: prefix + "/add", 81 createUrl: prefix + "/add",
82 updateUrl: prefix + "/edit/{id}", 82 updateUrl: prefix + "/edit/{id}",
83 removeUrl: prefix + "/remove", 83 removeUrl: prefix + "/remove",
84 - modalName: "订单分析主表", 84 + modalName: "规则配置主表",
85 search: false, 85 search: false,
86 sortName: "id", 86 sortName: "id",
87 sortOrder: "desc", 87 sortOrder: "desc",
@@ -97,7 +97,11 @@ @@ -97,7 +97,11 @@
97 }, 97 },
98 { 98 {
99 field : 'moduleType', 99 field : 'moduleType',
100 - title : '模块' 100 + title : '模块',
  101 + align : "center",
  102 + formatter: function (value, item, index) {
  103 + return $.table.selectDictLabel(moduleType, value);
  104 + }
101 }, 105 },
102 { 106 {
103 field : 'recordType', 107 field : 'recordType',