优化公告功能

WebService/src/main/resources/components/noticePackage/addNoticeView/addNoticeView.html

@@ -32,6 +32,12 @@
                         <input v-model="addNoticeViewInfo.startTime" readonly type="text" placeholder="必填，请填写开始时间" class="form-control noticeStartTime">
                     </div>
                 </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label">结束时间</label>
+                    <div class="col-sm-10">
+                        <input v-model="addNoticeViewInfo.endTime" readonly type="text" placeholder="必填，请填写结束时间" class="form-control noticeEndTime">
+                    </div>
+                </div>
                 <div class="form-group row">
                     <label class="col-sm-2 col-form-label">公告内容</label>
                     <div class="col-sm-10 ">

WebService/src/main/resources/components/noticePackage/addNoticeView/addNoticeView.js

@@ -7,6 +7,7 @@
                 noticeTypeCd:'',
                 context:'',
                 startTime:'',
+                endTime:'',
 
             }
         },
@@ -54,22 +55,34 @@
                             param:"",
                             errInfo:"公告内容不能为空"
                         },
- {
+                        {
                             limit:"maxLength",
                             param:"500",
                             errInfo:"公告内容不能超过500个字"
                         },
                     ],
-'addNoticeViewInfo.startTime':[
-{
-                            limit:"required",
+                    'addNoticeViewInfo.startTime':[
+                    {
+                        limit:"required",
+                        param:"",
+                        errInfo:"开始时间不能为空"
+                    },
+                     {
+                            limit:"dateTime",
                             param:"",
-                            errInfo:"开始时间不能为空"
+                            errInfo:"开始时间不是有效的日期"
                         },
- {
-                            limit:"date",
+                    ],
+                    'addNoticeViewInfo.endTime':[
+                    {
+                        limit:"required",
+                        param:"",
+                        errInfo:"开始时间不能为空"
+                    },
+                     {
+                            limit:"dateTime",
                             param:"",
-                            errInfo:"开始时间不是有效的日志"
+                            errInfo:"开始时间不是有效的日期"
                         },
                     ],
 
@@ -124,11 +137,11 @@
                                         };
             },
             _initNoticeInfo:function(){
-                console.log('开始渲染福文本');
+                vc.component.addNoticeViewInfo.startTime = vc.dateFormat(new Date().getTime());
                  $('.noticeStartTime').datetimepicker({
                     language: 'zh-CN',
-                    format: 'yyyy-mm-dd',
-                    minView: "month",
+                    format: 'yyyy-mm-dd HH:i:ss',
+                    initTime: true,
                     initialDate: new Date(),
                     autoClose: 1,
                     todayBtn: true
@@ -139,6 +152,19 @@
                         var value = $(".noticeStartTime").val();
                         vc.component.addNoticeViewInfo.startTime = value;
                     });
+                $('.noticeEndTime').datetimepicker({
+                    language: 'zh-CN',
+                    format: 'yyyy-mm-dd HH:i:ss',
+                    initTime: true,
+                    initialDate: new Date(),
+                    autoClose: 1,
+                    todayBtn: true
+                });
+                $('.noticeEndTime').datetimepicker()
+                    .on('changeDate', function (ev) {
+                        var value = $(".noticeEndTime").val();
+                        vc.component.addNoticeViewInfo.endTime = value;
+                    });
                 $('.summernote').summernote({
                     lang:'zh-CN',
                     height: 300,

WebService/src/main/resources/components/noticePackage/edit-notice/editNotice.js

@@ -70,7 +70,7 @@ startTime:'',
                             errInfo:"开始时间不能为空"
                         },
  {
-                            limit:"date",
+                            limit:"dateTime",
                             param:"",
                             errInfo:"开始时间不是有效的日志"
                         },

WebService/src/main/resources/components/noticePackage/notice-manage/noticeManage.html

@@ -7,7 +7,7 @@
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddNoticeModal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            添加公告
+                            发布
                         </button>
                     </div>
                 </div>
@@ -16,14 +16,12 @@
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
                         <tr>
-                                                        <th>公告ID</th>
+                            <th>公告ID</th>
                             <th>标题</th>
                             <th>公告类型</th>
-                            <th>公告内容</th>
                             <th>开始时间</th>
+                            <th>结束时间</th>
                             <th class="text-right">操作</th>
-
-
                         </tr>
                         </thead>
                         <tbody>
@@ -31,14 +29,18 @@
                                                             <td>{{notice.noticeId}}</td>
                             <td>{{notice.title}}</td>
                             <td>{{notice.noticeTypeCd}}</td>
-                            <td>{{notice.context}}</td>
                             <td>{{notice.startTime}}</td>
-                            <td><div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openEditNoticeModel(notice)">修改</button>
-                                </div>
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteNoticeModel(notice)">删除</button>
-                                </div></td>
+                            <td>{{notice.endTime}}</td>
+                            <td>
+                            <div class="btn-group">
+                                <button class="btn-white btn btn-xs" v-on:click="_openNoticeDetail(notice)">详情</button>
+                            </div>
+                            <div class="btn-group">
+                                <button class="btn-white btn btn-xs" v-on:click="_openEditNoticeModel(notice)">修改</button>
+                            </div>
+                            <div class="btn-group">
+                                <button class="btn-white btn btn-xs" v-on:click="_openDeleteNoticeModel(notice)">删除</button>
+                            </div></td>
 
                             </tr>
                         </tbody>

WebService/src/main/resources/components/noticePackage/notice-manage/noticeManage.js

@@ -63,6 +63,10 @@
             },
             _openDeleteNoticeModel:function(_notice){
                 vc.emit('deleteNotice','openDeleteNoticeModal',_notice);
+            },
+            _openNoticeDetail:function(_notice){
+                vc.jumpToPage("/flow/noticeDetailFlow?noticeId="+_notice.noticeId);
+
             }
         }
     });

WebService/src/main/resources/static/js/core.js

@@ -318,6 +318,7 @@
       var s = time.getSeconds();
       return y+'-'+add0(m)+'-'+add0(d)+' '+add0(h)+':'+add0(mm)+':'+add0(s);
     }
+
 })(window.vc);
 
 

WebService/src/main/resources/static/js/vc-validate.js

@@ -106,8 +106,8 @@ vc 校验 工具类 -method
             return regDate.test(str);
         },
         dateTime:function(str){
-            var reDateTime = /^(?:19|20|30)[0-9][0-9]-(?:(?:0[1-9])|(?:1[0-2]))-(?:(?:[0-2][1-9])|(?:[1-3][0-1])) (?:(?:[0-2][0-3])|(?:[0-1][0-9])):[0-5][0-9]:[0-5][0-9]$/;
-            return reDateTime.test(reDateTime);
+            var reDateTime = /^[1-9]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\s+(20|21|22|23|[0-1]\d):[0-5]\d:[0-5]\d$/;
+            return reDateTime.test(str);
         },
         /**
             金额校验