Yansen 2 years ago
parent
commit
26d90a70c3

+ 4
- 2
src/components/IssueCard/index.jsx View File

44
   // console.log('issue', issue)
44
   // console.log('issue', issue)
45
   // console.log('detail', detail)
45
   // console.log('detail', detail)
46
 
46
 
47
+  const [bg1, bg2] = styleColor || [];
48
+
47
   return (
49
   return (
48
     <View className={style['issue-card-wrapper']} onClick={onClick}>
50
     <View className={style['issue-card-wrapper']} onClick={onClick}>
49
       <View className={style['issue-card-header']}>
51
       <View className={style['issue-card-header']}>
56
           <View>{createDate}</View>
58
           <View>{createDate}</View>
57
         </View>
59
         </View>
58
       </View>
60
       </View>
59
-      <View className={style['issue-card-body']} style={{ backgroundColor: styleColor[0] }}>
61
+      <View className={style['issue-card-body']} style={{ backgroundColor: bg1 }}>
60
         <ScrollView scrollY style={{ height: '100%' }}>
62
         <ScrollView scrollY style={{ height: '100%' }}>
61
           <RichText nodes={content} />
63
           <RichText nodes={content} />
62
         </ScrollView>
64
         </ScrollView>
66
           <Image src={icon} />
68
           <Image src={icon} />
67
           <Text style={{ 'verticalAlign': 'middle' }}>{detail?.issueAddr || detail?.addr || ''}</Text>
69
           <Text style={{ 'verticalAlign': 'middle' }}>{detail?.issueAddr || detail?.addr || ''}</Text>
68
         </View>
70
         </View>
69
-        <View style={{ color: styleColor[1] }}>{statusTxt}</View>
71
+        <View style={{ color: bg2 }}>{statusTxt}</View>
70
       </View>
72
       </View>
71
     </View>
73
     </View>
72
   )
74
   )

+ 12
- 1
src/pages/issue/edit/index.jsx View File

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,
51
-        false,
51
+        issue?.processNode && issue?.processNode != PROCESS_START,
52
         issue && issue.processNode == PROCESS_START,
52
         issue && issue.processNode == PROCESS_START,
53
         false,
53
         false,
54
         false,
54
         false,
66
       ]
66
       ]
67
     }
67
     }
68
 
68
 
69
+    // 如果是查询员
70
+    if (duty == ROLE_QUERY_PERSON) {
71
+      return [
72
+        true,
73
+        true,
74
+        false,
75
+        false,
76
+        false,
77
+      ]
78
+    }
79
+
69
     // 其他人员
80
     // 其他人员
70
     return [
81
     return [
71
       true,
82
       true,

+ 4
- 4
src/pages/issue/list/index.jsx View File

54
             request={getTaIssue}
54
             request={getTaIssue}
55
             params={{ mine, bizStatus: PROCESS_ASSIGNED }}
55
             params={{ mine, bizStatus: PROCESS_ASSIGNED }}
56
             renderItem={(item) => (
56
             renderItem={(item) => (
57
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
57
+              <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
58
             )}
58
             )}
59
           />
59
           />
60
         </Tab>
60
         </Tab>
63
             request={getTaIssue}
63
             request={getTaIssue}
64
             params={{ mine, bizStatus: PROCESS_END }}
64
             params={{ mine, bizStatus: PROCESS_END }}
65
             renderItem={(item) => (
65
             renderItem={(item) => (
66
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
66
+              <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
67
             )}
67
             )}
68
           />
68
           />
69
         </Tab>
69
         </Tab>
72
             request={getTaIssue}
72
             request={getTaIssue}
73
             params={{ mine, bizStatus: 'expired' }}
73
             params={{ mine, bizStatus: 'expired' }}
74
             renderItem={(item) => (
74
             renderItem={(item) => (
75
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
75
+              <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
76
             )}
76
             )}
77
           />
77
           />
78
         </Tab>
78
         </Tab>
81
             request={getTaIssue}
81
             request={getTaIssue}
82
             params={{ mine, bizStatus: 'reject' }}
82
             params={{ mine, bizStatus: 'reject' }}
83
             renderItem={(item) => (
83
             renderItem={(item) => (
84
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
84
+              <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
85
             )}
85
             )}
86
           />
86
           />
87
         </Tab>
87
         </Tab>