f

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"',
   },
   defineConstants: {
-    HOST: '"http://127.0.0.1:9087"',
-    // HOST: '"http://192.168.89.147:9087"',
+    // HOST: '"http://127.0.0.1:9087"',
+    HOST: '"http://192.168.89.147:9087"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
     VERSION: '"1.1.13-20230325"',

src/pages/apply/verify/index.jsx

@@ -2,12 +2,14 @@ import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
 import Page from '@/layouts/index';
-import { Cell, CellGroup, Field, Button, Radio, RadioGroup } from '@antmjs/vantui';
+import { Cell, CellGroup, Field, Button, Radio, RadioGroup, Dialog } from '@antmjs/vantui';
 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, PROCESS_APPLY_REJECT } from '@/utils/biz';
 import { getTaOrgIssueByIssueId } from '@/services/taorgissue';
+import { copyTaIssue, getTaIssueById } from '@/services/taissue';
+import { getSysOrgById } from '@/services/sysorg';
 import Issue from '../components/Issue';
 import useTitle from '../useTitle';
 
@@ -20,10 +22,14 @@ export default (props) => {
   const [loading, setLoading] = React.useState(false);
   const [applyInfo, setApplyInfo] = React.useState({});
   const [orgIssue, setOrgIssue] = React.useState({});
-  
+
   const [submitting, setSubmitting] = React.useState(false);
   const [formData, setFormData] = React.useState({});
-  
+
+  const dialogId = React.useMemo(() => `dialog-${Math.random().toString(36).substring(2, 7)}`, []);
+  const [loading2, setLoading2] = React.useState(false);
+  const [issue, setIssue] = React.useState();
+
   useTitle(applyType);
 
   const setFieldValue = (key, value) => {
@@ -32,13 +38,13 @@ export default (props) => {
       [key]: value,
     })
   }
