feats

config/dev.js

     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"http://127.0.0.1:9087"'
-    HOST: '"http://192.168.1.2:9087"'
+    HOST: '"http://127.0.0.1:9087"'
+    // HOST: '"http://192.168.1.2:9087"'
   },
   mini: {},
   h5: {}

src/app.config.js

     'pages/apply/list/index',
     'pages/apply/apply/index',
     'pages/apply/verify/index',
+    'pages/apply/detail/index',
+    'pages/message/list/index',
     'pages/index3/index',
     'pages/index4/index',
     'pages/index5/index',

src/components/IssueCard/index.jsx

     const {value : bizStatus = 0, label : statusText} = getIssueStatus(detail);
 
     return [
-      (detail.content || '').replace('\r\n', '<br>').replace('\n', '<br>'),
+      (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,
       <View className={style['issue-card-footer']}>
         <View>
           <Image src={icon} />
-          <Text>{detail?.addr || ''}</Text>
+          <Text>{detail?.issueAddr || detail?.addr || ''}</Text>
         </View>
         <View style={{ color: styleColor[1] }}>{statusTxt}</View>
       </View>

src/components/Pickerful/style.module.less

 .pickerful-box {
   width: 90vw;
   height: 100vh;
+  padding-bottom: env(safe-area-inset-bottom);
   display: flex;
   flex-direction: column;
 

src/components/PowerList/index.jsx

 import { PowerScrollView } from '@antmjs/vantui';
 
 export default (props) => {
-  const { request, params = {}, renderItem } = props;
+  const { request, params, renderItem } = props;
 
   const pageSize = 20;
   const pageNumRef = React.useRef(1);
     return new Promise((resolve, reject) => {
       request({
         pageSize,
-        ...params,
+        ...(params || {}),
         ...options
       }).then((res) => {
         const { records, current, pages } = res;

src/layouts/TabBar.jsx

       ]
     }
 
+    if (user.dutyList.indexOf(ROLE_ORG_USER) > -1) {
+      return [
+        home,
+        notice,
+        mine,
+      ]
+    }
+
     return [];
   }, [user]);
 

src/pages/apply/components/Issue.jsx

 import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
 import Uploader from '@/components/Uploader/index';
 import { getTaIssueById } from '@/services/taissue';
+import { getDtStr } from '@/utils/date';
 
-const getDtStr = dt => !dt ? '' : dt.replace('T', ' ').substring(0, 16)
 export default (props) => {
   const { issueId, onLoading } = props;
 

src/pages/apply/detail/index.jsx

 import Page from '@/layouts/index';
 import { Cell, CellGroup, Field, Radio, RadioGroup } from '@antmjs/vantui';
 import { getTaIssueApplyById } from '@/services/taissueapply';
+import { getDtStr } from '@/utils/date';
 import Issue from '../components/Issue';
 
 // const today = new Date();
       <CellGroup style={{marginTop: '20px'}}>
         <Cell
           title="审批结果"
-        >
-          <RadioGroup
-            readonly
-            direction="horizontal"
-            value={applyInfo.verifyStatus}
-          >
-            <Radio name="pass" checkedColor="var(--main-bg-color)">通过</Radio>
-            <Radio name="reject" checkedColor="red">驳回</Radio>
-          </RadioGroup>
-        </Cell>
+          value={applyInfo.verifyStatus == 'pass' ? '通过' : '驳回'}
+        />
         <Cell title="审批说明" />
         <Field
           readonly
           autosize={{ minHeight: '120px' }}
           value={applyInfo.verifyDesc}
         />
+        <Cell
+          title="审核日期"
+          value={getDtStr(applyInfo.verifyDate)}
+        />
       </CellGroup>
     </Page>
   )

src/pages/apply/list/index.jsx

   const { user } = useModel('user');
 
   const onClick = (item) => {
+    if (!user) return ;
 
-    let act = '';
-    const status = getIssueStatus(item);
-
-    // 如果是管理员
     if (user.dutyList.indexOf(ROLE_MANAGER) > -1) {
-      // 如果是待交办
-      if (status.value === 0) {
-        act = 'assigned';
+      if (item.verifyStatus) {
+        Taro.navigateTo({
+          url: `/pages/apply/detail/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`
+        })
+      } else {
+        Taro.navigateTo({
+          url: `/pages/apply/verify/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`
+        })
       }
     } else {
-      
+      Taro.navigateTo({
+        url: `/pages/apply/detail/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`
+      })
     }
-
-    Taro.navigateTo({
-      url: `/pages/issue/edit/index?id=${item.issueId}&act=${act}`
-    })
   }
   
   return (
             request={getTaIssueApply}
             params={{applyType, sourceType: 'inspector'}}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+              <Card key={item.issueId} detail={item} stText={title} onClick={() => onClick(item)} />
             )}
           />
         </Tab>
             request={getTaIssueApply}
             params={{applyType, sourceType: 'feedback'}}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+              <Card key={item.issueId} detail={item} stText={title} onClick={() => onClick(item)} />
             )}
           />
         </Tab>

src/pages/home/index.jsx

 import Page from '@/layouts/index';
 import { useModel } from '@/store';
 import MenuIcon from '@/components/MenuIcon';
-import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
+import { ROLE_INSPECTOR, ROLE_MANAGER, ROLE_ORG_USER } from '@/utils/user';
 import Head from './components/Head';
 import BannerCard from './components/BannerCard';
 import './index.less';
   ],
 
   [ROLE_MANAGER]: [
-    { icon: 'icon9', text: '我的上报', link: '/pages/issue/list2/index?title=我的上报&mine=true' },
-    { icon: 'icon11', text: '消息通知', link: '' },
-    { icon: 'icon10', text: '模拟测评', link: '' },
     { icon: 'icon1', text: '待 交 办', link: '/pages/issue/list2/index?title=待交办&bizStatus=start' },
     { icon: 'icon2', text: '已 交 办', link: '/pages/issue/list2/index?title=已交办&bizStatus=assigned' },
     { icon: 'icon3', text: '已 办 结', link: '/pages/issue/list2/index?title=已办结报&bizStatus=end' },
     { icon: 'icon5', text: '逾期警告', link: '/pages/issue/list2/index?title=逾期警告&bizStatus=expired' },
     { icon: 'icon6', text: '延期申请', link: '/pages/apply/list/index?title=延期申请&applyType=delay' },
     { icon: 'icon7', text: '统计查询', link: '' },
+    { icon: 'icon9', text: '我的上报', link: '/pages/issue/list2/index?title=我的上报&mine=true' },
+    { icon: 'icon11', text: '消息通知', link: '' },
+  ],
+
+  [ROLE_ORG_USER]: [
+    { icon: 'icon2', text: '处 理 中', link: '/pages/org/issue/list/index?title=处理中&bizStatus=assigned' },
+    { icon: 'icon3', text: '已 办 结', link: '/pages/org/issue/list/index?title=已办结报&bizStatus=end' },
+    { icon: 'icon5', text: '已 逾 期', link: '' },
+    { icon: 'icon7', text: '统计查询', link: '' },
+    { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
   ]
 }
 

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

 import { getIssueStatus } from '@/utils/biz';
 import { getDateStr } from '@/utils/date';
 import mapIcon from '@/assets/icons/marker.png';
+import { getIssueProcess } from '@/services/taissue';
 
 const today = new Date();
 
   const [showOrgPicker, setShowOrgPicker] = React.useState(false);
   const [showDatePicker, setShowDatePicker] = React.useState(false);
   const [bizStatus, setBizStatus] = React.useState();
+  const [issueProcess, setIssueProcess] = React.useState([]);
   
+  const issueReject = React.useMemo(() => {
+    if (!issueProcess || !issueProcess.length) return {};
+
+    return issueProcess.filter(x => x.processStatus === 'reject')[0] || {};
+  }, [issueProcess]);
+    
   const onLocTypeChange = (_, it) => {
     setFormData({
       ...formData,
     if (issue) {
       setFormData(issue);
       setBizStatus(getIssueStatus(issue));
+      
+      if (issue.processStatus == 'reject') {
+        getIssueProcess({pageSize: 100, issueId: issue.issueId}).then(res => {
+          setIssueProcess(res.records || []);
+        })
+      }
     }
   }, [issue]);
   
               title="状态"
               value={bizStatus.label}
             />
+
+          {
+            issueReject.processId && (
+              <>
+                <Cell title="驳回原因" />        
+                <Field
+                  readonly
+                  type="textarea"
+                  autosize={{ minHeight: '120px' }}
+                  value={issueReject.processResult}
+                />
+              </>
+            )
+          }
           </CellGroup>
         )
       }
