Yansen пре 2 година
родитељ
комит
5cf5683f5b

+ 1
- 1
src/pages/apply/list/index.jsx Прегледај датотеку

@@ -48,7 +48,7 @@ export default (props) => {
48 48
   return (
49 49
     <Page>
50 50
       <Tabs sticky>
51
-        <Tab title="督员">
51
+        <Tab title="督员">
52 52
           <PowerList
53 53
             request={getTaIssueApply}
54 54
             params={{applyType, sourceType: 'inspector'}}

+ 6
- 5
src/pages/issue/edit/index.jsx Прегледај датотеку

@@ -12,6 +12,7 @@ import Save from './components/Save';
12 12
 import Edit from './components/Edit';
13 13
 import Assigned from './components/Assigned';
14 14
 import Cancel from './components/Cancel';
15
+import { PROCESS_END, PROCESS_START } from '@/utils/biz';
15 16
 
16 17
 export default (props) => {
17 18
 
@@ -46,9 +47,9 @@ export default (props) => {
46 47
     // 如果是督察员
47 48
     if (duty == ROLE_INSPECTOR) {
48 49
       return [
49
-        issue && issue.processNode != 'start' && issue.processStatus != 'reject',
50
+        issue && issue.processNode != PROCESS_START,
50 51
         false,
51
-        issue && (issue.processNode == 'start' || issue.processStatus == 'reject'),
52
+        issue && issue.processNode == PROCESS_START,
52 53
         false,
53 54
         false,
54 55
       ]
@@ -57,11 +58,11 @@ export default (props) => {
57 58
     // 如果是管理员
58 59
     if (duty == ROLE_MANAGER) {
59 60
       return [
60
-        issue && issue.processNode != 'start',
61
+        issue && issue.processNode != PROCESS_START,
61 62
         true,
62 63
         false,
63
-        issue && issue.processNode == 'start',
64
-        issue && issue.processNode == 'start',
64
+        issue && issue.processNode == PROCESS_START,
65
+        issue && issue.processNode == PROCESS_START,
65 66
       ]
66 67
     }
67 68
 

+ 1
- 1
src/pages/issue/list2/index.jsx Прегледај датотеку

@@ -34,7 +34,7 @@ export default (props) => {
34 34
   return (
35 35
     <Page>
36 36
       <Tabs sticky>
37
-        <Tab title="督员">
37
+        <Tab title="督员">
38 38
           <PowerList
39 39
             request={getTaIssue}
40 40
             params={{bizStatus, mine, sourceType: 'inspector'}}

+ 3
- 1
src/pages/message/list/components/Card.jsx Прегледај датотеку

@@ -10,7 +10,9 @@ export default (props) => {
10 10
 
11 11
   const url = React.useMemo(() => {
12 12
     if (item.targetType == 'issue') {
13
-
13
+      Taro.navigateTo({
14
+        url: `/pages/issue/edit/index`
15
+      })
14 16
     } else if (item.targetType == 'apply') {
15 17
 
16 18
     }

+ 2
- 1
src/pages/org/issue/detail/index.jsx Прегледај датотеку

@@ -6,6 +6,7 @@ import Page from '@/layouts/index';
6 6
 import Uploader from '@/components/Uploader/index';
7 7
 import { getTaIssueById } from '@/services/taissue';
8 8
 import { getTaOrgIssueByIssueId } from '@/services/taorgissue';
9
+import { PROCESS_START } from '@/utils/biz';
9 10
 
10 11
 import IssueInfo from '../../components/issue-info';
11 12
 import Apply from './components/Apply';
@@ -35,7 +36,7 @@ export default (props) => {
35 36
     return [
36 37
       issue?.applyId,
37 38
       status[issue.applyType],
38
-      orgIssue.processStatus == 'start' && !issue?.applyId
39
+      orgIssue.processStatus == PROCESS_START && !issue?.applyId
39 40
     ]
40 41
 
41 42
   }, [issue, orgIssue]);

+ 1
- 1
src/pages/org/issue/list/index.jsx Прегледај датотеку

@@ -34,7 +34,7 @@ export default (props) => {
34 34
   return (
35 35
     <Page>
36 36
       <Tabs sticky>
37
-        <Tab title="督员">
37
+        <Tab title="督员">
38 38
           <PowerList
39 39
             request={getTaOrgIssue}
40 40
             params={{bizStatus, sourceType: 'inspector'}}