fats

src/components/OrgPicker/index.jsx

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

src/components/Pickerful/index.jsx

@@ -10,7 +10,7 @@ const wrapperStyle = {
 }
 
 export default (props) => {
-  const { show, value, keyValue, labelValue = 'name', dictAPI, onChange, onCancel } = props;
+  const { show, value, params = {}, keyValue, labelValue = 'name', dictAPI, onChange, onCancel } = props;
 
   const [dict, setDict] = React.useState([]);
   const [checked, setChecked] = React.useState();
@@ -30,7 +30,7 @@ export default (props) => {
   }
 
   React.useEffect(() => {
-    dictAPI({pageSize: 500}).then(res => {
+    dictAPI({pageSize: 500, ...params }).then(res => {
       setDict(res.records || []);
     })
   }, []);

src/pages/check/edit/components/LocForm.jsx

@@ -5,6 +5,7 @@ import { CellGroup, Cell, Field, RadioGroup, Radio, Icon, Loading } from '@antmj
 import Map from '@/components/map';
 import { getTaCheckItemAnswer } from '@/services/tacheckitem';
 import { getTaCheckAnswer } from '@/services/tacheckanswer';
+import { geocoder } from '@/utils/map';
 import mapIcon from '@/assets/icons/marker.png';
 import AgePicker from './AgePicker';
 
@@ -12,7 +13,6 @@ export default (props) => {
   const { checkItemInfo, checkType, answer, readonly, onChange, onLoadingChange } = props;
 
   const [showAgePicker, setShowAgePicker] = React.useState(false);
-  const [count, setCount] = React.useState();
 
   const setLoading = (v) => {
     if (onLoadingChange) {
@@ -27,35 +27,23 @@ export default (props) => {
     })
   }
 
-  React.useEffect(() => {
-    getTaCheckAnswer().then((res) => {
-      setCount(res.total);
-    })
-  })
-
-  // // 获取答题主记录信息
-  // React.useEffect(() => {
-  //   if (checkItemInfo?.itemId) {
-  //     setLoading(true);
-  //     getTaCheckItemAnswer(checkItemInfo?.itemId).then((res) => {
-  //       if (res) {
-  //         onChange(res);
-  //       }
-  //       setLoading(false);
-  //     }).catch(() => {
-  //       setLoading(false);
-  //     });
-  //   }
-  // }, [checkItemInfo?.itemId])
+  const onLocationChange = (loc) => {
+    setFieldChange('location', loc);
 
-  // console.log('answer', answer);
+    if (checkType == 'loc' && loc) {
+      // 交换经纬度位置
+      const [x, y] = loc.split(',');
+      const location = [y, x].join(',');
+      geocoder(location).then(e => setFieldChange('addr', e?.address_component?.street_number || e?.address)).catch(console.error)
+    }
+  }
 
   return (
     <View>
       <Map
         readOnly={readonly}
         location={answer?.location}
-        onChange={e => setFieldChange('location', e)}
+        onChange={onLocationChange}
       />
       {/* <View style={{ position: 'fixed', zIndex: '3000', top: '50%', color: 'red', display: 'grid', width: '50px', height: '50px' }}>
         <Loading type="spinner" vertical />
@@ -119,13 +107,6 @@ export default (props) => {
           </CellGroup>
         )
       }
-      {/* <CellGroup style={{ marginTop: '20px' }}>
-        <Cell>
-          <View style={{ textAlign: 'center', color: '#000' }}>
-            您已完成{count}份
-          </View>
-        </Cell>
-      </CellGroup> */}
 
       {
         checkType == 'survey' && (

src/pages/check/loc/edit/components/LocForm.jsx

@@ -5,6 +5,7 @@ import { CellGroup, Cell, Field } from '@antmjs/vantui';
 import Map from '@/components/map';
 import { getTaCheckItemAnswer } from '@/services/tacheckitem';
 import mapIcon from '@/assets/icons/marker.png';
+import { geocoder } from '@/utils/map';
 
 export default (props) => {
   const { checkItemInfo, answer, readonly, onChange, onLoadingChange } = props;
@@ -21,6 +22,17 @@ export default (props) => {
       [key]: val,
     })
   }
+  
+  const onLocationChange = (loc) => {
+    setFieldChange('location', loc);
+
+    if (loc) {
+      // 交换经纬度位置
+      const [x, y] = loc.split(',');
+      const location = [y, x].join(',');
+      geocoder(location).then(e => setFieldChange('addr', e?.address_component?.street_number || e?.address)).catch(console.error)
+    }
+  }
 
   // 获取答题主记录信息
   React.useEffect(() => {
@@ -42,7 +54,7 @@ export default (props) => {
       <Map
         readOnly={readonly}
         location={answer?.location}
-        onChange={(e) => setFieldChange('location', e)}
+        onChange={onLocationChange}
       />
       <CellGroup>
         <Cell

src/pages/feedback/issue/index.jsx

@@ -8,6 +8,7 @@ import Uploader from '@/components/Uploader/index';
 import mapIcon from '@/assets/icons/marker.png';
 import { warn } from '@/utils/message';
 import { postTaFeedback } from '@/services/tafeedback';
+import { geocoder } from '@/utils/map';
 
 export default (props) => {
   const readOnly = false;
@@ -60,13 +61,25 @@ export default (props) => {
     })
 
   }
+    
+  const onLocationChange = (loc) => {
+    setFieldChange('location', loc);
+
+    if (loc) {
+      // 交换经纬度位置
+      const [x, y] = loc.split(',');
+      const location = [y, x].join(',');
+      geocoder(location).then(e => setFieldChange('addr', e?.address_component?.street_number || e?.address)).catch(console.error)
+    }
+  }
+
 
   return (
     <Page tabBar="feedback">
       <Map
         readOnly={readOnly}
         location={formData.location}
-        onChange={e => !formData.location && setFieldChange('location', e)}
+        onChange={onLocationChange}
       />
 
       <CellGroup>

src/pages/home/index.jsx

@@ -42,7 +42,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: '/pages/org/issue/list/index?title=已办结&bizStatus=expired' },
+    { icon: 'icon5', text: '已 逾 期', link: '/pages/org/issue/list/index?title=已逾期&bizStatus=expired' },
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
   ],
 
@@ -50,7 +50,7 @@ const menus = {
   [ROLE_ORG_MANAGER]: [
     { 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: '/pages/org/issue/list/index?title=已办结&bizStatus=expired' },
+    { icon: 'icon5', text: '已 逾 期', link: '/pages/org/issue/list/index?title=已逾期&bizStatus=expired' },
     { icon: 'icon9', text: '审核申请', request: getVerifyApply, link: `/pages/apply/list/index?title=审核申请&applyType=${PROCESS_APPLY_VERIFY}` },
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
     { icon: 'person', text: '人员管理', link: '/pages/user/list/index' },

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

@@ -12,6 +12,7 @@ import { getDateStr } from '@/utils/date';
 import mapIcon from '@/assets/icons/marker.png';
 import { getTaOrgIssueByIssueId } from '@/services/taorgissue';
 import { PROCESS_END } from '@/utils/biz';
+import { geocoder } from '@/utils/map';
 
 import IssueStatus from './IssueStatus';
 
@@ -107,6 +108,18 @@ export default (props) => {
     setFormData(data);
   }
 
+  
+  const onLocationChange = (loc) => {
+    setFieldChange('location', loc);
+
+    if (loc) {
+      // 交换经纬度位置
+      const [x, y] = loc.split(',');
+      const location = [y, x].join(',');
+      geocoder(location).then(e => setFieldChange('addr', e?.address_component?.street_number || e?.address)).catch(console.error)
+    }
+  }
+
   React.useEffect(() => {
     if (issue) {
       fmRef.current = issue;
@@ -157,7 +170,7 @@ export default (props) => {
       <Map
         readOnly={!!issueId}
         location={formData.location}
-        onChange={e => !formData.location && setFieldChange('location', e)}
+        onChange={onLocationChange}
       />
 
       <CellGroup>

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

@@ -1,15 +1,17 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
-import { Button } from '@antmjs/vantui';
-import { postIssueAssigned, putTaIssue } from '@/services/taissue';
+import { Button, Dialog } from '@antmjs/vantui';
+import { postIssueAssigned, putTaIssue, copyTaIssue } from '@/services/taissue';
 import { warn } from '@/utils/message';
 
 export default (props) => {
 
   const { issue, formData } = 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 = () => {
@@ -42,14 +44,59 @@ export default (props) => {
       setLoading1(false);
     })
   }
+
+  // 复制
+  const onCopy = () => {
+    Dialog.confirm({
+      title: '复制问题单',
+      message: '确认复制当前问题单?',
+      selector: dialogId,
+    }).then((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 (
-    <Button
-      block
-      type="primary"
-      loading={loading1}
-      onClick={onAssigned}
-      style={{marginTop: '20px'}}
-    >交办</Button>
+    <View style={{marginTop: '20px', display: 'flex'}}>
+      <Dialog id={dialogId} />
+      <Button
+        block
+        type="primary"
+        loading={loading1}
+        onClick={onAssigned}
+        style={{ flex: 5 }}
+      >交办</Button>
+      <Button
+        block
+        type="info"
+        loading={loading2}
+        onClick={onCopy}
+        style={{ flex: 1, marginLeft: 'var(--main-space)' }}
+      >复制</Button>
+    </View>
   )
 }

src/pages/issue/edit/index.jsx

@@ -49,7 +49,7 @@ export default (props) => {
     if (duty == ROLE_INSPECTOR) {
       return [
         issue && issue.processNode != PROCESS_START,
-        issue?.processNode && issue?.processNode != PROCESS_START,
+        true,
         issue && issue.processNode == PROCESS_START,
         false,
         false,

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

@@ -26,7 +26,7 @@ export default (props) => {
 
   const router = Taro.useRouter();
   const { id, act } = router.params;
-  const { duty } = useModel('user');
+  const { duty, user } = useModel('user');
 
   const [loading, setLoading] = React.useState(false);
   const [issue, setIssue] = React.useState();
@@ -64,9 +64,9 @@ export default (props) => {
         setLoading(false);
       });
 
-      getTaOrgIssueByIssueId(id).then(res => setOrgIssue(res));
+      getTaOrgIssueByIssueId(id, user?.orgId ).then(res => setOrgIssue(res));
     }
-  }, [id]);
+  }, [id, user]);
   
   return (
     <Page loading={loading}>

src/services/taissue.js

@@ -20,6 +20,11 @@ export const getTaIssueById = (id) => request(`/api/taIssue/${id}`);
  */
 export const putTaIssue = (id, data) => request(`/api/taIssue/${id}`, { data, method: 'put' });
 
+/*
+ * 复制数据
+ */
+export const copyTaIssue = (id) => request(`/api/taIssue/${id}/copy`, { method: 'post' });
+
 /*
  * 通过主键删除数据
  */

src/utils/map.js

@@ -0,0 +1,29 @@
+import Taro from "@tarojs/taro";
+
+// 腾讯地图接口 - 个人开发者
+const QMAP_WEBSERVICE_KEY = 'HTPBZ-HHJA7-XD2XD-PRS37-H3HVJ-U5BAA';
+
+// https://lbs.qq.com/service/webService/webServiceGuide/webServiceGcoder
+// location 为 gcj02 编码
+export function geocoder(location, getPoi = 0) {
+  if (!location || location.length < 3) {
+    return Promise.reject(new Error('待解析地址为空'));
+  }
+
+  return new Promise((resolve, reject) => {
+    const url = `https://apis.map.qq.com/ws/geocoder/v1/?location=${location}&key=${QMAP_WEBSERVICE_KEY}&get_poi=${getPoi}`
+
+    Taro.request({ url }).then(({ data }) => {
+      const { status, message, result } = data || {};
+      if (status != 0) {
+        console.error(data);
+        reject(new Error(message));
+      } else {
+        resolve(result);
+      }
+    }).catch((err) => {
+      console.error(err);
+      reject(new Error(err.errMsg));
+    });
+  })
+}