Merge remote-tracking branch 'origin/2023年7月变更' into 2023年7月变更

src/views/modules/message/modules/SystemNotificationsModal.vue

@@ -24,6 +24,16 @@
                       :maxLength='200'
                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-textarea>
         </a-form-item>
+        <!--   2023-07变更：设置消息提醒截止时间，超出截止时间未读弹框提醒  -->
+        <a-form-item label="消息提醒截止时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-date-picker
+            placeholder="请选择消息提醒截止时间"
+            v-decorator="['deadline', validatorRules.deadline]"
+            show-time
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+        </a-form-item>
       </a-form>
     </a-spin>
   </j-modal>
@@ -44,11 +54,11 @@ export default {
       model: {},
       labelCol: {
         xs: { span: 24 },
-        sm: { span: 4 }
+        sm: { span: 5 }
       },
       wrapperCol: {
         xs: { span: 24 },
-        sm: { span: 20 }
+        sm: { span: 19 }
       },
       url: '/send/message/sendAllUserMessage',
       validatorRules: {
@@ -59,6 +69,10 @@ export default {
         content: {
           rules: [{ required: true, message: '请输入通知内容' }],
           validateTrigger: 'blur'
+        },
+        deadline: {
+          rules: [{ required: true, message: '请输入消息提醒截止时间' }],
+          validateTrigger: 'change'
         }
       }
     }