学校-公告

src/api/notice.js

@@ -20,3 +20,13 @@ export const notice_detail = (data) => setRequest("notice/detail", data);
  * 9.1.5 公告-删除
  */
 export const notice_delete = (data) => setRequest("notice/delete", data);
+/**
+ * 9.2.1 公告-列表-区域学校
+ */
+export const notice_list_region = (data) =>
+  setRequest("notice/list_region", data);
+/**
+ * 9.2.3 公告-详情-区域学校
+ */
+export const notice_detail_region = (data) =>
+  setRequest("notice/detail_region", data);

src/views/schoolSection/notice/notice.vue

@@ -21,18 +21,12 @@
           style="width: 150px"
         />
       </div>
-      <Button type="primary" class="primary_btn" @click="toAdd()">新建</Button>
     </div>
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
-        <template slot-scope="{ row }" slot="noticeTypeSlot">
-          <div>{{ row.noticeType === 1 ? "所有区域" : "自定义区域" }}</div>
-        </template>
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
             <div @click="toView(row)">查看</div>
-            <div @click="toEdit(row)">编辑</div>
-            <div class="action_del" @click="toDel(row)">删除</div>
           </div>
         </template>
       </Table>
@@ -50,60 +44,6 @@
         show-sizer
       ></Page>
     </div>
-    <!-- 新建/编辑 -->
-    <Modal
-      class="modal1"
-      :mask-closable="false"
-      v-model="noticeInfo.show"
-      :title="noticeInfo.noticeid ? '编辑' : '新建'"
-    >
-      <Form
-        v-if="noticeInfo.show"
-        ref="addForm"
-        :model="noticeInfo"
-        :rules="rules"
-        :label-width="60"
-      >
-        <FormItem label="标题" prop="noticeTitle">
-          <Input
-            v-model="noticeInfo.noticeTitle"
-            placeholder="请输入标题"
-          ></Input>
-        </FormItem>
-        <FormItem label="内容" prop="noticeContent">
-          <MyCkeditor
-            editor_ref="noticeEditor"
-            :height="240"
-            savefolder="/notice"
-            @change="getNoticeContent"
-            :content="noticeInfo.noticeContent"
-          ></MyCkeditor>
-        </FormItem>
-        <FormItem label="接收" prop="noticeType">
-          <RadioGroup
-            v-model="noticeInfo.noticeType"
-            @on-change="noticeInfo.regionids = []"
-          >
-            <Radio :label="1" font="16">所有区域</Radio>
-            <Radio :label="2" font="16">自定义区域</Radio>
-          </RadioGroup>
-          <div v-if="noticeInfo.noticeType === 2">
-            <CheckboxGroup v-model="noticeInfo.regionids">
-              <Checkbox
-                :label="regionItem.regionid"
-                v-for="regionItem in noticeInfo.regionList"
-                :key="regionItem.regionid"
-                >{{ regionItem.regionName }}</Checkbox
-              >
-            </CheckboxGroup>
-          </div>
-        </FormItem>
-      </Form>
-      <div slot="footer">
-        <Button @click="noticeInfo.show = false">取消</Button>
-        <Button @click="saveAddInfo()" type="primary">保存</Button>
-      </div>
-    </Modal>
     <!-- 查看 -->
     <Modal
       class="modal1"
@@ -117,11 +57,6 @@
         <div>{{ viewInfo.updatetime }}</div>
       </div>
       <div class="notice_content" v-html="viewInfo.noticeContent"></div>
-      <div v-if="viewInfo.noticeType === 2" class="notice_regions">
-        <div v-for="regionItem in viewInfo.regions" :key="regionItem.regionid">
-          {{ regionItem.regionName }}
-        </div>
-      </div>
       <div slot="footer" style="text-align: center">
         <Button @click="viewInfo.show = false">关闭</Button>
       </div>
@@ -130,29 +65,10 @@
 </template>
 
 <script>
