debug notify

杨泽宇
1 parent 3be06ee0
Showing 5 changed files with 106 additions and 64 deletions
src/router/index.ts
src/views/dashboard/index.vue
src/views/notify/edit.vue
src/views/notify/index.vue
src/views/property/index.vue
@@ -10,6 +10,11 @@ import OwnerManagement from &quot;./modules/ownerManagement&quot;
 import Housekeeper from "./modules/housekeeper"
 import Layout from '@/layout/enter.vue'
 const routes: Array<any> = [
+  {
+    path: '/login',
+    name: 'Login',
+    component: () => import(/* webpackChunkName: "About" */ '@/views/user/login.vue')
+  },
   { path: '/', redirect: { path: '/dashboard' } },
   {
     path: '/',
@@ -32,11 +37,6 @@ const routes: Array&lt;any&gt; = [
   OwnerManagement,
   Housekeeper,
   {
-    path: '/login',
-    name: 'Login',
-    component: () => import(/* webpackChunkName: "About" */ '@/views/user/login.vue')
-  },
-  {
     path: '/404',
     name: 'Error',
     component: () => import(/* webpackChunkName: "Error" */ '@/views/error/404.vue'),
 <script setup lang="ts">
-import {ref} from 'vue'
-import {propertyList } from '@/api/property'
-import router from '@/router'
+import { ref } from "vue";
+import { propertyList } from "@/api/property";
+import router from "@/router";
 import * as store from "@/pinia/index";
-const title = ref(import.meta.env.VITE_APP_TITLE).value
-// propertyList().then(res => {
-//   console.log(res)
-// }).catch(error => {
-//   console.log(error)
-// })
-console.log(router.getRoutes())
+const title = ref(import.meta.env.VITE_APP_TITLE).value;
+propertyList()
+  .then((res) => {
+    console.log(res);
+  })
+  .catch((error) => {
+    console.log(error);
+  });
+console.log(router.getRoutes());
 </script>
  
 <template>
   <div class="dashboard-container">
     <div class="dashboard-logo"></div>
-    <h1>欢迎访问 -- {{title}}</h1>
+    <h1>欢迎访问 -- {{ title }}</h1>
+    <!-- {{ store.family }}
+    {{ store.family.menuStore() }}
+    {{ store.family.menuStore().menuList }} -->
   </div>
 </template>
  
@@ -28,11 +33,11 @@ console.log(router.getRoutes())
     text-align: center;
   }
   &-logo {
-    width: 200px; 
-    height: 200px; 
+    width: 200px;
+    height: 200px;
     margin: 0 auto;
-    background-color: pink; 
-    background-image: url('@/assets/logo.png');
+    background-color: pink;
+    background-image: url("@/assets/logo.png");
     background-repeat: no-repeat;
     background-size: contain;
     background-position: 0;
@@ -5,11 +5,12 @@ import { getTableList } from &quot;@/api/community/residence&quot;;
 import { useRoute } from "vue-router";
 import { back } from "@/utils/tool";
 import * as store from "@/pinia/index";
+import { ElMessageBox } from "element-plus";
 import type { ElForm } from "element-plus";
 let form = reactive({
   data: {
     title: "",
-    status: "0",
+    status: null,
     oId: store?.family?.loginStore()?.organizationId,
     neighborHoodId: null,
     neighborHoodName: "",
@@ -40,13 +41,6 @@ const rules = reactive({
       trigger: "change",
     },
   ],
-  status: [
-    {
-      required: true,
-      message: "请选择发布类型",
-      trigger: "change",
-    },
-  ],
 });
 /**
  * 表单重置
@@ -58,20 +52,33 @@ const resetForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
 /**
  * 表单提交
  */
-const submitForm = (formEl: InstanceType<typeof ElForm> | undefined) => {
+const submitForm = (
+  formEl: InstanceType<typeof ElForm> | undefined,
+  type: number
+) => {
   if (!formEl) return;
   formEl.validate(async (valid) => {
     if (valid) {
-      notifyAdd(form.data)
-        .then((res) => {
-          if (res) {
-            instance?.proxy?.$message.success("操作成功");
-            history.go(-1);
+      form.data.status = type;
+      if (type) {
+        ElMessageBox.confirm(
+          "是否确定发布?（确认发布后将不可进行修改）",
+          "提示",
+          {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+            type: "warning",
           }
-        })
-        .catch((error) => {
-          console.log(error);
-        });
+        )
+          .then((res) => {
+            postApi(type);
+          })
+          .catch((error) => {
+            console.log(error);
+          });
+      } else {
+        postApi(type);
+      }
     } else {
       instance?.proxy?.$message.error("请检查表单格式");
       return false;
@@ -79,6 +86,22 @@ const submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
   });
 };
 /**
+ * 表单提交接口
+ * @param {number} type 1发布 0存草稿
+ */
+const postApi = async (type: number) => {
+  notifyAdd(form.data)
+    .then((res) => {
+      if (res) {
+        instance?.proxy?.$message.success(type ? "发布成功" : "已存为草稿");
+        history.go(-1);
+      }
+    })
+    .catch((error) => {
+      console.log(error);
+    });
+};
+/**
  * 选小区，给小区名赋值
  * @param {number | null} data 选中的小区id
  */
@@ -163,15 +186,12 @@ onMounted(() =&gt; {
             show-word-limit
           />
         </el-form-item>
-        <el-form-item label="发布类型" prop="status" style="width: 100%">
-          <el-radio-group v-model="form.data.status">
-            <el-radio label="0">存草稿</el-radio>
-            <el-radio label="1">发布</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item style="width: 100%" v-show="form.dataType !== 'detail'">
-          <el-button type="primary" @click="submitForm(ruleFormRef)"
-            >提交</el-button
+          <el-button type="primary" @click="submitForm(ruleFormRef, 1)"
+            >发布</el-button
+          >
+          <el-button type="primary" @click="submitForm(ruleFormRef, 0)"
+            >存为草稿</el-button
           >
           <el-button
             type="info"
@@ -93,6 +93,13 @@ const handleTimeChange = (value: array) =&gt; {
   getList();
 };
 /**
+ * 表格每一行是否可选中
+ * @param {array} row 每一行数据对象
+ */
+const isSelectable = (row: any) => {
+  return row.status === 0;
+};
+/**
  * 删除
  * @param {object} obj 要删除的数据对象
  */
@@ -176,7 +183,11 @@ onMounted(() =&gt; {
       ref="multipleTableRef"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" align="center" />
+      <el-table-column
+        type="selection"
+        align="center"
+        :selectable="isSelectable"
+      />
       <el-table-column prop="id" label="ID" align="center"></el-table-column>
       <el-table-column
         prop="title"
@@ -204,8 +215,9 @@ onMounted(() =&gt; {
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center">
+        <!-- 已发布状态的公告不可以被修改、删除 -->
         <template #default="scope">
-          <el-button type="text"
+          <el-button type="text" v-show="scope.row.status === 0"
             ><router-link
               :to="{
                 path: '/notify/edit',
@@ -223,7 +235,10 @@ onMounted(() =&gt; {
               >详情</router-link
             ></el-button
           >
-          <el-button type="text" @click="handleDelete(scope.row)"
+          <el-button
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-show="scope.row.status === 0"
             >删除</el-button
           >
         </template>
 <script setup lang="ts">
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
 import { propertyList, propertyStatus } from "@/api/property";
-import { userProxy } from '@/api/user/user';
+import { userProxy } from "@/api/user/user";
 import { menuData } from "@/api/user/login";
 import * as store from "@/pinia/index";
 import { parseTime } from "@/utils/tool";
@@ -68,7 +68,7 @@ const handleSearch = () =&gt; {
 };
 /**
  * 切换状态
- * @param {object} 单条数据对象 
+ * @param {object} 单条数据对象
  */
 const handleStatus = async (obj) => {
   try {
@@ -91,23 +91,23 @@ const handleStatus = async (obj) =&gt; {
  * @param {object} 单条数据对象
  */
 const handleProxy = (obj) => {
-  userProxy({oId: obj.id}).then(res => {
-    if(res?.data) {
-      console.log('代理成功的回调')
-      console.log(res.data)
+  userProxy({ oId: obj.id }).then((res) => {
+    if (res?.data) {
+      console.log("代理成功的回调");
+      console.log(res.data);
       globalProperties.$message.success("代理成功");
       getMenu().then(() => {
-        console.log('got menu data')
+        console.log("got menu data");
         setTimeout(() => {
-          location.href = '/'
-          console.log('跳')
-        }, 2000)
-      })
+          // location.href = '/'
+          console.log("跳");
+        }, 2000);
+      });
     } else {
       globalProperties.$message.error("代理失败");
     }
-  })
-}
+  });
+};
 /**
  * 获取权限菜单
  */
@@ -121,7 +121,7 @@ const getMenu = async () =&gt; {
 };
 /**
  * 状态值
- * @enum {number} 
+ * @enum {number}
  */
 enum statusEnum {
   "禁用" = 0,
@@ -205,7 +205,9 @@ onMounted(() =&gt; {
               >编辑</router-link
             ></el-button
           >
-          <el-button type="text" @click="handleProxy(scope.row)">代理登录</el-button>
+          <el-button type="text" @click="handleProxy(scope.row)"
+            >代理登录</el-button
+          >
           <el-button type="text" @click="handleStatus(scope.row)">{{
             scope.row.status ? "禁用" : "启用"
           }}</el-button>