2 Commits 2a5762b84b ... b693af23fb

Author SHA1 Message Date
  yanym b693af23fb Merge remote-tracking branch 'origin/alert' into alert 1 year ago
  yanym 2f79fed19c 首页弹窗修改 1 year ago

+ 22 - 0
suishenbang-admin/src/main/resources/templates/system/alertConfiguration/add.html

@@ -61,6 +61,12 @@
                 </select>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label"></label>
+            <div class="col-sm-3">
+                <a class="btn btn-primary btn-rounded btn-sm" id="clearSelect">清空部门类型</a>
+            </div>
+        </div>
 <!--        <div class="form-group">
             <label class="col-sm-3 control-label">是否启动:</label>
             <div class="col-sm-8">
@@ -98,6 +104,8 @@
             }
             $("#deptType2").empty().append("");
             $("#deptType2").selectpicker('refresh');
+            $("#deptType3").empty().append("");
+            $("#deptType3").selectpicker('refresh');
             getCompanyList(obj1);
         }
     })
@@ -114,6 +122,20 @@
         }
     })
 
+    $("#clearSelect").on('click',function () {
+        var obj3 = {
+            parType: "diy_level",
+            parValue: ""
+        }
+        $("#deptType1").empty().append("");
+        $("#deptType1").selectpicker('refresh');
+        $("#deptType2").empty().append("");
+        $("#deptType2").selectpicker('refresh');
+        $("#deptType3").empty().append("");
+        $("#deptType3").selectpicker('refresh');
+        getCompanyList(obj3,"");
+    })
+
     $("#form-configuration-add").validate({
         focusCleanup: true,
         rules:{

+ 4 - 4
suishenbang-admin/src/main/resources/templates/system/alertConfiguration/configuration.html

@@ -155,15 +155,15 @@
         /* 启动状态显示 */
         function statusTools(row) {
             if (row.alertStatus == 0) {
-                return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.alertId + ',' + row.userType + ',' + row.salesLevel + ',' + row.orgCode + '\')"></i> ';
+                return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.alertId + '&' + row.userType + '&' + row.salesLevel + '&' + row.orgCode + '\')"></i> ';
             } else {
-                return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.alertId + ',' + row.userType + ',' + row.salesLevel + ',' + row.orgCode + '\')"></i> ';
+                return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.alertId + '&' + row.userType + '&' + row.salesLevel + '&' + row.orgCode + '\')"></i> ';
             }
         }
 
         /* 停用 */
         function disable(row) {
-            var arrayTingyong = row.split(',');
+            var arrayTingyong = row.split('&');
             $.modal.confirm("确认关闭该通知吗?", function() {
                 $.operate.post(prefix + "/release", { "alertId": arrayTingyong[0], "alertStatus": 0, "userType": arrayTingyong[1], "salesLevel": arrayTingyong[2], "orgCode": arrayTingyong[3] });
             })
@@ -171,7 +171,7 @@
 
         /* 启用 */
         function enable(row) {
-            var arrayQiyong = row.split(',');
+            var arrayQiyong = row.split('&');
             $.modal.confirm("确认启用该通知吗?", function() {
                 $.operate.post(prefix + "/release", { "alertId": arrayQiyong[0], "alertStatus": 1, "userType": arrayQiyong[1], "salesLevel": arrayQiyong[2], "orgCode": arrayQiyong[3] });
             })

+ 26 - 0
suishenbang-admin/src/main/resources/templates/system/alertConfiguration/edit.html

@@ -70,6 +70,12 @@
                     </select>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label"></label>
+                <div class="col-sm-3">
+                    <a class="btn btn-primary btn-rounded btn-sm" id="clearSelect">清空部门类型</a>
+                </div>
+            </div>
        <!--     <div class="form-group">
                 <label class="col-sm-3 control-label">是否启动:</label>
                 <div class="col-sm-8">
@@ -181,6 +187,12 @@
                     }
                 }
                 $.ajax(confighuixian1)
+            }else {
+                var objList = {
+                    parType: "diy_level",
+                    parValue: ""
+                }
+                getCompanyList(objList,"");
             }
         })
 
@@ -295,6 +307,20 @@
             }
         })
 
+        $("#clearSelect").on('click',function () {
+            var obj3 = {
+                parType: "diy_level",
+                parValue: ""
+            }
+            $("#deptType1").empty().append("");
+            $("#deptType1").selectpicker('refresh');
+            $("#deptType2").empty().append("");
+            $("#deptType2").selectpicker('refresh');
+            $("#deptType3").empty().append("");
+            $("#deptType3").selectpicker('refresh');
+            getCompanyList(obj3,"");
+        })
+
         /* 获取公司列表 */
         function getCompanyList(obj,chooseId) {
             var config = {