dev1.0

src/pages/apply/apply/index.jsx

@@ -8,6 +8,7 @@ import { getDateStr } from '@/utils/date';
 import { postTaIssueApply } from '@/services/taissueapply';
 import { warn } from '@/utils/message';
 import Issue from '../components/Issue';
+import useTitle from '../useTitle';
 
 const today = new Date();
 export default (props) => {
@@ -15,29 +16,12 @@ export default (props) => {
   const router = Taro.useRouter();
   const { issueId, applyType } = router.params;
 
-  const [loading, setLoading] = React.useState(false);
-
-  React.useMemo(() => {
-    switch (applyType) {
-      case 'delay':
-        Taro.setNavigationBarTitle('申请延期');
-        break;
-      case 'reject':
-        Taro.setNavigationBarTitle('申请驳回');
-        break;
-      case 'verify':
-        Taro.setNavigationBarTitle('申请审核');
-        break;
-      case 'end':
-        Taro.setNavigationBarTitle('申请办结');
-        break;
-    }
-  }, [applyType]);
-
-  
+  const [loading, setLoading] = React.useState(false); 
   const [submitting, setSubmitting] = React.useState(false);
   const [formData, setFormData] = React.useState({});
   const [showDatePicker, setShowDatePicker] = React.useState(false);
+  
+  useTitle(applyType);
 
   const setFieldValue = (key, value) => {
     setFormData({

src/pages/apply/components/Issue.jsx

@@ -34,7 +34,7 @@ export default (props) => {
       <CellGroup>
         <Cell title="上报时间" value={getDtStr(issue?.createDate)} />
         <Cell title="办结时间" value={issue?.expireDate} />
-        <Cell title="交办次数" value={issue?.processNum || 1} />
+        <Cell title="交办次数" value={issue?.processNum || 0} />
       </CellGroup>
       <CellGroup style={{marginTop: '20px'}}>
         <Cell title="抽检位置" value={issue?.locName} />

src/pages/apply/detail/index.jsx

@@ -6,32 +6,16 @@ import { Cell, CellGroup, Field, Radio, RadioGroup } from '@antmjs/vantui';
 import { getTaIssueApplyById } from '@/services/taissueapply';
 import { getDtStr } from '@/utils/date';
 import Issue from '../components/Issue';
+import useTitle from '../useTitle';
 
-// const today = new Date();
 export default (props) => {
-
   const router = Taro.useRouter();
   const { id, applyType, issueId } = router.params;
 
   const [loading, setLoading] = React.useState(false);
   const [applyInfo, setApplyInfo] = React.useState({});
-
-  React.useMemo(() => {
-    switch (applyType) {
-      case 'delay':
-        Taro.setNavigationBarTitle('延期申请');
-        break;
-      case 'reject':
-        Taro.setNavigationBarTitle('驳回申请');
-        break;
-      case 'verify':
-        Taro.setNavigationBarTitle('审核申请');
-        break;
-      case 'end':
-        Taro.setNavigationBarTitle('办结申请');
-        break;
-    }
-  }, [applyType]);
+  
+  useTitle(applyType);
   
   React.useEffect(() => {
     if (id) {

src/pages/apply/useTitle.js

@@ -0,0 +1,22 @@
+import React from "react";
+import Taro from '@tarojs/taro';
+import { PROCESS_APPLY_DELAY, PROCESS_APPLY_END, PROCESS_APPLY_REJECT, PROCESS_APPLY_VERIFY } from '@/utils/biz';
+
+export default function useTitle(applyType) {
+  React.useMemo(() => {
+    switch (applyType) {
+      case PROCESS_APPLY_DELAY:
+        Taro.setNavigationBarTitle('申请延期');
+        break;
+      case PROCESS_APPLY_REJECT:
+        Taro.setNavigationBarTitle('申请驳回');
+        break;
+      case PROCESS_APPLY_VERIFY:
+        Taro.setNavigationBarTitle('申请审核');
+        break;
+      case PROCESS_APPLY_END:
+        Taro.setNavigationBarTitle('申请办结');
+        break;
+    }
+  }, [applyType]);
+}

src/pages/apply/verify/index.jsx

@@ -6,6 +6,7 @@ import { Cell, CellGroup, Field, Button, Radio, RadioGroup } from '@antmjs/vantu
 import { putTaIssueApply, getTaIssueApplyById } from '@/services/taissueapply';
 import { warn } from '@/utils/message';
 import Issue from '../components/Issue';
+import useTitle from '../useTitle';
 
 // const today = new Date();
 export default (props) => {
@@ -15,27 +16,11 @@ export default (props) => {
 
   const [loading, setLoading] = React.useState(false);
   const [applyInfo, setApplyInfo] = React.useState({});
-
-  React.useMemo(() => {
-    switch (applyType) {
-      case 'delay':
-        Taro.setNavigationBarTitle('延期审批');
-        break;
-      case 'reject':
-        Taro.setNavigationBarTitle('驳回审批');
-        break;
-      case 'verify':
-        Taro.setNavigationBarTitle('审核审批');
-        break;
-      case 'end':
-        Taro.setNavigationBarTitle('办结审批');
-        break;
-    }
-  }, [applyType]);
-
   
   const [submitting, setSubmitting] = React.useState(false);
   const [formData, setFormData] = React.useState({});
+  
+  useTitle(applyType);
 
   const setFieldValue = (key, value) => {
     setFormData({

src/pages/home/index.jsx

@@ -4,6 +4,7 @@ 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_ASSIGNED, PROCESS_END, PROCESS_START } from '@/utils/biz';
 import Head from './components/Head';
 import Banner from './components/Banner';
 import StatCard from './components/StatCard';
@@ -19,39 +20,38 @@ const menus = {
 
   // 平台管理员
   [ROLE_MANAGER]: [
-    { 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: 'icon4', text: '消单申请', link: '/pages/apply/list/index?title=消单申请&applyType=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: 'icon1', text: '待 交 办', link: `/pages/issue/list2/index?title=待交办&bizStatus=${PROCESS_START}` },
+    { icon: 'icon2', text: '已 交 办', link: `/pages/issue/list2/index?title=已交办&bizStatus=${PROCESS_ASSIGNED}`, },
+    { icon: 'icon3', text: '已 办 结', link: `/pages/issue/list2/index?title=已办结&bizStatus=${PROCESS_END}` },
+    { icon: 'icon4', text: '消单申请', link: `/pages/apply/list/index?title=消单申请&applyType=${PROCESS_APPLY_END}` },
+    { icon: 'icon5', text: '逾期警告', link: `/pages/issue/list2/index?title=逾期警告&bizStatus=expired` },
+    { icon: 'icon6', text: '延期申请', link: `/pages/apply/list/index?title=延期申请&applyType=${PROCESS_APPLY_DELAY}` },
+    { icon: 'icon7', text: '统计查询', link: '/subpkg1/pages/statistics/index' },
     { icon: 'icon9', text: '我的上报', link: '/pages/issue/list2/index?title=我的上报&mine=true' },
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
   ],
 
   // 责任单位用户
   [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: '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: '' },
-    { icon: 'icon7', text: '统计查询', link: '' },
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
   ],
 
   // 查询人员
   [ROLE_QUERY_PERSON]: [
-    { 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: 'icon1', text: '未 处 理', link: `/pages/issue/list2/index?title=未处理&bizStatus=${PROCESS_START}` },
+    { icon: 'icon2', text: '处 理 中', link: `/pages/issue/list2/index?title=处理中&bizStatus=${PROCESS_ASSIGNED}` },
+    { icon: 'icon3', text: '已 办 结', link: `/pages/issue/list2/index?title=已办结&bizStatus=${PROCESS_END}` },
     { icon: 'icon7', text: '统计查询', link: '/subpkg1/pages/statistics/index' },
   ],
   
   // 市民
   [ROLE_CITIZEN]: [
-    { icon: 'icon1', text: '未处理', link: '/pages/feedback/issuelist/index?title=未处理&bizStatus=start' },
-    { icon: 'icon2', text: '已处理', link: '/pages/feedback/issuelist/index?title=已处理&bizStatus=assigned' },
-    { icon: 'icon12', text: '已打回', link: '/pages/feedback/issuelist/index?title=已打回&bizStatus=reject' },
+    { icon: 'icon1', text: '未处理', link: `/pages/feedback/issuelist/index?title=未处理&bizStatus=${PROCESS_START}` },
+    { icon: 'icon2', text: '已处理', link: `/pages/feedback/issuelist/index?title=已处理&bizStatus=${PROCESS_ASSIGNED}` },
+    { icon: 'icon12', text: '已打回', link: `/pages/feedback/issuelist/index?title=已打回&bizStatus=reject` },
   ],
 }
 

src/pages/issue/components/Issue/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?.verifyDesc && (
+          <>
+            <Cell title="驳回原因" />
+            <Field
+              readonly
+              type="textarea"
+              autosize={{ minHeight: '120px' }}
+              value={issueProcess.processResult}
+            />
+          </>
+        )
+      }
+    </>
+  )
+}

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

@@ -1,17 +1,18 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
-import { Button, Notify, Field, Cell, CellGroup } from '@antmjs/vantui';
+import { Field, Cell, CellGroup } from '@antmjs/vantui';
 import LocType from '@/components/LocType';
 import IssueType from '@/components/IssueType';
 import OrgPicker from '@/components/OrgPicker';
 import DatePicker from '@/components/DatePicker';
 import Map from '@/components/map';
 import Uploader from '@/components/Uploader/index';
-import { getIssueStatus } from '@/utils/biz';
 import { getDateStr } from '@/utils/date';
 import mapIcon from '@/assets/icons/marker.png';
-import { getIssueProcess } from '@/services/taissue';
+import { PROCESS_END } from '@/utils/biz';
+
+import IssueStatus from './IssueStatus';
 
 const today = new Date();
 
@@ -40,14 +41,15 @@ export default (props) => {
   const [showIssueType, setShowIssueType] = React.useState(false);
   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 {};
+  // 办结时间
+  const endDate = React.useMemo(() => {
+    if (!formData) return null;
 
-    return issueProcess.filter(x => x.processStatus === 'reject')[0] || {};
-  }, [issueProcess]);
+    // 如果单子办结了就是实际办结时间
+    // 否则就是预计办结时间
+    return formData.processNode == PROCESS_END ? formData.endDate : formData.expireDate;
+  }, [formData]);
 
   const onLocTypeChange = (_, it) => {
     const data = {
@@ -106,18 +108,9 @@ export default (props) => {
     if (issue) {
       fmRef.current = issue;
       setFormData(issue);
-      setBizStatus(getIssueStatus(issue));
-
-      if (issue.processStatus == 'reject') {
-        getIssueProcess({ pageSize: 100, issueId: issue.issueId }).then(res => {
-          setIssueProcess(res.records || []);
-        })
-      }
     }
   }, [issue]);
 
-  console.log('--------formData-------', issue, formData)
-
   return (
     <View>
       <LocType
@@ -172,26 +165,9 @@ export default (props) => {
       </CellGroup>
 
       {
-        readOnly && bizStatus && (
+        readOnly && (
           <CellGroup style={{ marginTop: '20px' }}>
-            <Cell
-              title="状态"
-              value={bizStatus.label}
-            />
-
-            {
-              issueReject.processId && (
-                <>
-                  <Cell title="驳回原因" />
-                  <Field
-                    readonly
-                    type="textarea"
-                    autosize={{ minHeight: '120px' }}
-                    value={issueReject.processResult}
-                  />
-                </>
-              )
-            }
+            <IssueStatus issue={issue} />
           </CellGroup>
         )
       }
@@ -249,7 +225,7 @@ export default (props) => {
                 <Cell
                   title="办结时间"
                   isLink={!readOnly}
-                  value={formData.expireDate}
+                  value={endDate}
                   onClick={() => !readOnly && setShowDatePicker(true)}
                 />
               )

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

@@ -28,14 +28,11 @@ export default (props) => {
     setLoading1(true)
 
     const data = { ...issue, ... formData };
-    console.log('-----data1----', JSON.stringify(data))
 
     // 先提交修改
-    putTaIssue(issue.issueId, data).then(() => {
-      console.log('-----data2----', JSON.stringify(data))
-      
+    putTaIssue(issue.issueId, data).then(() => {      
       // 再提交交办
-      postIssueAssigned(data).then(() => {
+      postIssueAssigned({data, nextOrg: data.orgId}).then(() => {
         setLoading1(false);
         Taro.navigateBack({delta: 1});
       }).catch(() => {

src/pages/issue/edit/index.jsx

@@ -16,7 +16,7 @@ import Cancel from './components/Cancel';
 export default (props) => {
 
   const router = Taro.useRouter();
-  const { id, act } = router.params;
+  const { id } = router.params;
 
   const { user, duty } = useModel('user');
 

src/pages/issue/list/index.jsx

@@ -8,7 +8,7 @@ import Card from '@/components/IssueCard';
 import { getTaIssue } from '@/services/taissue';
 import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
 import { useModel } from '@/store';
-import { getIssueStatus } from '@/utils/biz';
+import { getIssueStatus, PROCESS_ASSIGNED, PROCESS_END, PROCESS_START } from '@/utils/biz';
 
 // 只有督察员能看到当前页面
 export default (props) => {
@@ -34,7 +34,7 @@ export default (props) => {
         <Tab title="未交办">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: 'start'}}
+            params={{bizStatus: PROCESS_START}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}
@@ -43,7 +43,7 @@ export default (props) => {
         <Tab title="已交办">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: 'assigned'}}
+            params={{bizStatus: PROCESS_ASSIGNED}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}
@@ -52,7 +52,7 @@ export default (props) => {
         <Tab title="已办结">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: 'end'}}
+            params={{bizStatus: PROCESS_END}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}

src/pages/issue/list2/index.jsx

@@ -26,22 +26,8 @@ export default (props) => {
   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 {
-      
-    }
-
     Taro.navigateTo({
-      url: `/pages/issue/edit/index?id=${item.issueId}&act=${act}`
+      url: `/pages/issue/edit/index?id=${item.issueId}`
     })
   }
   

src/utils/biz.js

@@ -1,27 +1,124 @@
 import dayjs from 'dayjs';
 
+/**
+ * 流程节点
+ */
+// 待交办
+export const PROCESS_START = "01";
+// 交办
+export const PROCESS_ASSIGNED = "02";
+// 办结
+export const PROCESS_END = "03";
+// 驳回申请
+export const PROCESS_APPLY_REJECT = "0201";
+// 延期申请
+export const PROCESS_APPLY_DELAY = "0202";
+// 单位审核
+export const PROCESS_APPLY_VERIFY = "0203";
+// 办结申请
+export const PROCESS_APPLY_END = "0204";
+
+/**
+ * 审核结果
+ */
+// 未审核
+export const APPLY_READY = "ready";
+// 审核通过
+export const APPLY_PASS = "pass";
+// 审核驳回
+export const APPLY_REJECT = "reject";
+
+
 export function getIssueStatus(taIssue) {
-  if (taIssue.processStatus === 'reject') {
+  if (taIssue.processStatus === APPLY_REJECT) {
     return {
       value: 4,
       label: '已打回',
     };
-  } else if (taIssue.processNode === 'start') {
+  } else if (taIssue.processNode === PROCESS_START) {
     return {
       value: 0,
-      label: '未交办',
+      label: '待交办',
     }
-  } else if (taIssue.processNode === 'end') {
+  } else if (taIssue.processNode === PROCESS_END) {
     return {
       value: 2,
       label: '已办结',
     };
-  } else if (taIssue.processNode !== 'end' && taIssue.expireDate <= dayjs().format('YYYY-MM-DD')) {
+  } else if (taIssue.processNode !== PROCESS_END && taIssue.expireDate <= dayjs().format('YYYY-MM-DD')) {
     return {
       value: 3,
       label: '已逾期',
     };
-  } else if (taIssue.processNode === 'assigned') {
+  } else if (taIssue.processNode.indexOf(PROCESS_ASSIGNED) === 0) {
+    if (taIssue.processStatus === APPLY_READY) {
+      if (taIssue.processNode === PROCESS_APPLY_REJECT) {
+        return {
+          value: 1,
+          label: '驳回申请',
+        };
+      } else if (taIssue.processNode === PROCESS_APPLY_DELAY) {
+        return {
+          value: 1,
+          label: '延期申请',
+        };
+      } else if (taIssue.processNode === PROCESS_APPLY_VERIFY) {
+        return {
+          value: 1,
+          label: '审核申请',
+        };
+      } else if (taIssue.processNode === PROCESS_APPLY_END) {
+        return {
+          value: 1,
+          label: '办结申请',
+        };
+      }
+    } else if (taIssue.processStatus === APPLY_PASS) {
+      if (taIssue.processNode === PROCESS_APPLY_REJECT) {
+        return {
+          value: 1,
+          label: '驳回申请通过',
+        };
+      } else if (taIssue.processNode === PROCESS_APPLY_DELAY) {
+        return {
+          value: 1,
+          label: '延期申请通过',
+        };
+      } else if (taIssue.processNode === PROCESS_APPLY_VERIFY) {
+        return {
+          value: 1,
+          label: '审核申请通过',
+        };
+      } else if (taIssue.processNode === PROCESS_APPLY_END) {
+        return {
+          value: 1,
+          label: '办结申请通过',
+        };
+      }
+    } else {
+      if (taIssue.processNode === PROCESS_APPLY_REJECT) {
+        return {
+          value: 1,
+          label: '驳回申请驳回',
+        };
+      } else if (taIssue.processNode === PROCESS_APPLY_DELAY) {
+        return {
+          value: 1,
+          label: '延期申请驳回',
+        };
+      } else if (taIssue.processNode === PROCESS_APPLY_VERIFY) {
+        return {
+          value: 1,
+          label: '审核申请驳回',
+        };
+      } else if (taIssue.processNode === PROCESS_APPLY_END) {
+        return {
+          value: 1,
+          label: '办结申请驳回',
+        };
+      }
+    }
+
     return {
       value: 1,
       label: '已交办',
@@ -30,3 +127,4 @@ export function getIssueStatus(taIssue) {
 
   return {};
 }
+