+      
 
       <CellGroup style={{marginTop: '20px'}}>
         <Cell

src/pages/issue/edit/components/Assigned.jsx

 import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
-import { Button, Popup, CellGroup, Cell, Field } from '@antmjs/vantui';
-import { postIssueAssigned, deleteTaIssue, postIssueRejct } from '@/services/taissue';
+import { Button } from '@antmjs/vantui';
+import { postIssueAssigned, putTaIssue } from '@/services/taissue';
 import { warn } from '@/utils/message';
-import style from './style.module.less';
 
 export default (props) => {
 
   const { issue, formData } = props;
 
   const [loading1, setLoading1] = React.useState(false);
-  const [loading2, setLoading2] = React.useState(false);
-  const [loading3, setLoading3] = React.useState(false);
-  const [show, setShow] = React.useState(false);
-  const [processResult, setProcessResult] = React.useState();
   
   // 交办
   const onAssigned = () => {
     }
 
     setLoading1(true)
-    postIssueAssigned({ ...issue, formData }).then(() => {
-      setLoading1(false);
-      Taro.navigateBack({delta: 1});
-    }).catch(() => {
-      setLoading1(false);
-    })
-  }
-
-  const onDelete = () => {
-    Taro.showModal({
-      title: '删除',
-      content: '确定进行删除操作?',
-      success (res) {
-        if (res.confirm) {
-          setLoading2(true)
-          deleteTaIssue(issue.issueId).then(() => {
-            setLoading2(false);
-            Taro.navigateBack({delta: 1});
-          }).catch(() => {
-            setLoading2(false);
-          })
-        }
-      }
-    })
-  }
-
-  const onReject = () => {
-    try {
-      warn(!processResult, '请填写退单理由')
-    } catch (e) {
-      return;
-    }
-
-    setShow(false);
 
-    const data = {
-      processResult,
-      issueId: issue.issueId,
-    }
-
-    setLoading3(true)
-    postIssueRejct(data).then(() => {
-      setLoading3(false);
-      Taro.navigateBack({delta: 1});
+    const data = { ...issue, ... formData };
+
+    // 先提交修改
+    putTaIssue(issue.issueId, data).then(() => {
+      // 再提交交办
+      postIssueAssigned(data).then(() => {
+        setLoading1(false);
+        Taro.navigateBack({delta: 1});
+      }).catch(() => {
+        setLoading1(false);
+      })
     }).catch(() => {
-      setLoading3(false);
+      setLoading1(false);
     })
   }
-  
+ 
   return (
-    <View class={style['assigned-btn-wrapper']}>
-      <Popup position="bottom" show={show} onClose={() => setShow(false)}>
-        <CellGroup>
-          <Cell title="退单理由" />
-          <Field
-            type="textarea"
-            placeholder="请输入退单理由"
-            value={processResult}
-            autosize={{ minHeight: '240px' }}
-            onChange={e => setProcessResult(e.detail)}
-          />
-          <View style={{display: 'flex', justifyContent: 'space-around'}}>
-            <Button plain type="default" onClick={() => setShow(false)}>取消</Button>
-            <Button plain type="primary" onClick={onReject}>确定</Button>
-          </View>
-        </CellGroup>
-      </Popup>
-      <View>          
-        <Button
-          block
-          type="primary"
-          loading={loading1}
-          disabled={loading2 && loading3}
-          onClick={onAssigned}
-        >交办</Button>
-      </View>
-      <View style={{marginTop: '20px', display: 'flex'}}>
-        <Button
-          plain
-          hairline
-          type="danger"
-          loading={loading2}
-          disabled={loading1 && loading3}
-          style={{ flex: 1 }}
-          onClick={onDelete}
-        >删除</Button>
-        <Button
-          plain
-          hairline
-          type="info"
-          loading={loading3}
-          disabled={loading1 && loading2}
-          style={{ flex: 1, marginLeft: 'var(--main-space)' }}
-          onClick={() => setShow(true)}
-        >退单</Button>
-      </View>
-    </View>
+    <Button
+      block
+      type="primary"
+      loading={loading1}
+      onClick={onAssigned}
+      style={{marginTop: '20px'}}
+    >交办</Button>
   )
 }

src/pages/issue/edit/components/Cancel.jsx

+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button, Popup, CellGroup, Cell, Field } from '@antmjs/vantui';
+import { deleteTaIssue, postIssueRejct } from '@/services/taissue';
+import { warn } from '@/utils/message';
+
+export default (props) => {
+
+  const { issue } = props;
+
+  const [loading2, setLoading2] = React.useState(false);
+  const [loading3, setLoading3] = React.useState(false);
+  const [show, setShow] = React.useState(false);
+  const [processResult, setProcessResult] = React.useState();
+  
+  const onDelete = () => {
+    Taro.showModal({
+      title: '删除',
+      content: '确定进行删除操作?',
+      success (res) {
+        if (res.confirm) {
+          setLoading2(true)
+          deleteTaIssue(issue.issueId).then(() => {
+            setLoading2(false);
+            Taro.navigateBack({delta: 1});
+          }).catch(() => {
+            setLoading2(false);
+          })
+        }
+      }
+    })
+  }
+
+  const onReject = () => {
+    try {
+      warn(!processResult, '请填写退单理由')
+    } catch (e) {
+      return;
+    }
+
+    setShow(false);
+
+    const data = {
+      processResult,
+      issueId: issue.issueId,
+    }
+
+    setLoading3(true)
+    postIssueRejct(data).then(() => {
+      setLoading3(false);
+      Taro.navigateBack({delta: 1});
+    }).catch(() => {
+      setLoading3(false);
+    })
+  }
+  
+  return (
+    <>
+      <Popup position="bottom" show={show} onClose={() => setShow(false)}>
+        <CellGroup>
+          <Cell title="退单理由" />
+          <Field
+            type="textarea"
+            placeholder="请输入退单理由"
+            value={processResult}
+            autosize={{ minHeight: '240px' }}
+            onChange={e => setProcessResult(e.detail)}
+          />
+          <View style={{display: 'flex', justifyContent: 'space-around'}}>
+            <Button plain type="default" onClick={() => setShow(false)}>取消</Button>
+            <Button plain type="primary" onClick={onReject}>确定</Button>
+          </View>
+        </CellGroup>
+      </Popup>
+      <View style={{marginTop: '20px', display: 'flex'}}>
+        <Button
+          plain
+          hairline
+          type="danger"
+          loading={loading2}
+          disabled={loading3}
+          style={{ flex: 1 }}
+          onClick={onDelete}
+        >删除</Button>
+        <Button
+          plain
+          hairline
+          type="info"
+          loading={loading3}
+          disabled={loading2}
+          style={{ flex: 1, marginLeft: 'var(--main-space)' }}
+          onClick={() => setShow(true)}
+        >退单</Button>
+      </View>
+    </>
+  )
+}

