Merge branch 'dev1.0' of http://git.ycjcjy.com/civilized_city/miniapp into dev1.0

src/pages/apply/components/Issue.jsx

@@ -4,12 +4,14 @@ import { View } from '@tarojs/components';
 import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
 import Uploader from '@/components/Uploader/index';
 import { getTaIssueById } from '@/services/taissue';
+import { getSysOrgById } from '@/services/sysorg';
 import { getDtStr } from '@/utils/date';
 
 export default (props) => {
   const { issueId, onLoading } = props;
 
   const [issue, setIssue] = React.useState({});
+  const [org, setOrg] = React.useState({});
 
   const setLoading = (val) => {
     if (onLoading) {
@@ -22,6 +24,17 @@ export default (props) => {
       setLoading(true);
       getTaIssueById(issueId).then((res) => {
         setIssue(res);
+        //拿到机构ID
+        if (res.orgId) {
+          // console.log('res.orgId', res.orgId)
+          setLoading(true);
+          getSysOrgById(res.orgId).then((r) => {
+            setOrg(r);
+            setLoading(false);
+          }).catch(() => {
+            setLoading(false);
+          });
+        }
         setLoading(false);
       }).catch(() => {
         setLoading(false);
@@ -35,18 +48,19 @@ export default (props) => {
         <Cell title="ID" value={issue?.issueId} />
         <Cell title="上报时间" value={getDtStr(issue?.createDate)} />
         <Cell title="办结时间" value={issue?.expireDate} />
+        <Cell title="交办单位" value={org?.name} />
         <Cell title="交办次数" value={issue?.processNum || 0} />
       </CellGroup>
-      <CellGroup style={{marginTop: '20px'}}>
+      <CellGroup style={{ marginTop: '20px' }}>
         <Cell title="抽检位置" value={issue?.locName} />
         <Cell title="定 位 点" value={issue?.addr} />
-        <Cell title="问题详情" />        
+        <Cell title="问题详情" />
         <Field
           readonly
           type="textarea"
           autosize={{ minHeight: '120px' }}
           value={issue?.content}
-        /> 
+        />
         <Cell
           renderTitle={
             <Uploader

src/pages/apply/verify/index.jsx

@@ -53,9 +53,27 @@ export default (props) => {
     }
 
     setSubmitting(true);
-    putTaIssueApply(data.applyId, data).then(() => {
-      Taro.navigateBack({ delta: 1 });
-      setSubmitting(false);
+    putTaIssueApply(data.applyId, data).then((res) => {
+      if (formData.verifyStatus == 'pass') {
+        // Dialog 有 bug,
+        // 使用 setTimeout 延迟一会规避一下
+        const t = setTimeout(() => {
+          clearTimeout(t);
+          Dialog.confirm({
+            title: '审批通过',
+            message: `确定要跳转问题单详情页吗？`,
+            selector: dialogId,
+          }).then((value2) => {
+            if ('confirm' === value2) {
+              Taro.navigateTo({
+                url: `/pages/issue/edit/index?id=${res.issueId}`
+              })
+            }
+          });
+        }, 500);
+        // Taro.navigateBack({ delta: 1 });
+        setSubmitting(false);
+      }
     }).catch(() => {
       setSubmitting(false);
     })
@@ -107,7 +125,7 @@ export default (props) => {
       message: '确认复制当前问题单?',
       selector: dialogId,
     }).then((value) => {
-      console.log('2value', value);
+      // console.log('2value', value);
       if ('confirm' === value) {
         setLoading2(true)
         copyTaIssue(issue.issueId).then(res => {