Merge remote-tracking branch 'origin/dev_v4.0.1' into dev_v4.0.1

src/modules/basic/view/sys_notice.vue

@@ -10,11 +10,7 @@
         class="demo-ruleForm"
         :inline-message="true"
       >
-        <el-form-item
-          label="有效期"
-          prop="examDatetimeRange"
-          :label-width="style.label_width_tab1"
-        >
+        <el-form-item label="有效期" prop="examDatetimeRange">
           <el-date-picker
             class="input"
             v-model="examDatetimeRange"
@@ -26,7 +22,16 @@
             :clearable="false"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="通知内容">
+        <el-form-item label="标题" prop="title">
+          <el-input
+            type="text"
+            placeholder="请输入标题"
+            v-model="ruleForm.title"
+            maxlength="20"
+            show-word-limit
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="通知内容" prop="content">
           <el-input
             type="textarea"
             placeholder="请输入内容"
@@ -35,7 +40,13 @@
             show-word-limit
           ></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item label="状态" prop="enable">
+          <el-radio-group class="pull_right_sm" v-model="ruleForm.enable">
+            <el-radio :label="true">启用</el-radio>
+            <el-radio :label="false">禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item style="margin-top:10px;">
           <el-button type="primary" @click="submitForm('ruleForm')"
             >保 存</el-button
           >
@@ -50,6 +61,7 @@ import moment from "moment";
 import { CORE_API } from "@/constants/constants.js";
 let _this = null;
 export default {
+  name: "sys_notice",
   data() {
     let validateExamDatetimeRange = (rule, value, callback) => {
       let examDatetimeRange = _this.examDatetimeRange;
@@ -65,10 +77,14 @@ export default {
         rootOrgId: -1,
         content: "",
         startTime: null,
-        endTime: null
+        endTime: null,
+        enable: true,
+        title: ""
       },
       rules: {
+        title: [{ required: true, trigger: "blur" }],
         content: [{ required: true, trigger: "blur" }],
+        enable: [{ required: true, trigger: "blur" }],
         examDatetimeRange: [
           {
             required: true,
@@ -83,6 +99,8 @@ export default {
     submitForm(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
+          this.ruleForm.startTime = this.examDatetimeRange[0];
+          this.ruleForm.endTime = this.examDatetimeRange[1];
           this.$httpWithMsg
             .put(CORE_API + "/sys/notice/saveSysNotice", this.ruleForm)
             .then(
@@ -103,7 +121,7 @@ export default {
     initForm() {
       var url = CORE_API + "/sys/notice/getSysNotice/?rootOrgId=-1";
       this.$httpWithMsg.get(url).then(response => {
-        if (response) {
+        if (response && response.data) {
           let data = response.data;
           (this.ruleForm.rootOrgId = data.rootOrgId),
             (this.ruleForm.content = data.content);