civilized_city
/
miniapp
關注 1
收藏 0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 0 Wiki 活動
瀏覽代碼

feats

fangmingyue 2 年之前
父節點
e98815cb33
當前提交
a200fc221f
共有 8 個檔案被更改，包括 31 行新增 和 31 行删除
統一視圖 顯示文件統計
  1. 3
    3
      src/layouts/TabBar.jsx
  2. 5
    5
      src/pages/apply/list/index.jsx
  3. 3
    3
      src/pages/home/index.jsx
  4. 2
    2
      src/pages/issue/edit/index.jsx
  5. 7
    7
      src/pages/issue/list/index.jsx
  6. 5
    5
      src/pages/issue/list2/index.jsx
  7. 4
    4
      src/pages/org/issue/list/index.jsx
  8. 2
    2
      src/utils/user.js

+ 3
- 3
src/layouts/TabBar.jsx 查看文件

70 
   const tabItems = React.useMemo(() => {
 70 
   const tabItems = React.useMemo(() => {
71 
     if (!duty) return [];
 71 
     if (!duty) return [];
72
72
73 
-    if (duty == ROLE_INSPECTOR // 督察员
73 
+    if (duty == ROLE_INSPECTOR // 督查员
74 
       || duty == ROLE_MANAGER // 管理员
 74 
       || duty == ROLE_MANAGER // 管理员
75 
     ) {
 75 
     ) {
76 
       return [
 76 
       return [
81 
         mine
 81 
         mine
82 
       ]
 82 
       ]
83 
     }
 83 
     }
84 
-
84 
+
85 
     if (duty == ROLE_QUERY_PERSON) { // 查询员
 85 
     if (duty == ROLE_QUERY_PERSON) { // 查询员
86 
       return [
 86 
       return [
87 
         home,
 87 
         home,
143 
               ></Image>
 143 
               ></Image>
144 
             }
 144 
             }
145 
           >
 145 
           >
146 
-            <View style={{fontSize: '14px'}}>
146 
+            <View style={{ fontSize: '14px' }}>
147 
               {item.label}
 147 
               {item.label}
148 
             </View>
 148 
             </View>
149 
           </TabbarItem>
 149 
           </TabbarItem>

+ 5
- 5
src/pages/apply/list/index.jsx 查看文件

27 
   const { user } = useModel('user');
 27 
   const { user } = useModel('user');
28
28
29 
   const onClick = (item) => {
 29 
   const onClick = (item) => {
30 
-    if (!user) return ;
30 
+    if (!user) return;
31
31
32 
     if (!item.verifyDate) {
 32 
     if (!item.verifyDate) {
33 
       if (duty != ROLE_MANAGER && duty != ROLE_ORG_MANAGER) {
 33 
       if (duty != ROLE_MANAGER && duty != ROLE_ORG_MANAGER) {
45 
       })
 45 
       })
46 
     }
 46 
     }
47 
   }
 47 
   }
48 
-
48 
+
49 
   return (
 49 
   return (
50 
     <Page>
 50 
     <Page>
51 
       <Tabs sticky>
 51 
       <Tabs sticky>
52 
-        <Tab title="督察员">
52 
+        <Tab title="督查员">
53 
           <PowerList
 53 
           <PowerList
54 
             request={getTaIssueApply}
 54 
             request={getTaIssueApply}
55 
-            params={{applyType, sourceType: 'inspector'}}
55 
+            params={{ applyType, sourceType: 'inspector' }}
56 
             renderItem={(item) => (
 56 
             renderItem={(item) => (
57 
               <Card key={item.applyId} applyInfo={item} stText={title} onClick={() => onClick(item)} />
 57 
               <Card key={item.applyId} applyInfo={item} stText={title} onClick={() => onClick(item)} />
58 
             )}
 58 
             )}
61 
         <Tab title="市民">
 61 
         <Tab title="市民">
62 
           <PowerList
 62 
           <PowerList
63 
             request={getTaIssueApply}
 63 
             request={getTaIssueApply}
64 
-            params={{applyType, sourceType: 'feedback'}}
64 
+            params={{ applyType, sourceType: 'feedback' }}
65 
             renderItem={(item) => (
 65 
             renderItem={(item) => (
66 
               <Card key={item.applyId} applyInfo={item} stText={title} onClick={() => onClick(item)} />
 66 
               <Card key={item.applyId} applyInfo={item} stText={title} onClick={() => onClick(item)} />
67 
             )}
 67 
             )}

+ 3
- 3
src/pages/home/index.jsx 查看文件

11 
 import './index.less';
 11 
 import './index.less';
12
12
13 
 const menus = {
 13 
 const menus = {
14 
-  // 督察员
14 
+  // 督查员
15 
   [ROLE_INSPECTOR]: [
 15 
   [ROLE_INSPECTOR]: [
16 
     { icon: 'icon9', text: '我的上报', link: '/pages/issue/list/index?mine=true' },
 16 
     { icon: 'icon9', text: '我的上报', link: '/pages/issue/list/index?mine=true' },
17 
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
 17 
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
56 
     { icon: 'icon3', text: '已 办 结', link: `/pages/issue/list2/index?title=已办结&bizStatus=${PROCESS_END}` },
 56 
     { icon: 'icon3', text: '已 办 结', link: `/pages/issue/list2/index?title=已办结&bizStatus=${PROCESS_END}` },
57 
     { icon: 'icon7', text: '统计查询', link: '/subpkg1/pages/statistics/index' },
 57 
     { icon: 'icon7', text: '统计查询', link: '/subpkg1/pages/statistics/index' },
58 
   ],
 58 
   ],
59 
-
59 
+
60 
   // 市民
 60 
   // 市民
61 
   [ROLE_CITIZEN]: [
 61 
   [ROLE_CITIZEN]: [
62 
     { icon: 'icon1', text: '未处理', link: `/pages/feedback/issuelist/index?title=未处理&bizStatus=${PROCESS_START}` },
 62 
     { icon: 'icon1', text: '未处理', link: `/pages/feedback/issuelist/index?title=未处理&bizStatus=${PROCESS_START}` },
79 
   return (
 79 
   return (
80 
     <Page tabBar="home" className="home-page">
 80 
     <Page tabBar="home" className="home-page">
81 
       <Head userModel={userModel} />
 81 
       <Head userModel={userModel} />
82 
-      <Banner  duty={duty} />
82 
+      <Banner duty={duty} />
83 
       <StatCard duty={duty} />
 83 
       <StatCard duty={duty} />
84
84
85 
       <View className="menu-icons">
 85 
       <View className="menu-icons">

+ 2
- 2
src/pages/issue/edit/index.jsx 查看文件

44 
     canAssigned,
 44 
     canAssigned,
45 
     canCancel,
 45 
     canCancel,
46 
   ] = React.useMemo(() => {
 46 
   ] = React.useMemo(() => {
47 
-    // 如果是督察员
47 
+    // 如果是督查员
48 
     if (duty == ROLE_INSPECTOR) {
 48 
     if (duty == ROLE_INSPECTOR) {
49 
       return [
 49 
       return [
50 
         issue && issue.processNode != PROCESS_START,
 50 
         issue && issue.processNode != PROCESS_START,
86 
   //     ...val,
 86 
   //     ...val,
87 
   //   })
 87 
   //   })
88 
   // }
 88 
   // }
89 
-
89 
+
90 
   React.useEffect(() => {
 90 
   React.useEffect(() => {
91 
     if (id) {
 91 
     if (id) {
92 
       setLoading(true)
 92 
       setLoading(true)

+ 7
- 7
src/pages/issue/list/index.jsx 查看文件

10 
 import { useModel } from '@/store';
 10 
 import { useModel } from '@/store';
11 
 import { getIssueStatus, PROCESS_ASSIGNED, PROCESS_END, PROCESS_START } from '@/utils/biz';
 11 
 import { getIssueStatus, PROCESS_ASSIGNED, PROCESS_END, PROCESS_START } from '@/utils/biz';
12
12
13 
-// 只有督察员能看到当前页面
13 
+// 只有督查员能看到当前页面
14 
 export default (props) => {
 14 
 export default (props) => {
15 
   // const { user } = useModel('user');
 15 
   // const { user } = useModel('user');
16
16
22 
       url: `/pages/issue/edit/index?id=${item.issueId}`
 22 
       url: `/pages/issue/edit/index?id=${item.issueId}`
23 
     })
 23 
     })
24 
   }
 24 
   }
25 
-
25 
+
26 
   return (
 26 
   return (
27 
     <Page roles={[ROLE_INSPECTOR]}>
 27 
     <Page roles={[ROLE_INSPECTOR]}>
28 
       <Tabs sticky>
 28 
       <Tabs sticky>
38 
         <Tab title="未交办">
 38 
         <Tab title="未交办">
39 
           <PowerList
 39 
           <PowerList
40 
             request={getTaIssue}
 40 
             request={getTaIssue}
41 
-            params={{mine, bizStatus: PROCESS_START}}
41 
+            params={{ mine, bizStatus: PROCESS_START }}
42 
             renderItem={(item) => (
 42 
             renderItem={(item) => (
43 
               <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
 43 
               <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
44 
             )}
 44 
             )}
47 
         <Tab title="已交办">
 47 
         <Tab title="已交办">
48 
           <PowerList
 48 
           <PowerList
49 
             request={getTaIssue}
 49 
             request={getTaIssue}
50 
-            params={{mine, bizStatus: PROCESS_ASSIGNED}}
50 
+            params={{ mine, bizStatus: PROCESS_ASSIGNED }}
51 
             renderItem={(item) => (
 51 
             renderItem={(item) => (
52 
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
 52 
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
53 
             )}
 53 
             )}
56 
         <Tab title="已办结">
 56 
         <Tab title="已办结">
57 
           <PowerList
 57 
           <PowerList
58 
             request={getTaIssue}
 58 
             request={getTaIssue}
59 
-            params={{mine, bizStatus: PROCESS_END}}
59 
+            params={{ mine, bizStatus: PROCESS_END }}
60 
             renderItem={(item) => (
 60 
             renderItem={(item) => (
61 
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
 61 
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
62 
             )}
 62 
             )}
65 
         <Tab title="已逾期">
 65 
         <Tab title="已逾期">
66 
           <PowerList
 66 
           <PowerList
67 
             request={getTaIssue}
 67 
             request={getTaIssue}
68 
-            params={{mine, bizStatus: 'expired'}}
68 
+            params={{ mine, bizStatus: 'expired' }}
69 
             renderItem={(item) => (
 69 
             renderItem={(item) => (
70 
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
 70 
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
71 
             )}
 71 
             )}
74 
         <Tab title="已打回">
 74 
         <Tab title="已打回">
75 
           <PowerList
 75 
           <PowerList
76 
             request={getTaIssue}
 76 
             request={getTaIssue}
77 
-            params={{mine, bizStatus: 'reject'}}
77 
+            params={{ mine, bizStatus: 'reject' }}
78 
             renderItem={(item) => (
 78 
             renderItem={(item) => (
79 
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
 79 
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
80 
             )}
 80 
             )}

+ 5
- 5
src/pages/issue/list2/index.jsx 查看文件

14
14
15 
   const router = Taro.useRouter();
 15 
   const router = Taro.useRouter();
16 
   const { title, bizStatus = '', mine = '' } = router.params;
 16 
   const { title, bizStatus = '', mine = '' } = router.params;
17 
-
17 
+
18 
   React.useMemo(() => {
 18 
   React.useMemo(() => {
19 
     if (title) {
 19 
     if (title) {
20 
       Taro.setNavigationBarTitle({ title });
 20 
       Taro.setNavigationBarTitle({ title });
30 
       url: `/pages/issue/edit/index?id=${item.issueId}`
 30 
       url: `/pages/issue/edit/index?id=${item.issueId}`
31 
     })
 31 
     })
32 
   }
 32 
   }
33 
-
33 
+
34 
   return (
 34 
   return (
35 
     <Page>
 35 
     <Page>
36 
       <Tabs sticky>
 36 
       <Tabs sticky>
37 
-        <Tab title="督察员">
37 
+        <Tab title="督查员">
38 
           <PowerList
 38 
           <PowerList
39 
             request={getTaIssue}
 39 
             request={getTaIssue}
40 
-            params={{bizStatus, mine, sourceType: 'inspector'}}
40 
+            params={{ bizStatus, mine, sourceType: 'inspector' }}
41 
             renderItem={(item) => (
 41 
             renderItem={(item) => (
42 
               <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
 42 
               <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
43 
             )}
 43 
             )}
46 
         <Tab title="市民">
 46 
         <Tab title="市民">
47 
           <PowerList
 47 
           <PowerList
48 
             request={getTaIssue}
 48 
             request={getTaIssue}
49 
-            params={{bizStatus, mine, sourceType: 'feedback'}}
49 
+            params={{ bizStatus, mine, sourceType: 'feedback' }}
50 
             renderItem={(item) => (
 50 
             renderItem={(item) => (
51 
               <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
 51 
               <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
52 
             )}
 52 
             )}

+ 4
- 4
src/pages/org/issue/list/index.jsx 查看文件

30 
       url: `/pages/org/issue/detail/index?id=${item.issueId}`
 30 
       url: `/pages/org/issue/detail/index?id=${item.issueId}`
31 
     })
 31 
     })
32 
   }
 32 
   }
33 
-
33 
+
34 
   return (
 34 
   return (
35 
     <Page>
 35 
     <Page>
36 
       <Tabs sticky>
 36 
       <Tabs sticky>
37 
-        <Tab title="督察员">
37 
+        <Tab title="督查员">
38 
           <PowerList
 38 
           <PowerList
39 
             request={getTaOrgIssue}
 39 
             request={getTaOrgIssue}
40 
-            params={{bizStatus, sourceType: 'inspector'}}
40 
+            params={{ bizStatus, sourceType: 'inspector' }}
41 
             renderItem={(item) => (
 41 
             renderItem={(item) => (
42 
               <Card key={item.issueId} issue={item} stText={title} color={color} onClick={() => onClick(item)} />
 42 
               <Card key={item.issueId} issue={item} stText={title} color={color} onClick={() => onClick(item)} />
43 
             )}
 43 
             )}
46 
         <Tab title="市民">
 46 
         <Tab title="市民">
47 
           <PowerList
 47 
           <PowerList
48 
             request={getTaOrgIssue}
 48 
             request={getTaOrgIssue}
49 
-            params={{bizStatus, sourceType: 'feedback'}}
49 
+            params={{ bizStatus, sourceType: 'feedback' }}
50 
             renderItem={(item) => (
 50 
             renderItem={(item) => (
51 
               <Card key={item.issueId} issue={item} stText={title} color={color} onClick={() => onClick(item)} />
 51 
               <Card key={item.issueId} issue={item} stText={title} color={color} onClick={() => onClick(item)} />
52 
             )}
 52 
             )}

+ 2
- 2
src/utils/user.js 查看文件

1
1
2 
-// 督察员
2 
+// 督查员
3 
 export const ROLE_INSPECTOR = 'inspector';
 3 
 export const ROLE_INSPECTOR = 'inspector';
4
4
5 
 // 管理员
 5 
 // 管理员
19
19
20
20
21 
 export const ROLES = {
 21 
 export const ROLES = {
22 
-  [ROLE_INSPECTOR]: '督察员',
22 
+  [ROLE_INSPECTOR]: '督查员',
23 
   [ROLE_MANAGER]: '管理员',
 23 
   [ROLE_MANAGER]: '管理员',
24 
   [ROLE_ORG_USER]: '单位人员',
 24 
   [ROLE_ORG_USER]: '单位人员',
25 
   [ROLE_ORG_MANAGER]: '单位管理员',
 25 
   [ROLE_ORG_MANAGER]: '单位管理员',