feats

src/components/IssueCard/index.jsx

@@ -38,7 +38,7 @@ export default (props) => {
       (detail.issueContent || detail.content || '').replace('\r\n', '<br>').replace('\n', '<br>'),
       dayjs(detail.createDate).format('YYYY-MM-DD HH:mm'),
       colors[color ?? bizStatus],
-      stText || statusText,
+      statusText,
     ];
   }, [detail, color, stText]);
   

src/pages/home/index.jsx

@@ -3,8 +3,8 @@ import { View, Text, Image } from '@tarojs/components'
 import Page from '@/layouts/index';
 import { useModel } from '@/store';
 import MenuIcon from '@/components/MenuIcon';
-import { ROLE_CITIZEN, ROLE_INSPECTOR, ROLE_MANAGER, ROLE_ORG_USER, ROLE_QUERY_PERSON } from '@/utils/user';
-import { PROCESS_APPLY_DELAY, PROCESS_APPLY_END, PROCESS_APPLY_REJECT, PROCESS_ASSIGNED, PROCESS_END, PROCESS_START } from '@/utils/biz';
+import { ROLE_CITIZEN, ROLE_INSPECTOR, ROLE_MANAGER, ROLE_ORG_MANAGER, ROLE_ORG_USER, ROLE_QUERY_PERSON } from '@/utils/user';
+import { PROCESS_APPLY_DELAY, PROCESS_APPLY_END, PROCESS_APPLY_REJECT, PROCESS_APPLY_VERIFY, PROCESS_ASSIGNED, PROCESS_END, PROCESS_START } from '@/utils/biz';
 import Head from './components/Head';
 import Banner from './components/Banner';
 import StatCard from './components/StatCard';
@@ -40,6 +40,14 @@ const menus = {
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
   ],
 
+  [ROLE_ORG_MANAGER]: [
+    { icon: 'icon2', text: '处 理 中', link: `/pages/org/issue/list/index?title=处理中&bizStatus=${PROCESS_ASSIGNED}` },
+    { icon: 'icon3', text: '已 办 结', link: `/pages/org/issue/list/index?title=已办结&bizStatus=${PROCESS_END}` },
+    { icon: 'icon5', text: '已 逾 期', link: '/pages/org/issue/list/index?title=已办结&bizStatus=expired' },
+    { icon: 'icon9', text: '审核申请', link: `/pages/apply/list/index?title=审核申请&applyType=${PROCESS_APPLY_VERIFY}` },
+    { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
+  ],
+
   // 查询人员
   [ROLE_QUERY_PERSON]: [
     { icon: 'icon1', text: '未 处 理', link: `/pages/issue/list2/index?title=未处理&bizStatus=${PROCESS_START}` },

src/pages/issue/components/Issue/IssueStatus.jsx

@@ -24,7 +24,7 @@ export default (props) => {
     <>
       <Cell title="状态" value={bizStatus?.label}></Cell>
       {
-        issueProcess?.verifyDesc && (
+        issueProcess?.processResult && (
           <>
             <Cell title="驳回原因" />
             <Field

src/pages/org/issue/detail/components/IssueStatus.jsx

@@ -0,0 +1,41 @@
+import React from 'react';
+import { Field, Cell } from '@antmjs/vantui';
+import { getIssueStatus } from '@/utils/biz';
+import { getIssueProcess } from '@/services/taissue';
+
+export default (props) => {
+
+  const { issue } = props;
+  const [bizStatus, setBizStatus] = React.useState();
+  const [issueProcess, setIssueProcess] = React.useState();
+
+  React.useEffect(() => {
+    if (issue) {
+      setBizStatus(getIssueStatus(issue));
+
+      // 取最新的流程日志记录
+      getIssueProcess({ pageSize: 1, issueId: issue.issueId }).then(res => {
+        setIssueProcess((res.records || [])[0]);
+      })
+    }
+  }, [issue]);
+
+  return (
+    <>
+      <Cell title="状态" value={bizStatus?.label}></Cell>
+      {
+        issueProcess?.processResult && (
+          <>
+            <Cell title="驳回原因" />
+            <Field
+              readonly
+              type="textarea"
+              autosize={{ minHeight: '120px' }}
+              value={issueProcess.processResult}
+            />
+          </>
+        )
+      }
+    </>
+  )
+}

src/pages/org/issue/detail/index.jsx

@@ -16,6 +16,9 @@ import {
   PROCESS_ASSIGNED,
   APPLY_READY,
 } from '@/utils/biz';
+import { ROLE_ORG_MANAGER } from '@/utils/user';
+import { useModel } from '@/store';
+import IssueStatus from './components/IssueStatus';
 import IssueInfo from '../../components/issue-info';
 import Apply from './components/Apply';
 
@@ -23,6 +26,7 @@ export default (props) => {
 
   const router = Taro.useRouter();
   const { id, act } = router.params;
+  const { duty } = useModel('user');
 
   const [loading, setLoading] = React.useState(false);
   const [issue, setIssue] = React.useState();
@@ -30,7 +34,6 @@ export default (props) => {
 
   const [
     readOnly,
-    statusTxt,
     showApplyVerify,
     showApplyEnd,
   ] = React.useMemo(() => {
@@ -38,12 +41,11 @@ export default (props) => {
 
     return [
       orgIssue?.processStatus == APPLY_READY || orgIssue?.processNode == PROCESS_END,
-      issue ? getIssueStatus(issue).label : '',
-      orgIssue.processNode == PROCESS_ASSIGNED,
+      orgIssue.processNode == PROCESS_ASSIGNED && duty != ROLE_ORG_MANAGER,
       orgIssue.processNode != PROCESS_END && orgIssue.processNode != PROCESS_APPLY_END ,
     ]
 
-  }, [issue, orgIssue]);
+  }, [orgIssue, duty]);
 
   const setFormData = (key, value) => {
     setOrgIssue({
@@ -94,7 +96,7 @@ export default (props) => {
       </CellGroup>
       
       <CellGroup style={{marginTop: '20px'}}>
-        <Cell title="状态" value={statusTxt} />
+        <IssueStatus issue={issue} />
       </CellGroup>
 
       {