src/pages/issue/edit/components/Edit.jsx

     setLoading(true)
     putTaIssue(issue.issueId, { ...issue, formData }).then(() => {
       setLoading(false);
-      Taro.navigateBack({delta: 1});
+      Taro.navigateBack({
+        delta: 1,
+        fail: () => {
+          Taro.reLaunch({
+            url: 'pages/home/index'
+          })
+        } 
+      });
     }).catch(() => {
       setLoading(false);
     })
   }
   
   return (
-    <View style={{ padding: '0 1em' }}>
-      <Button block type="primary" loading={loading} onClick={onSubmit}>修改</Button>
-    </View>
+    <Button
+      block
+      plain
+      hairline
+      type="primary"
+      loading={loading}
+      onClick={onSubmit}
+    >修改</Button>
   )
 }

src/pages/issue/edit/components/Form.jsx

-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { Button, Notify, Field, Cell, CellGroup } from '@antmjs/vantui';
-import LocType from '@/components/LocType';
-import IssueType from '@/components/IssueType';
-import Map from '@/components/map';
-import Uploader from '@/components/Uploader/index';
-import mapIcon from '@/assets/icons/marker.png';
-
-export default (props) => {
-  const { issue, renderAction } = props;
-
-  const [formData, setFormData] = React.useState({
-    typeId: undefined,
-    typeName: undefined,
-    locId: undefined,
-    locName: undefined,
-    location: undefined,
-    addr: undefined,
-    content: undefined,
-    attachList: [],
-  });
-  const [showLocType, setShowLocType] = React.useState(false);
-  const [showIssueType, setShowIssueType] = React.useState(false);
-  
-  const onLocTypeChange = (_, it) => {
-    setFormData({
-      ...formData,
-      locId: it.typeId,
-      locName: it.name,
-    });
-    setShowLocType(false);
-  }
-
-  const onIssueTypeChange = (_, it) => {
-    setFormData({
-      ...formData,
-      typeId: it.typeId,
-      typeName: it.name,
-    });
-    setShowIssueType(false);
-  }
-
-  const onFieldChange = (field, value) => {
-    setFormData({
-      ...formData,
-      [field]: value,
-    })
-  }
-
-  React.useEffect(() => {
-    if (issue) {
-      setFormData(issue);
-    }
-  }, [issue]);
-  
-  return (
-    <View>
-      <LocType
-        show={showLocType}
-        value={formData.addr}
-        onCancel={() => setShowLocType(false)}
-        onChange={onLocTypeChange}
-      />
-
-      <IssueType
-        show={showIssueType}
-        value={formData.typeName}
-        onCancel={() => setShowIssueType(false)}
-        onChange={onIssueTypeChange}
-      />
-
-      <Map location={formData.location} />
-
-      <CellGroup>
-        <Cell
-          isLink
-          title="点位"
-          value={formData.locName}
-          onClick={() => setShowLocType(true)}
-        />
-        <Field
-          value={formData.addr}
-          leftIcon={mapIcon}
-          placeholder="请输入地址"
-          onChange={e => onFieldChange('addr', e.detail)}
-        />
-      </CellGroup>
-
-      <CellGroup style={{marginTop: '20px'}}>
-
-        <Cell
-          isLink
-          title="问题分类"
-          style={{marginTop: '20px'}}
-          value={formData.typeName}
-          onClick={() => setShowIssueType(true)}
-        />
-        <Cell title="问题描述" border={false} />
-
-        <Field
-          type="textarea"
-          placeholder="请输入问题描述"
-          autosize={{ minHeight: '120px' }}
-          value={formData.content}
-          onChange={e => onFieldChange('content', e.detail)}
-        />
-      </CellGroup>
-            
-      <CellGroup style={{marginTop: '20px'}}>        
-        <Cell title="拍照或视频" border={false} />
-
-        <Cell
-          renderTitle={
-            <Uploader value={formData.attachList} onChange={e => onFieldChange('attachList',e)} />
-          }
-        />
-      </CellGroup>
-
-      <View style={{margin: '20px auto'}}>
-        {renderAction(formData)}
-      </View>
-    </View>
-  )
-}

