Merge branch '弹窗人员增加' into div-20251104

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

@@ -69,7 +69,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">用户类型：</label>
             <div class="col-sm-8">
-                <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_alert_permission')}">
+                <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_alert_permission')}" multiple>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                 </select>
             </div>
@@ -131,7 +131,7 @@
         }
         $("#alertContentItem").hide();
         $("#alertImageItem").hide();
-        $("#userType").selectpicker('val','1');
+        $("#userType").selectpicker('val',[0,1,3,4]);
         getCompanyList(obj);
         $('#avatar').on('change', function () {
             var reader = new FileReader();
@@ -273,10 +273,12 @@
             var startTime = $('#alertStartTime').val().replace('T',' ');
             var endTime = $('#alertEndTime').val().replace('T',' ');
             var alertNum = $('#alertNum').val();
-            var userType = $('#userType').val();
+            var userType = $('#userType').val().join(',');
             if (new Date(startTime).getTime() - new Date(endTime).getTime() >= 0){
                 $.modal.alertWarning("弹框结束时间不能小于开始时间");
-            }else {
+            }else if ($('#userType').selectpicker('val') == null) {
+                $.modal.msg("请选择通知人员");
+            } else {
                 var objSubmit = {
                     alertTitle:alertTitle,
                     alertType:alertType,

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

@@ -171,18 +171,20 @@
                     field : 'userType',
                     title : '用户类型',
                     formatter: function(value, row, index) {
-                        if (value.indexOf('2') != -1){
-                            return '立邦人员、经销商';
+                        var userStr = '';
+                        if (value.indexOf('0') != -1){
+                            userStr += '立邦员工 ';
                         }
-                        if (value.indexOf('1') != -1) {
-                            return '经销商';
+                        if (value.indexOf('1') != -1){
+                            userStr += '经销商 ';
                         }
-                        if (value.indexOf('0') != -1) {
-                            return '立邦员工';
+                        if (value.indexOf('3') != -1){
+                            userStr += '仿石漆 ';
                         }
-                        if (value.indexOf('3') != -1) {
-                            return '其他';
+                        if (value.indexOf('4') != -1){
+                            userStr += '金牌店 ';
                         }
+                        return userStr;
                     }
                 },
                     {

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

@@ -71,7 +71,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">用户类型：</label>
                 <div class="col-sm-8">
-                    <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_alert_permission')}">
+                    <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_alert_permission')}" multiple>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{userType}"></option>
                     </select>
                 </div>
@@ -145,7 +145,7 @@
                 $("#alertContentItem").hide();
                 $("#div-bgUrl").html("<img src='" + formData.photoUrl + "' style='width:300px;margin-bottom: 5px;'>");
             }
-            $("#userType").selectpicker('val',formData.userType);
+            $("#userType").selectpicker('val',formData.userType.split(','));
             if (formData.salesLevel == 'company_level'){
                 var objhx1 = {
                     parType: 'company_level',
@@ -279,9 +279,11 @@
                 var startTime = $('#alertStartTime').val().replace('T',' ');
                 var endTime = $('#alertEndTime').val().replace('T',' ');
                 var alertNum = $('#alertNum').val();
-                var userType = $('#userType').val();
+                var userType = $('#userType').val().join(',');
                 if (new Date(startTime).getTime() - new Date(endTime).getTime() >= 0){
                     $.modal.alertWarning("弹框结束时间不能小于开始时间");
+                }else if ($('#userType').selectpicker('val') == null) {
+                    $.modal.msg("请选择通知人员");
                 }else {
                     var objSubmit = {
                         alertTitle:alertTitle,

suishenbang-admin/src/main/resources/templates/system/lantern/add.html

@@ -64,6 +64,11 @@
     <th:block th:include="include :: bootstrap-select-js" />
     <script type="text/javascript">
         var prefix = ctx + "system/lantern"
+
+        $(document).ready(function () {
+            $("#userType").selectpicker('val',[0,1,2,4]);
+        })
+
         $("#form-lantern-add").validate({
             focusCleanup: true,
             rules:{

suishenbang-admin/src/main/resources/templates/system/lantern/edit.html

@@ -43,11 +43,14 @@
                 <label class="col-sm-3 control-label">公告人员：</label>
                 <div class="col-sm-8">
                     <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_lantern_permission')}" multiple>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{userType}"></option>
                     </select>
                     <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
                 </div>
             </div>
+            <!--<div class="form-group">-->
+                <!--<input name="userTypeStr" th:field="*{userType}" style="display: none;">-->
+            <!--</div>-->
             <!--<div class="form-group">    -->
                 <!--<label class="col-sm-3 control-label">磁贴：</label>-->
                 <!--<div class="col-sm-8">-->
@@ -64,6 +67,17 @@
     <th:block th:include="include :: bootstrap-select-js" />
     <script type="text/javascript">
         var prefix = ctx + "system/lantern";
+
+        $(document).ready(function () {
+            var formArray = $('#form-lantern-edit').serializeArray();
+            var formData = {};
+            $(formArray ).each(function(index, obj){
+                formData[obj.name] = obj.value;
+            });
+            console.log('form-lantern-edit',formData);
+            $("#userType").selectpicker('val',formData.userType.split(','));
+        })
+
         $("#form-lantern-edit").validate({
             focusCleanup: true,
             rules:{

suishenbang-admin/src/main/resources/templates/system/lantern/lantern.html

@@ -120,15 +120,20 @@
                     field : 'userType',
                     title : '公告人员',
                     formatter: function(value, row, index) {
-                        if (value.indexOf('1') != -1 && value.indexOf('0') != -1){
-                            return '立邦人员、经销商';
+                        var userStr = '';
+                        if (value.indexOf('0') != -1){
+                            userStr += '立邦员工 ';
                         }
-                        if (value.indexOf('1') != -1 && value.indexOf('0') == -1) {
-                            return '经销商';
+                        if (value.indexOf('1') != -1){
+                            userStr += '经销商 ';
                         }
-                        if (value.indexOf('1') == -1 && value.indexOf('0') != -1) {
-                            return '立邦人员';
+                        if (value.indexOf('2') != -1){
+                            userStr += '仿石漆 ';
                         }
+                        if (value.indexOf('4') != -1){
+                            userStr += '金牌店 ';
+                        }
+                        return userStr;
                     }
                 },
                 // {