-  
+
   const onSubmit = () => {
     try {
       warn(!formData.verifyStatus, '请选择审批结果');
       warn(!formData.verifyDesc && formData.verifyStatus == 'reject', '请填写审批说明');
     } catch (e) {
-      return ;
+      return;
     }
 
     const data = {
@@ -48,13 +54,13 @@ export default (props) => {
 
     setSubmitting(true);
     putTaIssueApply(data.applyId, data).then(() => {
-      Taro.navigateBack({delta: 1});
+      Taro.navigateBack({ delta: 1 });
       setSubmitting(false);
     }).catch(() => {
       setSubmitting(false);
     })
   }
-  
+
   React.useEffect(() => {
     if (id) {
       setLoading(true);
@@ -70,15 +76,73 @@ export default (props) => {
         setLoading(false);
       });
     }
+
+    if (id) {
+      setLoading(true)
+      getTaIssueById(id).then(res => {
+        setLoading(false);
+        if (res.orgId) {
+          getSysOrgById(res.orgId).then(r => {
+            setIssue({
+              ...res,
+              orgName: r?.name
+            });
+          }).catch(() => {
+            setIssue(res);
+          })
+        } else {
+          setIssue(res);
+        }
+      }).catch(() => {
+        setLoading(false);
+      });
+    }
   }, [id]);
-  
+
+  // 复制
+  const onCopy = () => {
+    console.log('<------------------------------------>')
+    Dialog.confirm({
+      title: '复制问题单',
+      message: '确认复制当前问题单?',
+      selector: dialogId,
+    }).then((value) => {
+      console.log('2value', value);
+      if ('confirm' === value) {
+        setLoading2(true)
+        copyTaIssue(issue.issueId).then(res => {
+          setLoading2(false)
+
+          // Dialog 有 bug,
+          // 使用 setTimeout 延迟一会规避一下
+          const t = setTimeout(() => {
+            clearTimeout(t);
+            Dialog.confirm({
+              title: '复制成功',
+              message: `新问题单号: ${res.issueId}, 是否跳转`,
+              selector: dialogId,
+            }).then((value2) => {
+              if ('confirm' === value2) {
+                Taro.navigateTo({
+                  url: `/pages/issue/edit/index?id=${res.issueId}`
+                })
+              }
+            });
+          }, 200);
+        }).catch(() => {
+          setLoading2(false)
+        })
+      }
+    })
+  }
+
   return (
     <Page loading={loading}>
       <Issue issueId={issueId} />
-     
-     {
+
+      {
         applyInfo.applyType == PROCESS_APPLY_DELAY && (
-          <CellGroup style={{marginTop: '20px'}}>
+          <CellGroup style={{ marginTop: '20px' }}>
             <Cell
               title="延期日期"
               value={applyInfo.content}
@@ -92,11 +156,11 @@ export default (props) => {
             />
           </CellGroup>
         )
-     }
+      }
 
-     {
+      {
         applyInfo.applyType == PROCESS_APPLY_REJECT && (
-          <CellGroup style={{marginTop: '20px'}}>
+          <CellGroup style={{ marginTop: '20px' }}>
             <Cell title="申请说明" />
             <Field
               readonly
@@ -106,11 +170,11 @@ export default (props) => {
             />
           </CellGroup>
         )
-     }
+      }
 
-     {
+      {
         applyInfo.applyType != PROCESS_APPLY_DELAY && applyInfo.applyType != PROCESS_APPLY_REJECT && (
-          <CellGroup style={{marginTop: '20px'}}>
+          <CellGroup style={{ marginTop: '20px' }}>
             <Cell title="整改结果" />
             <Field
               readonly
@@ -118,7 +182,7 @@ export default (props) => {
               autosize={{ minHeight: '120px' }}
               value={orgIssue.result}
             />
-    
+
             <Cell title="整改照片" border={false} />
             <Cell
               renderTitle={
@@ -130,9 +194,9 @@ export default (props) => {
             />
           </CellGroup>
         )
-     }
-          
-      <CellGroup style={{marginTop: '20px'}}>
+      }
+
+      <CellGroup style={{ marginTop: '20px' }}>
         <Cell
           title="审批结果"
         >
@@ -153,9 +217,13 @@ export default (props) => {
           onChange={(e) => setFieldValue('verifyDesc', e.detail)}
         />
       </CellGroup>
-      <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
-        <Button block type="primary" loading={submitting} onClick={onSubmit}>审 批</Button>
-      </View>
+      <CellGroup>
+        <View style={{ marginTop: '20px', display: 'flex' }}>
+          <Dialog id={dialogId} />
+          <Button block type="primary" loading={submitting} onClick={onSubmit} style={{ flex: 5, marginLeft: 'var(--main-space)' }}>审 批</Button>
+          <Button block type="info" loading={loading2} onClick={onCopy} style={{ flex: 1, margin: '0 var(--main-space)' }}>复制</Button>
+        </View>
+      </CellGroup>
     </Page>
   )
 }

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

@@ -12,7 +12,7 @@ export default (props) => {
   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 onAssigned = () => {
     try {
@@ -29,14 +29,14 @@ export default (props) => {
 
     setLoading1(true)
 
-    const data = { ...issue, ... formData };
+    const data = { ...issue, ...formData };
 
     // 先提交修改
-    putTaIssue(issue.issueId, data).then(() => {      
+    putTaIssue(issue.issueId, data).then(() => {
       // 再提交交办
-      postIssueAssigned({ ... data, nextOrg: data.orgId}).then(() => {
+      postIssueAssigned({ ...data, nextOrg: data.orgId }).then(() => {
         setLoading1(false);
-        Taro.navigateBack({delta: 1});
+        Taro.navigateBack({ delta: 1 });
       }).catch(() => {
         setLoading1(false);
       })
@@ -52,6 +52,7 @@ export default (props) => {
       message: '确认复制当前问题单?',
       selector: dialogId,
     }).then((value) => {
+      console.log('1value', value);
       if ('confirm' === value) {
         setLoading2(true)
         copyTaIssue(issue.issueId).then(res => {
@@ -79,9 +80,9 @@ export default (props) => {
       }
     })
   }
- 
+
   return (
-    <View style={{marginTop: '20px', display: 'flex'}}>
+    <View style={{ marginTop: '20px', display: 'flex' }}>
       <Dialog id={dialogId} />
       <Button
         block