feats

src/components/PowerList/index.jsx

@@ -55,7 +55,7 @@ export default (props) => {
   React.useEffect(() => {
     pageNumRef.current = 1;
     queryData({pageNum : pageNumRef.current});
-  }, [queryData])
+  }, [queryData]);
   
   return (
     <PowerScrollView

src/layouts/index.jsx

@@ -26,6 +26,11 @@ export default (props) => {
     }
   }, [person, user]);
 
+
+  Taro.useDidShow(() => {
+    console.log('--------useDidShow-----')
+  });
+
   return (
     <View className={laySty['page-wrapper']}>
       <Notify id="vanNotify" />

src/pages/apply/verify/index.jsx

@@ -6,7 +6,7 @@ import { Cell, CellGroup, Field, Button, Radio, RadioGroup } from '@antmjs/vantu
 import Uploader from '@/components/Uploader/index';
 import { putTaIssueApply, getTaIssueApplyById } from '@/services/taissueapply';
 import { warn } from '@/utils/message';
-import { APPLY_PASS, APPLY_REJECT, PROCESS_APPLY_DELAY } from '@/utils/biz';
+import { APPLY_PASS, APPLY_REJECT, PROCESS_APPLY_DELAY, PROCESS_APPLY_REJECT } from '@/utils/biz';
 import Issue from '../components/Issue';
 import useTitle from '../useTitle';
 import { getTaOrgIssueByIssueId } from '@/services/taorgissue';
@@ -93,27 +93,45 @@ export default (props) => {
           </CellGroup>
         )
      }
-     
-      <CellGroup style={{marginTop: '20px'}}>
-        <Cell title="整改结果" />
-        <Field
-          readonly
-          type="textarea"
-          autosize={{ minHeight: '120px' }}
-          value={orgIssue.result}
-        />
 
-        <Cell title="整改照片" border={false} />
-        <Cell
-          renderTitle={
-            <Uploader
-              disabled
-              value={orgIssue.attachList}
+     {
+        applyInfo.applyType == PROCESS_APPLY_REJECT && (
+          <CellGroup style={{marginTop: '20px'}}>
+            <Cell title="申请说明" />
+            <Field
+              readonly
+              type="textarea"
+              autosize={{ minHeight: '120px' }}
+              value={applyInfo.remark}
             />
-          }
-        />
-      </CellGroup>
-     
+          </CellGroup>
+        )
+     }
+
+     {
+        applyInfo.applyType != PROCESS_APPLY_DELAY && applyInfo.applyType != PROCESS_APPLY_REJECT && (
+          <CellGroup style={{marginTop: '20px'}}>
+            <Cell title="整改结果" />
+            <Field
+              readonly
+              type="textarea"
+              autosize={{ minHeight: '120px' }}
+              value={orgIssue.result}
+            />
+    
+            <Cell title="整改照片" border={false} />
+            <Cell
+              renderTitle={
+                <Uploader
+                  disabled
+                  value={orgIssue.attachList}
+                />
+              }
+            />
+          </CellGroup>
+        )
+     }
+          
       <CellGroup style={{marginTop: '20px'}}>
         <Cell
           title="审批结果"

src/pages/home/components/Head.jsx

@@ -27,7 +27,7 @@ export default (props) => {
   }, [dutyList]);
 
   const onClick = () => {
-    if (dutyList.length < 1) return;
+    if (dutyList.length < 2) return;
     setShow(true);
   }
 

src/pages/home/index.jsx

@@ -4,7 +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 { PROCESS_APPLY_DELAY, PROCESS_APPLY_END, PROCESS_APPLY_REJECT, PROCESS_ASSIGNED, PROCESS_END, PROCESS_START } from '@/utils/biz';
 import Head from './components/Head';
 import Banner from './components/Banner';
 import StatCard from './components/StatCard';
@@ -26,6 +26,7 @@ const menus = {
     { 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: 'icon12', text: '驳回申请', link: `/pages/apply/list/index?title=驳回申请&applyType=${PROCESS_APPLY_REJECT}` },
     { 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' },
@@ -35,7 +36,7 @@ const menus = {
   [ROLE_ORG_USER]: [
     { 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: 'icon5', text: '已 逾 期', link: '/pages/org/issue/list/index?title=已办结&bizStatus=expired' },
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
   ],
 

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

@@ -24,7 +24,7 @@ export default (props) => {
     }
 
     setLoading(true)
-    putTaIssue(issue.issueId, { ...issue, formData }).then(() => {
+    putTaIssue(issue.issueId, { ...issue, ...formData }).then(() => {
       setLoading(false);
       Taro.navigateBack({
         delta: 1,

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

@@ -56,10 +56,14 @@ export default (props) => {
   const onSubmit = () => {
     try {
       warn(!orgIssue || !orgIssue.issueId, '未找到问题单');
-      warn(!orgIssue.attachList || !orgIssue.attachList.length, '请上传照片');
-      warn(!orgIssue.result, '请填写整改结果');
+
+      if (applyType == PROCESS_APPLY_VERIFY || applyType == PROCESS_APPLY_END) {
+        warn(!orgIssue.attachList || !orgIssue.attachList.length, '请上传照片');
+        warn(!orgIssue.result, '请填写整改结果');
+      }
 
       warn(applyType == PROCESS_APPLY_DELAY && !formData.content, '请设置延期时间');
+      warn(applyType == PROCESS_APPLY_REJECT && !formData.remark, '请填写驳回理由');
     } catch (e) {
       return ;
     }
@@ -70,20 +74,31 @@ export default (props) => {
       ...formData
     }
 
-    // 先保存数据
-    setSubmitting(true);
-    putTaOrgIssue(orgIssue.orgIssueId, orgIssue).then(() => {
-      // 再调用申请接口
+    if (applyType == PROCESS_APPLY_VERIFY || applyType == PROCESS_APPLY_END) {
+      // 先保存数据
+      setSubmitting(true);
+      putTaOrgIssue(orgIssue.orgIssueId, orgIssue).then(() => {
+        // 再调用申请接口
+        postTaIssueApply(data).then(() => {
+          Taro.navigateBack({delta: 1});
+          setSubmitting(false);
+        }).catch(() => {
+          setSubmitting(false);
+        })
+      }).catch(() => {
+        setSubmitting(false);
+      })
+    } else {
+      // 直接调用申请接口
       postTaIssueApply(data).then(() => {
         Taro.navigateBack({delta: 1});
         setSubmitting(false);
       }).catch(() => {
         setSubmitting(false);
       })
-    }).catch(() => {
-      setSubmitting(false);
-    })
+    }
   }
+
   
   return (
     <>