Yansen 2 年之前
父節點
當前提交
26d90a70c3
共有 3 個檔案被更改,包括 20 行新增7 行删除
  1. 4
    2
      src/components/IssueCard/index.jsx
  2. 12
    1
      src/pages/issue/edit/index.jsx
  3. 4
    4
      src/pages/issue/list/index.jsx

+ 4
- 2
src/components/IssueCard/index.jsx 查看文件

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

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

@@ -48,7 +48,7 @@ export default (props) => {
48 48
     if (duty == ROLE_INSPECTOR) {
49 49
       return [
50 50
         issue && issue.processNode != PROCESS_START,
51
-        false,
51
+        issue?.processNode && issue?.processNode != PROCESS_START,
52 52
         issue && issue.processNode == PROCESS_START,
53 53
         false,
54 54
         false,
@@ -66,6 +66,17 @@ export default (props) => {
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 81
     return [
71 82
       true,

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

@@ -54,7 +54,7 @@ export default (props) => {
54 54
             request={getTaIssue}
55 55
             params={{ mine, bizStatus: PROCESS_ASSIGNED }}
56 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 60
         </Tab>
@@ -63,7 +63,7 @@ export default (props) => {
63 63
             request={getTaIssue}
64 64
             params={{ mine, bizStatus: PROCESS_END }}
65 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 69
         </Tab>
@@ -72,7 +72,7 @@ export default (props) => {
72 72
             request={getTaIssue}
73 73
             params={{ mine, bizStatus: 'expired' }}
74 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 78
         </Tab>
@@ -81,7 +81,7 @@ export default (props) => {
81 81
             request={getTaIssue}
82 82
             params={{ mine, bizStatus: 'reject' }}
83 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 87
         </Tab>