-import { region_list_sel_pt } from "@/api/region";
-import {
-  notice_list,
-  notice_delete,
-  notice_add,
-  notice_edit,
-  notice_detail
-} from "@/api/notice";
-import { dateFormat, htmlHasContent } from "@/utils";
-import MyCkeditor from "@/components/Editor/MyCkeditor";
+import { notice_list_region, notice_detail_region } from "@/api/notice";
+import { dateFormat } from "@/utils";
 export default {
-  components: {
-    MyCkeditor
-  },
   data() {
-    // 通知内容验证
-    const noticeContentCheck = (rule, value, callback) => {
-      if (htmlHasContent(this.noticeInfo.noticeContent)) {
-        callback();
-      } else {
-        callback(new Error("请输入内容"));
-      }
-    };
     return {
       searchForm: {
         title: "",
@@ -162,19 +78,6 @@ export default {
         list: [],
         total: 0
       },
-      // 新建/编辑
-      noticeInfo: {
-        show: false,
-        noticeid: null,
-        rversion: null,
-        noticeTitle: "",
-        noticeContent: "",
-        noticeTxt: "",
-        // 1所有区域2自定义区域
-        noticeType: 1,
-        regionList: [],
-        regionids: []
-      },
       // 查看信息
       viewInfo: {
         show: false,
@@ -185,30 +88,6 @@ export default {
         noticeType: null,
         regions: []
       },
-      rules: {
-        noticeTitle: [
-          {
-            required: true,
-            message: "请输入标题",
-            trigger: "blur"
-          }
-        ],
-        noticeContent: [
-          {
-            required: true,
-            validator: noticeContentCheck,
-            trigger: "change"
-          }
-        ],
-        noticeType: [
-          {
-            required: true,
-            type: "number",
-            message: "请选择接收区域",
-            trigger: "change"
-          }
-        ]
-      },
       columns: [
         {
           title: "序号",
@@ -228,12 +107,6 @@ export default {
           key: "noticeTitle",
           align: "center"
         },
-        {
-          title: "接收区域",
-          slot: "noticeTypeSlot",
-          width: 120,
-          align: "center"
-        },
         {
           title: "发布人",
           key: "createname",
@@ -241,7 +114,7 @@ export default {
           align: "center"
         },
         {
-          title: "更新时间",
+          title: "时间",
           key: "updatetime",
           width: 190,
           align: "center"
@@ -249,7 +122,7 @@ export default {
         {
           title: "操作",
           slot: "actionSlot",
-          width: 180,
+          width: 90,
           align: "center"
         }
       ]
@@ -281,7 +154,7 @@ export default {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
-      notice_list({
+      notice_list_region({
         page: this.searchForm.page,
         size: this.searchForm.size,
         title: this.searchForm.title,
@@ -296,80 +169,9 @@ export default {
         }
       });
     },
-    // 新建
-    toAdd() {
-      this.noticeInfo = {
-        show: true,
-        noticeid: null,
-        rversion: null,
-        noticeTitle: "",
-        noticeContent: "",
-        noticeTxt: "",
-        // 1所有区域2自定义区域
-        noticeType: 1,
-        regionList: [],
-        regionids: []
-      };
-      this.getRegionList().then((list) => {
-        this.noticeInfo.regionList = list;
-      });
-    },
-    // 获取搜索区域列表
-    getRegionList() {
-      return new Promise((resolve) => {
-        region_list_sel_pt({}).then((data) => {
-          if (data.code === 0) {
-            resolve(data.obj);
-          } else {
-            resolve([]);
-            this.$Message.error(data.msg);
-          }
-        });
-      });
-    },
-    getNoticeContent(html, text = "") {
-      this.noticeInfo.noticeContent = html;
-      this.noticeInfo.noticeTxt = text.replace("\n", "");
-    },
-    saveAddInfo() {
-      this.$refs.addForm.validate((valid) => {
-        if (valid) {
-          if (
-            this.noticeInfo.noticeType === 2 &&
-            this.noticeInfo.regionids === 0
-          ) {
-            return;
-          }
-          this.noticeInfo.show = false;
-          let form = {
-            noticeTitle: this.noticeInfo.noticeTitle,
-            noticeContent: this.noticeInfo.noticeContent,
-            noticeTxt: this.noticeInfo.noticeTxt,
-            noticeType: this.noticeInfo.noticeType,
-            regionids: this.noticeInfo.regionids
-          };
-          if (this.noticeInfo.noticeid && this.noticeInfo.rversion) {
-            form.noticeid = this.noticeInfo.noticeid;
-            form.rversion = this.noticeInfo.rversion;
-          }
-          let api =
-            this.noticeInfo.noticeid && this.noticeInfo.rversion
-              ? notice_edit
-              : notice_add;
-          api(form).then((data) => {
-            if (data.code === 0) {
-              this.searchList();
-              this.$Message.success(data.msg);
-            } else {
-              this.$Message.error(data.msg);
-            }
-          });
-        }
-      });
-    },
     // 查看
     toView(row) {
-      notice_detail({
+      notice_detail_region({
         noticeid: row.noticeid
       }).then((data) => {
         if (data.code === 0) {
@@ -386,56 +188,6 @@ export default {
           this.$Message.error(data.msg);
         }
       });
-    },
-    // 编辑
-    toEdit(row) {
-      notice_detail({
-        noticeid: row.noticeid
-      }).then((data) => {
-        if (data.code === 0) {
-          this.noticeInfo = {
-            show: true,
-            noticeid: data.obj.noticeid,
-            rversion: data.obj.rversion,
-            noticeTitle: data.obj.noticeTitle,
-            noticeContent: data.obj.noticeContent,
-            noticeTxt: data.obj.noticeTxt,
-            // 1所有区域2自定义区域
-            noticeType: data.obj.noticeType,
-            regionList: [],
-            regionids:
-              data.obj.noticeType === 1
-                ? []
-                : data.obj.regions.map((item) => item.regionid)
-          };
-          this.getRegionList().then((list) => {
-            this.noticeInfo.regionList = list;
-          });
-        } else {
-          this.$Message.error(data.msg);
-        }
-      });
-    },
-    // 删除
-    toDel(row) {
-      this.$Modal.confirm({
-        title: "提示",
-        content: "您确定删除选中数据吗？",
-        onOk: () => {
-          notice_delete({
-            noticeid: row.noticeid,
-            rversion: row.rversion
-          }).then((data) => {
-            if (data.code === 0) {
-              this.searchList();
-              this.$Message.success(data.msg);
-            } else {
-              this.$Message.error(data.msg);
-            }
-          });
-        },
-        onCancel: () => {}
-      });
     }
   }
 };