张涛 11 月之前
父節點
當前提交
82c81a7e47
共有 5 個文件被更改,包括 18 次插入13 次删除
  1. 2
    2
      src/pages/home/index.jsx
  2. 5
    5
      src/pages/org/issue/list2/index.jsx
  3. 4
    0
      src/services/taorgissue.js
  4. 5
    4
      src/store/user.js
  5. 2
    2
      src/utils/message.js

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

@@ -123,7 +123,7 @@ const menus = {
123 123
     },
124 124
     {
125 125
       icon: "icon12",
126
-      text: "123456",
126
+      text: "交办历史",
127 127
       link: "/pages/org/issue/list2/index?mine=true",
128 128
     },
129 129
  
@@ -156,7 +156,7 @@ const menus = {
156 156
     { icon: "person", text: "人员管理", link: "/pages/user/list/index" },
157 157
     {
158 158
       icon: "icon12",
159
-      text: "123456",
159
+      text: "交办历史",
160 160
       link: "/pages/org/issue/list2/index?mine=true",
161 161
     },
162 162
   ],

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

@@ -4,7 +4,7 @@ import { Tab, Tabs, Search } from "@antmjs/vantui";
4 4
 import Page from "@/layouts/index";
5 5
 import PowerList from "@/components/PowerList";
6 6
 import Card from "@/components/IssueCard";
7
-import { getTaOrgIssue } from "@/services/taorgissue";
7
+import { getTaOrgIssue, getTaOrgIssues } from "@/services/taorgissue";
8 8
 import { ROLE_MANAGER } from "@/utils/user";
9 9
 import { useModel } from "@/store";
10 10
 import { getIssueStatus } from "@/utils/biz";
@@ -20,7 +20,7 @@ const sid2 = Math.random().toString(36).substring(2, 8);
20 20
 
21 21
 export default (props) => {
22 22
   const router = Taro.useRouter();
23
-  const { title, bizStatus, color } = router.params;
23
+  const { title, status='-2', color } = router.params;
24 24
   const [issueId, setIssueId] = useState("");
25 25
 
26 26
   React.useMemo(() => {
@@ -34,8 +34,8 @@ export default (props) => {
34 34
   // const { user } = useModel('user');
35 35
 
36 36
   const param = React.useMemo(() => {
37
-    return { bizStatus, sourceType: "inspector", issueId };
38
-  }, [bizStatus, issueId]);
37
+    return { status, sourceType: "inspector", issueId };
38
+  }, [status, issueId]);
39 39
 
40 40
   const onClick = (item) => {
41 41
     Taro.navigateTo({
@@ -62,7 +62,7 @@ export default (props) => {
62 62
       />
63 63
       <PowerList
64 64
         sid={sid1}
65
-        request={getTaOrgIssue}
65
+        request={getTaOrgIssues}
66 66
         params={param}
67 67
         renderItem={(item) => (
68 68
           <Card

+ 4
- 0
src/services/taorgissue.js 查看文件

@@ -4,6 +4,10 @@ import request from '@/utils/request';
4 4
  * 分页查询
5 5
  */
6 6
 export const getTaOrgIssue = (params) => request('/api/taOrgIssue', { params });
7
+/*
8
+ * 分页查询
9
+ */
10
+export const getTaOrgIssues = (params) => request('/api/taOrgIssue/issue', { params });
7 11
 /*
8 12
  * 分页查询
9 13
  */

+ 5
- 4
src/store/user.js 查看文件

@@ -110,13 +110,14 @@ export default function useUser() {
110 110
 
111 111
   const signOut = () => {
112 112
     console.log(111111)
113
-    setPerson(null);
114
-    setUser(null);
115
-    initDuty(null);
116
-    setToken();
117 113
     Taro.navigateTo({
118 114
       url: "/pages/login/index",
119 115
     });
116
+    setPerson();
117
+    setUser();
118
+    initDuty();
119
+    setToken();
120
+  
120 121
   };
121 122
 
122 123
   const changePwd = (params) => {

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

@@ -7,7 +7,7 @@ export function warn(predicate, message) {
7 7
       message,
8 8
       type: 'warning',
9 9
     })
10
-    //Weapp
11
-    throw new Error(message);
10
+    // //Weapp
11
+    // throw new Error(message);
12 12
   }
13 13
 }