feat

src/components/OrgPicker/index.jsx

@@ -4,6 +4,6 @@ import { getSysOrg } from '@/services/sysorg';
 
 export default (props) => {
   return (
-    <Pickerful {...props} keyValue="orgId" dictAPI={getSysOrg} params={{ isResponsible: 1 }} />
+    <Pickerful {...props} keyValue="orgId" dictAPI={getSysOrg} params={{ isResponsible: 1, parentId: props.parentId }} />
   )
 }

src/components/Uploader/index.jsx

@@ -116,7 +116,7 @@ export default (props) => {
             <Image src={icon} onClick={onAdd} />
           </View>
         )}
-        {valueCopy.map((item, inx) => (
+        {valueCopy?.map((item, inx) => (
           <View key={item?.url || '123'} className={style["uploader-item"]}>
             {
               !item ? (

src/pages/apply/useTitle.js

@@ -6,16 +6,16 @@ export default function useTitle(applyType) {
   React.useMemo(() => {
     switch (applyType) {
       case PROCESS_APPLY_DELAY:
-        Taro.setNavigationBarTitle('申请延期');
+        Taro.setNavigationBarTitle({ title: '申请延期' });
         break;
       case PROCESS_APPLY_REJECT:
-        Taro.setNavigationBarTitle('申请驳回');
+        Taro.setNavigationBarTitle({ title: '申请驳回' });
         break;
       case PROCESS_APPLY_VERIFY:
-        Taro.setNavigationBarTitle('申请审核');
+        Taro.setNavigationBarTitle({ title: '申请审核' });
         break;
       case PROCESS_APPLY_END:
-        Taro.setNavigationBarTitle('申请办结');
+        Taro.setNavigationBarTitle({ title: '申请办结' });
         break;
     }
   }, [applyType]);

src/pages/apply/verify/index.jsx

@@ -76,6 +76,8 @@ export default (props) => {
         } else {
           Taro.navigateBack({ delta: 1 });
         }
+      } else {
+        Taro.navigateBack({ delta: 1 });
       }
     }).catch(() => {
       setSubmitting(false);

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

@@ -147,6 +147,8 @@ export default (props) => {
     const value = e.detail.value||e.target.value||e.detail;
     setFieldChange("content", value);
   };
+  
+      console.log('---------issue---issue----->')
 
   return (
     <View>

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

@@ -0,0 +1,80 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button, Dialog } from '@antmjs/vantui';
+import OrgPicker from "@/components/OrgPicker";
+import { postIssueAssignedAgain, putTaIssue, copyTaIssue } from '@/services/taissue';
+import { warn } from '@/utils/message';
+
+export default (props) => {
+
+  const { issue } = props;
+  const formDataRef = React.useRef();
+
+  const dialogId = React.useMemo(() => `dialog-${Math.random().toString(36).substring(2, 7)}`, []);
+  const [loading1, setLoading1] = React.useState(false);
+  const [loading2, setLoading2] = React.useState(false);
+  const [showOrgPicker, setShowOrgPicker] = React.useState(false);
+
+  // 交办
+  const onAssigned = () => {
+    try {
+      // warn(!formData.addr, '请填写地址')
+      // warn(!formData.locId, '请选择点位')
+      // warn(!formData.content, '请填写问题描述')
+      // warn(!formData.typeId, '请选择问题分类')
+      // warn(!formData.attachList || formData.attachList.length < 1, '请上传照片')
+      warn(!formDataRef.current?.orgId, '请选择交办单位')
+      // warn(!formData.expireDate, '请选择办结时间')
+    } catch (e) {
+      return;
+    }
+
+    setLoading1(true)
+
+    const data = { ...issue, ...(formDataRef.current || {}) };
+    // 先提交修改
+    putTaIssue(issue.issueId, data).then(() => {
+      // 再提交交办
+      postIssueAssignedAgain({ ...data, nextOrg: data.orgId }).then(() => {
+        setLoading1(false);
+        Taro.navigateBack({ delta: 1 });
+      }).catch(() => {
+        setLoading1(false);
+      })
+    }).catch(() => {
+      setLoading1(false);
+    })
+  }
+
+  
+  const onOrgChange = (_, it) => {
+    const data = {
+      ...(formDataRef.current || {}),
+      orgId: it.orgId,
+      orgName: it.name,
+    };
+    formDataRef.current = data;
+    setShowOrgPicker(false);
+    onAssigned();
+  };
+
+  return (
+    <View style={{ marginTop: '20px', display: 'flex' }}>
+      <Dialog id={dialogId} />
+      <OrgPicker
+        parentId={issue.orgId}
+        show={showOrgPicker}
+        value={formDataRef.current?.orgName}
+        onCancel={() => setShowOrgPicker(false)}
+        onChange={onOrgChange}
+      />
+      <Button
+        block
+        type="primary"
+        loading={loading1}
+        onClick={() => setShowOrgPicker(true)}
+      >交办</Button>
+    </View>
+  )
+}

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

@@ -21,6 +21,7 @@ import { useModel } from '@/store';
 import IssueStatus from './components/IssueStatus';
 import IssueInfo from '../../components/issue-info';
 import Apply from './components/Apply';
+import Assigned from './components/Assigned';
 
 export default (props) => {
 
@@ -36,6 +37,7 @@ export default (props) => {
     readOnly,
     showApplyVerify,
     showApplyEnd,
+    showAssign,
   ] = React.useMemo(() => {
     if (!orgIssue.issueId) return [];
 
@@ -43,6 +45,7 @@ export default (props) => {
       orgIssue?.processStatus == APPLY_READY || orgIssue?.processNode == PROCESS_END,
       orgIssue.processNode == PROCESS_ASSIGNED && duty != ROLE_ORG_MANAGER,
       orgIssue.processNode != PROCESS_END && orgIssue.processNode != PROCESS_APPLY_END ,
+      orgIssue.processNode == PROCESS_ASSIGNED && duty == ROLE_ORG_MANAGER,
     ]
 
   }, [orgIssue, duty]);
@@ -64,7 +67,7 @@ export default (props) => {
         setLoading(false);
       });
 
-      getTaOrgIssueByIssueId(id, user?.orgId ).then(res => setOrgIssue(res));
+      getTaOrgIssueByIssueId(id, user?.orgId ).then(res => setOrgIssue(res || {}));
     }
   }, [id, user]);
   
@@ -134,6 +137,13 @@ export default (props) => {
                 style={{marginLeft: 'var(--main-space)'}}
               >申请驳回</Apply>
             </View>
+            {
+              showAssign && (
+                <View style={{ marginTop: '20px' }}>
+                  <Assigned issue={issue} />
+                </View>
+              )
+            }
           </View>
         )
       }

src/services/taissue.js

@@ -35,6 +35,11 @@ export const deleteTaIssue = (id) => request(`/api/taIssue/${id}`, { method: 'de
  */
 export const postIssueAssigned = (data) => request('/api/taIssueProcess/assigned', { data, method: 'post' });
 
+/*
+ * 再次交办
+ */
+export const postIssueAssignedAgain = (data) => request('/api/taIssueProcess/assigned2', { data, method: 'post' });
+
 /*
  * 驳回
  */