src/pages/issue/edit/components/Save.jsx

     setLoading(true)
     postTaIssue(formData).then(() => {
       setLoading(false);
-      Taro.navigateBack({delta: 1});
+      Taro.navigateBack({
+        delta: 1,
+        fail: () => {
+          Taro.reLaunch({
+            url: '/pages/home/index'
+          });
+        }
+      });
     }).catch(() => {
       setLoading(false);
     })
   }
   
   return (
-    <View style={{ padding: '0 1em' }}>
-      <Button block type="primary" loading={loading} onClick={onSubmit}>提交</Button>
-    </View>
+    <Button block type="primary" loading={loading} onClick={onSubmit}>提交</Button>
   )
 }

src/pages/issue/edit/components/style.module.less

-
-
-.assigned-btn-wrapper {
-  background: #fff;
-  padding: var(--main-space);  
-}

src/pages/issue/edit/index.config.js

+// eslint-disable-next-line no-undef
 export default definePageConfig({
   navigationBarTitleText: '我要上报'
 })

src/pages/issue/edit/index.jsx

 import React from 'react';
 import Taro from '@tarojs/taro';
-import { Block } from '@tarojs/components';
+import { View } from '@tarojs/components';
 import { CellGroup, Cell } from '@antmjs/vantui';
 import Page from '@/layouts/index';
