feats

src/app.config.js

@@ -22,7 +22,7 @@ export default defineAppConfig({
     'pages/check/loc/list/index',
     'pages/check/edit/index',
     'pages/notice/index',
-    'pages/notice/edit/index',
+    'pages/notice/detail/index',
     'pages/my/index',
     'pages/my/edit/index',
   ],

src/pages/home/index.jsx

@@ -3,37 +3,48 @@ import { View, Text, Image } from '@tarojs/components'
 import Page from '@/layouts/index';
 import { useModel } from '@/store';
 import MenuIcon from '@/components/MenuIcon';
-import { ROLE_INSPECTOR, ROLE_MANAGER, ROLE_ORG_USER } from '@/utils/user';
+import { ROLE_INSPECTOR, ROLE_MANAGER, ROLE_ORG_USER, ROLE_QUERY_PERSON } from '@/utils/user';
 import Head from './components/Head';
 import BannerCard from './components/BannerCard';
 import './index.less';
 
 const menus = {
+  // 督察员
   [ROLE_INSPECTOR]: [
     { icon: 'icon9', text: '我的上报', link: '/pages/issue/list/index' },
-    { icon: 'icon11', text: '消息通知', link: '' },
+    { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
     { icon: 'icon10', text: '模拟测评', link: '/pages/check/list/index' },
   ],
 
+  // 平台管理员
   [ROLE_MANAGER]: [
     { icon: 'icon1', text: '待 交 办', link: '/pages/issue/list2/index?title=待交办&bizStatus=start' },
     { icon: 'icon2', text: '已 交 办', link: '/pages/issue/list2/index?title=已交办&bizStatus=assigned' },
-    { icon: 'icon3', text: '已 办 结', link: '/pages/issue/list2/index?title=已办结报&bizStatus=end' },
+    { icon: 'icon3', text: '已 办 结', link: '/pages/issue/list2/index?title=已办结&bizStatus=end' },
     { icon: 'icon4', text: '消单申请', link: '/pages/apply/list/index?title=消单申请&applyType=end' },
     { icon: 'icon5', text: '逾期警告', link: '/pages/issue/list2/index?title=逾期警告&bizStatus=expired' },
     { icon: 'icon6', text: '延期申请', link: '/pages/apply/list/index?title=延期申请&applyType=delay' },
     { icon: 'icon7', text: '统计查询', link: '' },
     { icon: 'icon9', text: '我的上报', link: '/pages/issue/list2/index?title=我的上报&mine=true' },
-    { icon: 'icon11', text: '消息通知', link: '' },
+    { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
   ],
 
+  // 责任单位用户
   [ROLE_ORG_USER]: [
     { icon: 'icon2', text: '处 理 中', link: '/pages/org/issue/list/index?title=处理中&bizStatus=assigned' },
-    { icon: 'icon3', text: '已 办 结', link: '/pages/org/issue/list/index?title=已办结报&bizStatus=end' },
+    { icon: 'icon3', text: '已 办 结', link: '/pages/org/issue/list/index?title=已办结&bizStatus=end' },
     { icon: 'icon5', text: '已 逾 期', link: '' },
     { icon: 'icon7', text: '统计查询', link: '' },
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
-  ]
+  ],
+
+  // 查询人员
+  [ROLE_QUERY_PERSON]: [
+    { icon: 'icon1', text: '未 处 理', link: '/pages/issue/list2/index?title=未处理&bizStatus=start' },
+    { icon: 'icon2', text: '处 理 中', link: '/pages/issue/list2/index?title=处理中&bizStatus=assigned' },
+    { icon: 'icon3', text: '已 办 结', link: '/pages/issue/list2/index?title=已办结&bizStatus=end' },
+    { icon: 'icon7', text: '统计查询', link: '' },
+  ],
 }
 
 export default (props) => {

src/pages/notice/components/Card/index.jsx

@@ -2,13 +2,18 @@ import React from 'react';
 import { Cell, CellGroup } from '@antmjs/vantui';
 import { View } from '@tarojs/components';
 import Taro from '@tarojs/taro';
+import { getDtStr } from '@/utils/date';
 import style from './style.module.less';
 
 export default (props) => {
 
+  const { dataset } = props;
+
+  const dateStr = React.useMemo(() => dataset?.createDate ? getDtStr(dataset.createDate) : '-', [dataset]);
+
   const onClick = () => {
     Taro.navigateTo({
-      url: `/pages/notice/edit/index`
+      url: `/pages/notice/detail/index?id=${dataset.noticeId}`
     })
   }
 
@@ -16,14 +21,15 @@ export default (props) => {
     <View className={style['notice-card-wrapper']}>
       <CellGroup>
         <Cell
-          title="关于2022年模拟测评报告"
+          title={dataset?.title}
           isLink size="large"
           style={{ color: 'var(--main-bg-color)' }}
           onClick={() => onClick()}
         />
         <Cell
           renderTitle={(<>
-            <View className={style['notice-card-title']}>日期： </View><View className={style['notice-card-title2']}>2022-12-06 12:00</View>
+            <View className={style['notice-card-title']}>日期： </View>
+            <View className={style['notice-card-title2']}>{dateStr}</View>
           </>
           )}
         />

src/pages/notice/components/Details/index.jsx

@@ -1,20 +0,0 @@
-import React from 'react';
-import { View } from '@tarojs/components';
-import style from './style.module.less';
-
-export default (props) => {
-  return (
-    <View className={style['notice-wrapper']} style={style}>
-      <View className={style['notice-hd']}>
-        【关于2022年模拟测评公告】
-        <View className={style['notice-hd2']}>2022-12-06 12:00</View>
-      </View>
-      <View className={style['notice-bd']}>
-
-      </View>
-      <View className={style['notice-ft']}>
-
-      </View>
-    </View>
-  )
-}

src/pages/notice/detail/index.jsx

@@ -0,0 +1,48 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import Page from '@/layouts/index';
+import { getTaNoticeById } from '@/services/tanotice';
+import { getDtStr } from '@/utils/date';
+import style from './style.module.less';
+
+export default (props) => {
+
+  const [loading, setLoading] = React.useState(false);
+  const [detail, setDetail] = React.useState();
+  const dateStr = React.useMemo(() => detail?.createDate ? getDtStr(detail.createDate) : '-', [detail]);
+
+  const router = Taro.useRouter();
+  const { id } = router.params;
+
+  React.useEffect(() => {
+    if (id) {
+      setLoading(true);
+      getTaNoticeById(id).then((res) => {
+        setDetail(res);
+        setLoading(false);
+      }).catch(er => {
+        console.error(er);
+        setLoading(false);
+      });
+    }
+  }, [id]);
+
+  
+  return (
+    <Page loading={loading}>
+      <View className={style['notice-wrapper']} style={style}>
+        <View className={style['notice-hd']}>
+          {detail?.title}
+          <View className={style['notice-hd2']}>{dateStr}</View>
+        </View>
+        <View className={style['notice-bd']}>
+
+        </View>
+        <View className={style['notice-ft']}>
+
+        </View>
+      </View>
+    </Page>
+  )
+}

src/pages/notice/components/Details/style.module.less → src/pages/notice/detail/style.module.less

@@ -1,14 +1,15 @@
 .notice-wrapper {
   height: 100%;
-  display: flex;
-  flex-direction: column;
+  padding: var(--main-space);
 
   .notice-hd {
-    flex: none;
-    margin: var(--main-space);
-    font-weight: bold;
+    font-size: 36px;
+    line-height: 2em;
+    text-align: center;
+
     .notice-hd2 {
-      font-weight: 400;
+      text-align: right;
+      font-size: 24px;
       margin-left: var(--main-space);
     }
   }

src/pages/notice/edit/index.jsx

@@ -1,11 +0,0 @@
-import React from 'react';
-import Page from '@/layouts/index';
-import Details from '../components/Details/index';
-
-export default (props) => {
-  return (
-    <Page>
-      <Details />
-    </Page>
-  )
-}

src/pages/notice/index.jsx

@@ -1,12 +1,22 @@
 import React from 'react';
 import Page from '@/layouts/index';
+import PowerList from '@/components/PowerList';
+import { getTaNotice } from '@/services/tanotice';
 import Card from './components/Card/index';
 
 export default (props) => {
 
+  const [loading, setLoading] = React.useState(false);
+
   return (
     <Page tabBar="notice">
-      <Card />
+      <PowerList
+        request={getTaNotice}
+        params={{status: 1}}
+        renderItem={(item) => (
+          <Card key={item.noticeId} dataset={item} />
+        )}
+      />
     </Page>
   )
 }

src/services/tanotice.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTaNotice = (params) => request('/api/taNotice', { params });
+
+/*
+ * 新增数据
+ */
+export const postTaNotice = (data) => request('/api/taNotice', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaNoticeById = (id) => request(`/api/taNotice/${id}`);
+
+/*
+ * 更新数据
+ */
+export const putTaNotice = (id, data) => request(`/api/taNotice/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaNotice = (id) => request(`/api/taNotice/${id}`, { method: 'delete' });