feats

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "./dist",
   "projectname": "civilized-miniapp",
   "description": "文明城市小程序",
-  "appid": "wxe44244d1a5ea3364",
+  "appid": "wx39d721c54a0a11c4",
   "setting": {
     "urlCheck": true,
     "es6": false,

src/components/IssueCard/index.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import Taro from '@tarojs/taro';
 import dayjs from 'dayjs';
 import { View, ScrollView, RichText, Image, Text } from '@tarojs/components';
-import { getIssueStatus } from '@/utils/biz';
+import { APPLY_READY, getIssueStatus } from '@/utils/biz';
 import icon from '@/assets/icons/marker.png';
 import style from './style.module.less';
 
@@ -16,7 +16,8 @@ const colors = [
 
 export default (props) => {
 
-  const { detail, onClick, color, stText } = props;
+  const { issue, applyInfo, onClick, color, stText } = props;
+  const detail = issue || applyInfo;
 
   const [
     content,
@@ -26,7 +27,12 @@ export default (props) => {
   ] = React.useMemo(() => {
     if (!detail) return [];
 
-    const {value : bizStatus = 0, label : statusText} = getIssueStatus(detail);
+    // detail 有可能是申请信息
+    const {value : bizStatus = 0, label : statusText} = getIssueStatus({
+      ...detail || {},
+      processNode: detail?.processNode || detail?.applyType,
+      processStatus: detail?.processStatus || detail?.verifyStatus || APPLY_READY,
+    });
 
     return [
       (detail.issueContent || detail.content || '').replace('\r\n', '<br>').replace('\n', '<br>'),

src/pages/apply/list/index.jsx

@@ -8,7 +8,6 @@ import Card from '@/components/IssueCard';
 import { getTaIssueApply } from '@/services/taissueapply';
 import { ROLE_MANAGER } from '@/utils/user';
 import { useModel } from '@/store';
-import { getIssueStatus } from '@/utils/biz';
 
 export default (props) => {
 
@@ -53,7 +52,7 @@ export default (props) => {
             request={getTaIssueApply}
             params={{applyType, sourceType: 'inspector'}}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} stText={title} onClick={() => onClick(item)} />
+              <Card key={item.issueId} applyInfo={item} stText={title} onClick={() => onClick(item)} />
             )}
           />
         </Tab>
@@ -62,7 +61,7 @@ export default (props) => {
             request={getTaIssueApply}
             params={{applyType, sourceType: 'feedback'}}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} stText={title} onClick={() => onClick(item)} />
+              <Card key={item.issueId} applyInfo={item} stText={title} onClick={() => onClick(item)} />
             )}
           />
         </Tab>

src/pages/feedback/issuelist/index.jsx

@@ -32,7 +32,7 @@ export default (props) => {
         request={getTaFeedback}
         params={{bizStatus, isMine: true}}
         renderItem={(item) => (
-          <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+          <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
         )}
       />
     </Page>

src/pages/home/index.jsx

@@ -13,7 +13,7 @@ import './index.less';
 const menus = {
   // 督察员
   [ROLE_INSPECTOR]: [
-    { icon: 'icon9', text: '我的上报', link: '/pages/issue/list/index' },
+    { icon: 'icon9', text: '我的上报', link: '/pages/issue/list/index?mine=true' },
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
     { icon: 'icon10', text: '模拟测评', link: '/pages/check/list/index' },
   ],

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

@@ -32,7 +32,7 @@ export default (props) => {
     // 先提交修改
     putTaIssue(issue.issueId, data).then(() => {      
       // 再提交交办
-      postIssueAssigned({data, nextOrg: data.orgId}).then(() => {
+      postIssueAssigned({ ... data, nextOrg: data.orgId}).then(() => {
         setLoading1(false);
         Taro.navigateBack({delta: 1});
       }).catch(() => {

src/pages/issue/list/index.jsx

@@ -14,6 +14,9 @@ import { getIssueStatus, PROCESS_ASSIGNED, PROCESS_END, PROCESS_START } from '@/
 export default (props) => {
   // const { user } = useModel('user');
 
+  const router = Taro.useRouter();
+  const { mine = '' } = router.params;
+
   const onClick = (item) => {
     Taro.navigateTo({
       url: `/pages/issue/edit/index?id=${item.issueId}`
@@ -26,24 +29,25 @@ export default (props) => {
         <Tab title="全部">
           <PowerList
             request={getTaIssue}
+            params={{ mine }}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+              <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
             )}
           />
         </Tab>
         <Tab title="未交办">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: PROCESS_START}}
+            params={{mine, bizStatus: PROCESS_START}}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+              <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
             )}
           />
         </Tab>
         <Tab title="已交办">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: PROCESS_ASSIGNED}}
+            params={{mine, bizStatus: PROCESS_ASSIGNED}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}
@@ -52,7 +56,7 @@ export default (props) => {
         <Tab title="已办结">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: PROCESS_END}}
+            params={{mine, bizStatus: PROCESS_END}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}
@@ -61,7 +65,7 @@ export default (props) => {
         <Tab title="已逾期">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: 'expired'}}
+            params={{mine, bizStatus: 'expired'}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}
@@ -70,7 +74,7 @@ export default (props) => {
         <Tab title="已打回">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: 'reject'}}
+            params={{mine, bizStatus: 'reject'}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}

src/pages/issue/list2/index.jsx

@@ -39,7 +39,7 @@ export default (props) => {
             request={getTaIssue}
             params={{bizStatus, mine, sourceType: 'inspector'}}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+              <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
             )}
           />
         </Tab>
@@ -48,7 +48,7 @@ export default (props) => {
             request={getTaIssue}
             params={{bizStatus, mine, sourceType: 'feedback'}}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+              <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
             )}
           />
         </Tab>

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

@@ -6,6 +6,12 @@ import DatePicker from '@/components/DatePicker';
 import { getDateStr } from '@/utils/date';
 import { postTaIssueApply } from '@/services/taissueapply';
 import { warn } from '@/utils/message';
+import {
+  PROCESS_APPLY_DELAY,
+  PROCESS_APPLY_END,
+  PROCESS_APPLY_REJECT,
+  PROCESS_APPLY_VERIFY
+} from '@/utils/biz';
 
 const today = new Date();
 export default (props) => {
@@ -37,7 +43,7 @@ export default (props) => {
   }
 
   const onClick = () => {
-    if (applyType == 'org-verify' || applyType == 'end') {
+    if (applyType == PROCESS_APPLY_VERIFY || applyType == PROCESS_APPLY_END) {
       onSubmit();
     } else {
       setShow(true);
@@ -47,11 +53,17 @@ export default (props) => {
   const onSubmit = () => {
     try {
       warn(!orgIssue || !orgIssue.issueId, '未找到问题单');
-      if (applyType === 'delay') {
+
+      if (applyType == PROCESS_APPLY_VERIFY || applyType == PROCESS_APPLY_END) {
+        warn(!orgIssue.attachList || !orgIssue.attachList.length, '请上传照片');
+        warn(!orgIssue.result, '请填写整改结果');
+      }
+
+      if (applyType === PROCESS_APPLY_DELAY) {
         warn(!formData.content, '请选择延期时间');
       }
 
-      if (applyType == 'delay' || applyType == 'reject') {
+      if (applyType == PROCESS_APPLY_DELAY || applyType == PROCESS_APPLY_REJECT) {
         warn(!formData.remark, '请填写理由说明');
       }
     } catch (e) {

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

@@ -6,7 +6,7 @@ import Page from '@/layouts/index';
 import Uploader from '@/components/Uploader/index';
 import { getTaIssueById } from '@/services/taissue';
 import { getTaOrgIssueByIssueId } from '@/services/taorgissue';
-import { PROCESS_START } from '@/utils/biz';
+import { PROCESS_APPLY_END, PROCESS_START, PROCESS_END, PROCESS_APPLY_VERIFY, PROCESS_APPLY_DELAY, PROCESS_APPLY_REJECT } from '@/utils/biz';
 
 import IssueInfo from '../../components/issue-info';
 import Apply from './components/Apply';
@@ -29,14 +29,16 @@ export default (props) => {
   const [
     readOnly,
     statusTxt,
-    showEditBtn,
+    showApplyVerify,
+    showApplyEnd,
   ] = React.useMemo(() => {
     if (!orgIssue.issueId) return [];
 
     return [
       issue?.applyId,
       status[issue.applyType],
-      orgIssue.processStatus == PROCESS_START && !issue?.applyId
+      orgIssue.processStatus == PROCESS_START,
+      orgIssue.processStatus != PROCESS_END && orgIssue.processStatus != PROCESS_APPLY_END ,
     ]
 
   }, [issue, orgIssue]);
@@ -98,15 +100,15 @@ export default (props) => {
           <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
             <View>
               {
-                showEditBtn &&
+                showApplyEnd &&
                   // <Button block type="primary">保存修改</Button> :
-                  <Apply block type="primary" applyType="end" orgIssue={orgIssue}>申请办结</Apply>
+                  <Apply block type="primary" applyType={PROCESS_APPLY_END} orgIssue={orgIssue}>申请办结</Apply>
               }
             </View>
             {
-              showEditBtn && (
+              showApplyVerify && (
                 <View style={{marginTop: '20px'}}>
-                  <Apply block type="primary" applyType="org-verify" orgIssue={orgIssue}>申请审核</Apply>
+                  <Apply block type="primary" applyType={PROCESS_APPLY_VERIFY} orgIssue={orgIssue}>申请审核</Apply>
                 </View>
               )
             }
@@ -116,7 +118,7 @@ export default (props) => {
                 plain
                 hairline
                 type="info"
-                applyType="delay"
+                applyType={PROCESS_APPLY_DELAY}
                 orgIssue={orgIssue}
               >申请延期</Apply>
               <Apply
@@ -124,7 +126,7 @@ export default (props) => {
                 plain
                 hairline
                 type="danger"
-                applyType="reject"
+                applyType={PROCESS_APPLY_REJECT}
                 orgIssue={orgIssue}
                 style={{marginLeft: 'var(--main-space)'}}
               >申请驳回</Apply>

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

@@ -39,7 +39,7 @@ export default (props) => {
             request={getTaOrgIssue}
             params={{bizStatus, sourceType: 'inspector'}}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} stText={title} color={color} onClick={() => onClick(item)} />
+              <Card key={item.issueId} issue={item} stText={title} color={color} onClick={() => onClick(item)} />
             )}
           />
         </Tab>
@@ -48,7 +48,7 @@ export default (props) => {
             request={getTaOrgIssue}
             params={{bizStatus, sourceType: 'feedback'}}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} stText={title} color={color} onClick={() => onClick(item)} />
+              <Card key={item.issueId} issue={item} stText={title} color={color} onClick={() => onClick(item)} />
             )}
           />
         </Tab>

src/utils/biz.js

@@ -30,6 +30,7 @@ export const APPLY_REJECT = "reject";
 
 
 export function getIssueStatus(taIssue) {
+  console.log('------taIssue-----', taIssue)
   if (taIssue.processStatus === APPLY_REJECT) {
     return {
       value: 4,