+import { useModel } from '@/store';
 import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
 import { getTaIssueById } from '@/services/taissue';
 import IssueForm from '../components/Issue';
 import Save from './components/Save';
 import Edit from './components/Edit';
 import Assigned from './components/Assigned';
+import Cancel from './components/Cancel';
 
 export default (props) => {
 
   const router = Taro.useRouter();
   const { id, act } = router.params;
 
+  const { user } = useModel('user');
+
   const [loading, setLoading] = React.useState(false);
   const [issue, setIssue] = React.useState();
 
+  // 各按钮状态
+  const [
+    readOnly,
+    canEdit,
+    canAssigned,
+    canCancel,
+  ] = React.useMemo(() => {
+    if (!issue) return [];
+    if (!user) return [];
+
+    // 如果是督察员
+    if (user.dutyList.indexOf(ROLE_INSPECTOR) > -1) {
+      return [
+        issue.processNode != 'start' && issue.processStatus != 'reject',
+        issue.processNode == 'start' || issue.processStatus == 'reject',
+        false,
+        false,
+      ]
+    }
+
+    // 如果是管理员
+    if (user?.dutyList.indexOf(ROLE_MANAGER) > -1) {
+      return [
+        issue.processNode != 'start',
+        false,
+        issue.processNode == 'start',
+        issue.processNode == 'start',
+      ]
+    }
+
+    return [];
+  }, [issue, user]);
+
+  const onIssueChange = (val = {}) => {
+    setIssue({
+      ...(issue || {}),
+      ...val,
+    })
+  }
+  
   React.useEffect(() => {
     if (id) {
       setLoading(true)
     <Page roles={[ROLE_INSPECTOR, ROLE_MANAGER]} loading={loading}>
       <IssueForm
         issue={issue}
-        readOnly={id&&!act}
-        showOrg={act === 'assigned'}
-        showExpireDate={act === 'assigned'}
+        readOnly={readOnly}
+        showOrg={canAssigned}
+        showExpireDate={canAssigned}
         renderAction={(formData) => (
-          <Block>
+          <View style={{ padding: 'var(--main-space)', background: '#fff' }}>
             {!id && <Save formData={formData} />}
-            {act === 'edit' && <Edit issue={issue} formData={formData} />}
-            {act === 'assigned' && <Assigned issue={issue} formData={formData} />}
-          </Block>
+            {canEdit && <Edit issue={issue} formData={formData} />}
+            {canAssigned && <Assigned issue={issue} formData={formData} />}
+            {canCancel && <Cancel issue={issue} />}
+          </View>
         )}
       />
     </Page>

src/pages/issue/list/index.jsx

 
 // 只有督察员能看到当前页面
 export default (props) => {
-  const { user } = useModel('user');
+  // const { user } = useModel('user');
 
   const onClick = (item) => {
-    let act = '';
-    const status = getIssueStatus(item);
-    
-    // 如果是管理员
-    if (user.dutyList.indexOf(ROLE_MANAGER) > -1) {
-      // 如果是待交办
-      if (status.value === 0) {
-        act = 'assigned';
-      }
-    } else if (user.dutyList.indexOf(ROLE_INSPECTOR) > -1) {
-      // 如果是待交办
-      if (status.value === 0) {
-        act = 'edit';
-      }
-    }
-
     Taro.navigateTo({
-      url: `/pages/issue/edit/index?id=${item.issueId}&act=${act}`
+      url: `/pages/issue/edit/index?id=${item.issueId}`
     })
   }
   
   return (
-    <Page>
+    <Page roles={[ROLE_INSPECTOR]}>
       <Tabs sticky>
         <Tab title="全部">
           <PowerList
             request={getTaIssue}
-            params={{mine: true}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}
         <Tab title="未交办">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: 'start', mine: true}}
+            params={{bizStatus: 'start'}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}
         <Tab title="已交办">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: 'start', mine: true}}
+            params={{bizStatus: 'assigned'}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}
         <Tab title="已办结">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: 'end', mine: true}}
