张涛 11 months ago
parent
commit
82c81a7e47

+ 2
- 2
src/pages/home/index.jsx View File

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

+ 5
- 5
src/pages/org/issue/list2/index.jsx View File

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

+ 4
- 0
src/services/taorgissue.js View File

4
  * 分页查询
4
  * 分页查询
5
  */
5
  */
6
 export const getTaOrgIssue = (params) => request('/api/taOrgIssue', { params });
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 View File

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

+ 2
- 2
src/utils/message.js View File

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