+            params={{bizStatus: 'end'}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}
         <Tab title="已逾期">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: 'expired', mine: true}}
+            params={{bizStatus: 'expired'}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}
         <Tab title="已打回">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: 'reject', mine: true}}
+            params={{bizStatus: 'reject'}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}

src/pages/message/list/components/Card.jsx

+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Cell } from '@antmjs/vantui';
+import { getDtStr } from '@/utils/date';
+import style from './card.module.less';
+
+export default (props) => {
+  const { item } = props;
+
+  const url = React.useMemo(() => {
+    if (item.targetType == 'issue') {
+
+    } else if (item.targetType == 'apply') {
+
+    }
+
+    return '';
+  }, [item])
+  
+  return (
+    <View className={style['msg-card-wrapper']}>
+      <Cell
+        isLink
+        url={url}
+        renderTitle={(
+          <View style={{ display: 'flex', justifyContent: 'space-between' }}>
+            <View>
+              {item?.title}
+            </View>
+            <View>
+              {getDtStr(item?.createDate)}
+            </View>
+          </View>
+        )}
+        renderLabel={(
+          <View style={{ width: '100%' }}>
+            <View>
+              {item?.content}
+            </View>
+          </View>
+        )}
+      />
+    </View>
+  )
+}

src/pages/message/list/components/card.module.less

+
+.msg-card-wrapper {
+  background: #FFFFFF;
+  box-shadow: 0px 9px 11px 0px rgba(0,0,0,0.06);
+  border-radius: 8px;
+  width: calc(100% - var(--main-space) * 2);
+  margin: var(--main-space);
+}

src/pages/message/list/index.config.js

+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '消息列表'
+})

src/pages/message/list/index.jsx

+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import Page from '@/layouts/index';
+import PowerList from '@/components/PowerList';
+import { getTaMessage } from '@/services/tamessage';
+import Card from './components/Card';
+
+export default (props) => {
+
+  
+  return (
+    <Page>
+      <PowerList
+        request={getTaMessage}
+        renderItem={(item) => (
+          <Card key={item.msgId} item={item} />
+        )}
+      />
+    </Page>
+  )
+}

src/pages/org/components/issue-info/index.jsx

 import { View } from '@tarojs/components';
 import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
 import Uploader from '@/components/Uploader/index';
+import { getDtStr } from '@/utils/date';
 
-const getDtStr = dt => !dt ? '' : dt.replace('T', ' ').substring(0, 16)
 export default (props) => {
   const { issue } = props;
   return (

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

 
   const onSubmit = () => {
     try {
-      warn(!orgIssue || !orgIssue.issueId, '未找打问题单');
+      warn(!orgIssue || !orgIssue.issueId, '未找到问题单');
       if (applyType === 'delay') {
         warn(!formData.content, '请选择延期时间');
       }

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

 import IssueInfo from '../../components/issue-info';
 import Apply from './components/Apply';
 
+const status = {
+  delay: '延期申请中',
+  reject: '驳回申请中',
+  end: '办结申请中',
+}
+
 export default (props) => {
 
   const router = Taro.useRouter();
   const [issue, setIssue] = React.useState();
   const [orgIssue, setOrgIssue] = React.useState({});
 
-  const showEditBtn = React.useMemo(() => !orgIssue.result, [orgIssue.issueId]);
+  const [
+    readOnly,
+    statusTxt,
+    showEditBtn,
+  ] = React.useMemo(() => {
+    if (!orgIssue.issueId) return [];
+
+    return [
+      issue?.applyId,
+      status[orgIssue.result],
+      orgIssue.processStatus == 'start' && !issue?.applyId
+    ]
+
+  }, [issue, orgIssue.issueId]);
 
   const setFormData = (key, value) => {
     setOrgIssue({
         <Cell title="整改结果" />
         <Field
           type="textarea"
+          readonly={readOnly}
           autosize={{ minHeight: '120px' }}
           value={orgIssue.result}
           onChange={e => setFormData('result', e.detail)}
 
         <Cell
           renderTitle={
-            <Uploader value={orgIssue.attachList} onChange={e => setFormData('attachList',e)} />
+            <Uploader disabled={readOnly} value={orgIssue.attachList} onChange={e => setFormData('attachList',e)} />
           }
         />
       </CellGroup>
-      <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
-        <View>
-          {
-            showEditBtn ?
-              <Button block type="primary">保存修改</Button> :
-              <Apply block type="primary" applyType="end">申请办结</Apply>
-          }
-        </View>
-        {
-          !showEditBtn && (
-            <View style={{marginTop: '20px'}}>
-              <Apply block type="primary" applyType="org-verify">申请审核</Apply>
+
+      {
+        readOnly && (
+          <CellGroup style={{marginTop: '20px'}}>
+            <Cell title="状态" value={statusTxt} />
+          </CellGroup>
+        )
+      }
+
+      {
+        !readOnly && (
+          <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
+            <View>
+              {
+                showEditBtn ?
+                  <Button block type="primary">保存修改</Button> :
+                  <Apply block type="primary" applyType="end" orgIssue={orgIssue}>申请办结</Apply>
+              }
+            </View>
+            {
+              !showEditBtn && (
+                <View style={{marginTop: '20px'}}>
+                  <Apply block type="primary" applyType="org-verify" orgIssue={orgIssue}>申请审核</Apply>
+                </View>
+              )
+            }
+            <View style={{marginTop: '20px', display: 'flex' }}>
+              <Apply
+                block
+                plain
+                hairline
+                type="info"
+                applyType="delay"
+                orgIssue={orgIssue}
+              >申请延期</Apply>
+              <Apply
+                block
+                plain
+                hairline
+                type="danger"
+                applyType="reject"
+                orgIssue={orgIssue}
+                style={{marginLeft: 'var(--main-space)'}}
+              >申请驳回</Apply>
             </View>
-          )
-        }
-        <View style={{marginTop: '20px', display: 'flex' }}>
-          <Apply
-            block
-            plain
-            hairline
-            type="info"
-            applyType="delay"
-          >申请延期</Apply>
-          <Apply
-            block
-            plain
-            hairline
-            type="danger"
-            applyType="reject"
-            style={{marginLeft: 'var(--main-space)'}}
-          >申请驳回</Apply>
-        </View>
-      </View>
+          </View>
+        )
+      }
     </Page>
   )
 }

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

 export default (props) => {
 
   const router = Taro.useRouter();
-  const { title, bizStatus } = router.params;
+  const { title, bizStatus, color } = router.params;
 
   React.useMemo(() => {
     if (title) {
   // const { user } = useModel('user');
 
   const onClick = (item) => {
-
-    let act = '';
-    const status = getIssueStatus(item);
-
-    // 如果是待交办
-    if (status.value === 0) {
-      act = 'assigned';
-    }
-
     Taro.navigateTo({
-      url: `/pages/issue/edit/index?id=${item.issueId}&act=${act}`
+      url: `/pages/org/issue/detail/index?id=${item.issueId}`
     })
   }
   
             request={getTaOrgIssue}
             params={{bizStatus, sourceType: 'inspector'}}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+              <Card key={item.issueId} detail={item} stText={title} color={color} onClick={() => onClick(item)} />
             )}
           />
         </Tab>
             request={getTaOrgIssue}
             params={{bizStatus, sourceType: 'feedback'}}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+              <Card key={item.issueId} detail={item} stText={title} color={color} onClick={() => onClick(item)} />
             )}
           />
         </Tab>

src/services/taissue.js

  * 驳回
  */
 export const postIssueRejct = (data) => request('/api/taIssueProcess/reject', { data, method: 'post' });
+
+/*
+ * 获取所有流程节点
+ */
+export const getIssueProcess = (params) => request('/api/taIssueProcess', { params });

src/services/tamessage.js

+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTaMessage = (params) => request('/api/taMessage', { params });
+
+/*
+ * 新增数据
+ */
+export const postTaMessage = (data) => request('/api/taMessage', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaMessageById = (id) => request(`/api/taMessage/${id}`);
+
+/**
+ * 更新数据
+ * @param {*} id
+ * @param {*} data
+ * @returns
+ */
+export const putTaMessage = (id, data) => request(`/api/taMessage/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaMessage = (id) => request(`/api/taMessage/${id}`, { method: 'delete' });

src/utils/biz.js

 import dayjs from 'dayjs';
 
 export function getIssueStatus(taIssue) {
-  if (taIssue.processNode === 'start') {
+  if (taIssue.processStatus === 'reject') {
+    return {
+      value: 4,
+      label: '已打回',
+    };
+  } else if (taIssue.processNode === 'start') {
     return {
       value: 0,
       label: '未交办',
       value: 3,
       label: '已逾期',
     };
-  } else if (taIssue.processNode !== 'end' && taIssue.processStatus === 'reject') {
-    return {
-      value: 4,
-      label: '已打回',
-    };
   } else if (taIssue.processNode === 'assigned') {
     return {
       value: 1,

src/utils/date.js

 
   return `${y}-${fill0(m)}-${fill0(d)}`
 }
+
+export function getDtStr(dtStr) {
+  return !dtStr ? '' : dtStr.replace('T', ' ').substring(0, 16);
+}