efats

src/app.config.js

@@ -4,11 +4,13 @@ export default defineAppConfig({
     'pages/home/index',
     'pages/login/index',
     'pages/issue/list/index',
-    'pages/issue/detail/index',
+    'pages/issue/list2/index',
+    'pages/issue/edit/index',
+    'pages/org/issue/list/index',
+    'pages/org/issue/detail/index',
     'pages/index3/index',
     'pages/index4/index',
     'pages/index5/index',
-    'pages/issue/add/index',
     'pages/reporting/index',
     'pages/reporting/detail/index',
     'pages/reset-password/index',

src/components/DatePicker/index.jsx

@@ -0,0 +1,19 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Popup, DatetimePicker } from '@antmjs/vantui';
+
+export default (props) => {
+  const { show, onCancel, onChange, ...leftProps } = props;
+
+  const onConfirm = (e) => {
+    const dt = new Date(e.detail.value);
+    onChange(dt);
+  }
+  
+  return (
+    <Popup show={show} position="bottom" onClose={onCancel}>
+      <DatetimePicker {...leftProps} onConfirm={onConfirm} />
+    </Popup>
+  )
+}

src/components/OrgPicker/index.jsx

@@ -0,0 +1,9 @@
+import React from 'react';
+import Pickerful from '@/components/Pickerful';
+import { getSysOrg } from '@/services/sysorg';
+
+export default (props) => {
+  return (
+    <Pickerful {...props} keyValue="orgId" dictAPI={getSysOrg} />
+  )
+}

src/layouts/TabBar.jsx

@@ -2,6 +2,14 @@ import React from 'react';
 import Taro from '@tarojs/taro';
 import { Image } from '@tarojs/components';
 import { Tabbar, TabbarItem } from '@antmjs/vantui';
+import {
+  ROLE_INSPECTOR,
+  ROLE_MANAGER,
+  ROLE_ORG_USER,
+  ROLE_ORG_MANAGER,
+  ROLE_QUERY_PERSON,
+  ROLE_CITIZEN
+} from '@/utils/user';
 import homeIcon from '@/assets/tabbar/page.png';
 import homeActiveIcon from '@/assets/tabbar/page click.png';
 import noticeIcon from '@/assets/tabbar/notice.png';
@@ -13,21 +21,66 @@ import checkActiveIcon from '@/assets/tabbar/evaluation click.png';
 import mineIcon from '@/assets/tabbar/my.png';
 import mineActiveIcon from '@/assets/tabbar/my click.png';
 
-const tabPages = {
-  home: '/pages/home/index',
-  notice: '/pages/index3/index',
-  issue: '/pages/issue/add/index',
-  check: '/pages/index4/index',
-  mine: '/pages/index5/index',
+const home = {
+  name: 'home',
+  label: '首页',
+  icon: homeIcon,
+  activeIcon: homeActiveIcon,
+  page: '/pages/home/index'
+}
+const notice = {
+  name: 'notice',
+  label: '公告',
+  icon: noticeIcon,
+  activeIcon: noticeActiveIcon,
+  page: '/pages/index3/index'
+}
+const issue = {
+  name: 'issue',
+  label: '发布',
+  icon: issueIcon,
+  activeIcon: issueActiveIcon,
+  page: '/pages/issue/edit/index'
+}
+const check = {
+  name: 'check',
+  label: '测评标准',
+  icon: checkIcon,
+  activeIcon: checkActiveIcon,
+  page: '/pages/index4/index'
+}
+const mine = {
+  name: 'mine',
+  label: '我的',
+  icon: mineIcon,
+  activeIcon: mineActiveIcon,
+  page: '/pages/index5/index'
 }
 
 export default (props) => {
-  const { active = -1, className } = props;
+  const { active = -1, className, user } = props;
+
+  const tabItems = React.useMemo(() => {
+    if (!user) return [];
+    
+    if (user.dutyList.indexOf(ROLE_INSPECTOR) > -1 // 督察员
+      || user.dutyList.indexOf(ROLE_MANAGER) > -1 // 管理员
+    ) {
+      return [
+        home,
+        notice,
+        issue,
+        check,
+        mine
+      ]
+    }
+
+    return [];
+  }, [user]);
 
   const onChange = (e) => {
-    Taro.reLaunch({
-      url: tabPages[e.detail]
-    })
+    const url = tabItems.filter(x => x.name === e.detail)[0].page;
+    Taro.reLaunch({ url })
   }
 
   return (
@@ -37,101 +90,30 @@ export default (props) => {
       active={active}
       onChange={onChange}
     >
-      <TabbarItem
-        name="home"
-        renderIcon={
-          <Image
-            src={homeIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-        renderIconActive={
-          <Image
-            src={homeActiveIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-      >
-        首页
-      </TabbarItem>
-      <TabbarItem
-        name="notice"
-        renderIcon={
-          <Image
-            src={noticeIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-        renderIconActive={
-          <Image
-            src={noticeActiveIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-      >
-        公告
-      </TabbarItem>
-      <TabbarItem
-        name="issue"
-        renderIcon={
-          <Image
-            src={issueIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-        renderIconActive={
-          <Image
-            src={issueActiveIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-      >
-        发布
-      </TabbarItem>
-      <TabbarItem
-        name="check"
-        renderIcon={
-          <Image
-            src={checkIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-        renderIconActive={
-          <Image
-            src={checkActiveIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-      >
-        测评标准
-      </TabbarItem>
-      <TabbarItem
-        name="mine"
-        renderIcon={
-          <Image
-            src={mineIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-        renderIconActive={
-          <Image
-            src={mineActiveIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-      >
-        我的
-      </TabbarItem>
+      {
+        tabItems.map(item => (
+          <TabbarItem
+            key={item.name}
+            name={item.name}
+            renderIcon={
+              <Image
+                src={item.icon}
+                mode="aspectFit"
+                style="width: 30px; height: 18px;"
+              ></Image>
+            }
+            renderIconActive={
+              <Image
+                src={item.activeIcon}
+                mode="aspectFit"
+                style="width: 30px; height: 18px;"
+              ></Image>
+            }
+          >
+            {item.label}
+          </TabbarItem>
+        ))
+      }
     </Tabbar>
   )
 }

src/layouts/index.jsx

@@ -50,7 +50,7 @@ export default (props) => {
         }
       </View>
       {
-        tabBar && <TabBar className={laySty['page-tabbar']} active={tabBar} />
+        tabBar && <TabBar className={laySty['page-tabbar']} active={tabBar} user={user} />
       }
     </View>
   )

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

@@ -1,49 +0,0 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { Button } from '@antmjs/vantui';
-import { putTaIssue } from '@/services/taissue';
-import { warn } from '@/utils/message';
-import style from './style.module.less';
-
-export default (props) => {
-
-  const { issue, formData } = props;
-
-  const [loading, setLoading] = React.useState(false);
-  
-  // 新增问题单
-  const onSubmit = () => {
-    try {
-      warn(!formData.addr, '请填写地址')
-      warn(!formData.locId, '请选择点位')
-      warn(!formData.content, '请填写问题描述')
-      warn(!formData.typeId, '请选择问题分类')
-      warn(!formData.attachList || formData.attachList.length < 1, '请上传照片')
-    } catch (e) {
-      return;
-    }
-
-    setLoading(true)
-    putTaIssue(issue.issueId, { ...issue, formData }).then(() => {
-      setLoading(false);
-      Taro.navigateBack({delta: 1});
-    }).catch(() => {
-      setLoading(false);
-    })
-  }
-  
-  return (
-    <View class={style['assigned-btn-wrapper']}>
-      <View>
-        <Button square plain type="danger" loading={loading} onClick={onSubmit}>删除</Button>
-      </View>
-      <View>
-        <Button block square plain hairline type="info" loading={loading} onClick={onSubmit}>打回</Button>
-      </View>
-      <View>          
-        <Button block square type="primary" loading={loading} onClick={onSubmit}>交办</Button>
-      </View>
-    </View>
-  )
-}

src/pages/issue/add/components/style.module.less

@@ -1,19 +0,0 @@
-
-
-.assigned-btn-wrapper {
-  display: flex;
-  background: #fff;
-  padding: 10px;
-  
-  & > view {
-    flex: 1;
-
-    &:first-child {
-      flex: 2;
-    }
-  
-    & + view {
-      margin-left: 10px;
-    }
-  }
-}

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

@@ -2,15 +2,27 @@ import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
 import { Button, Notify, Field, Cell, CellGroup } from '@antmjs/vantui';
-import LocType from '@/components/locType';
-import IssueType from '@/components/issueType';
+import LocType from '@/components/LocType';
+import IssueType from '@/components/IssueType';
+import OrgPicker from '@/components/OrgPicker';
+import DatePicker from '@/components/DatePicker';
 import Map from '@/components/map';
 import Uploader from '@/components/Uploader/index';
 import { getIssueStatus } from '@/utils/biz';
+import { getDateStr } from '@/utils/date';
 import mapIcon from '@/assets/icons/marker.png';
 
+const today = new Date();
+
 export default (props) => {
-  const { issue, readOnly, renderFields, renderAction } = props;
+  const {
+    issue,
+    readOnly,
+    showOrg,
+    showExpireDate,
+    renderFields,
+    renderAction
+  } = props;
 
   const [formData, setFormData] = React.useState({
     typeId: undefined,
@@ -24,6 +36,8 @@ export default (props) => {
   });
   const [showLocType, setShowLocType] = React.useState(false);
   const [showIssueType, setShowIssueType] = React.useState(false);
+  const [showOrgPicker, setShowOrgPicker] = React.useState(false);
+  const [showDatePicker, setShowDatePicker] = React.useState(false);
   const [bizStatus, setBizStatus] = React.useState();
   
   const onLocTypeChange = (_, it) => {
@@ -44,7 +58,25 @@ export default (props) => {
     setShowIssueType(false);
   }
 
-  const onFieldChange = (field, value) => {
+  const onOrgChange = (_, it) => {
+    setFormData({
+      ...formData,
+      orgId: it.orgId,
+      orgName: it.name,
+    });
+    setShowOrgPicker(false);
+  }
+
+  const onDateChange = (dt) => {
+    const date = getDateStr(dt);
+    setFormData({
+      ...formData,
+      expireDate: date,
+    });
+    setShowDatePicker(false);
+  }
+
+  const setFieldChange = (field, value) => {
     setFormData({
       ...formData,
       [field]: value,
@@ -74,6 +106,22 @@ export default (props) => {
         onChange={onIssueTypeChange}
       />
 
+      <OrgPicker
+        show={showOrgPicker}
+        value={formData.orgName}
+        onCancel={() => setShowOrgPicker(false)}
+        onChange={onOrgChange}
+      />
+
+      <DatePicker
+        type="date"
+        minDate={today}
+        show={showDatePicker}
+        value={formData.expireDate}
+        onCancel={() => setShowDatePicker(false)}
+        onChange={onDateChange}
+      />
+
       <Map location={formData.location} />
 
       <CellGroup>
@@ -88,7 +136,7 @@ export default (props) => {
           value={formData.addr}
           leftIcon={mapIcon}
           readonly={readOnly}
-          onChange={e => onFieldChange('addr', e.detail)}
+          onChange={e => setFieldChange('addr', e.detail)}
         />
       </CellGroup>
 
@@ -119,7 +167,7 @@ export default (props) => {
           readonly={readOnly}
           autosize={{ minHeight: '120px' }}
           value={formData.content}
-          onChange={e => onFieldChange('content', e.detail)}
+          onChange={e => setFieldChange('content', e.detail)}
         />
       </CellGroup>
             
@@ -131,14 +179,50 @@ export default (props) => {
             <Uploader
               value={formData.attachList}
               disabled={readOnly}
-              onChange={e => onFieldChange('attachList',e)}
+              onChange={e => setFieldChange('attachList',e)}
             />
           }
         />
       </CellGroup>
 
       {
-        renderFields ? renderFields(formData, setFormData) : null
+        (showOrg || showExpireDate) && (
+          <CellGroup style={{marginTop: '20px'}}>
+            {
+              showOrg && (
+                <Cell
+                  title="交办单位"
+                  isLink={!readOnly}
+                  value={formData.orgName}
+                  onClick={() => !readOnly && setShowOrgPicker(true)}
+                />
+              )
+            }
+            {
+              showExpireDate && (
+                <Cell
+                  title="办结时间"
+                  isLink={!readOnly}
+                  value={formData.expireDate}
+                  onClick={() => !readOnly && setShowDatePicker(true)}
+                />
+              )
+            }
+          </CellGroup>
+        )
+      }
+
+      {
+        renderFields ?
+          renderFields(
+            formData,
+            {
+              setFieldChange,
+              setFormData,
+              showOrgPicker,
+              setShowOrgPicker,
+            }
+          ) : null
       }
 
       {

src/pages/issue/detail/index.jsx

@@ -1,51 +0,0 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View, RichText } from '@tarojs/components';
-import { Button, Notify, Field, Cell, CellGroup } from '@antmjs/vantui';
-import Page from '@/layouts/index';
-import Map from '@/components/map';
-import Uploader from '@/components/Uploader/index';
-import { ROLE_INSPECTOR } from '@/utils/user';
-import mapIcon from '@/assets/icons/marker.png';
-import { getTaIssueById } from '@/services/taissue';
-import IssueDetail from '../components/Issue';
-import style from './style.module.less';
-
-export default (props) => {
-
-  const router = Taro.useRouter();
-  const { id } = router.params;
-  
-  const [issue, setIssue] = React.useState(false);
-  const [loading, setLoading] = React.useState(false);
-
-  // const [
-  //   content,
-  //   bizStatus
-  // ] = React.useMemo(() => {
-  //   if (!formData || !formData.issueId) return [];
-
-  //   return [
-  //     (formData.content || '').replace('\r\n', '<br>').replace('\n', '<br>'),
-  //     getIssueStatus(formData).label,
-  //   ]
-  // }, [formData])
-
-  React.useEffect(() => {
-    if (id) {
-      setLoading(true)
-      getTaIssueById(id).then(res => {
-        setLoading(false);
-        setIssue(res);
-      }).catch(() => {
-        setLoading(false);
-      });
-    }
-  }, [id]);
-
-  return (
-    <Page roles={[ROLE_INSPECTOR]} loading={loading}>
-      <IssueDetail readOnly issue={issue} />
-    </Page>
-  )
-}

src/pages/issue/detail/style.module.less

@@ -1,10 +0,0 @@
-
-.issue-content {
-  padding: 0 24px;
-  padding-left: 60px;
-  rich-text {
-    line-height: 70px;
-    font-size: 24px;
-    color: #202020;
-  }
-}

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

@@ -0,0 +1,132 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button, Popup, CellGroup, Cell, Field } from '@antmjs/vantui';
+import { postIssueAssigned, deleteTaIssue, postIssueRejct } from '@/services/taissue';
+import { warn } from '@/utils/message';
+import style from './style.module.less';
+
+export default (props) => {
+
+  const { issue, formData } = props;
+
+  const [loading1, setLoading1] = React.useState(false);
+  const [loading2, setLoading2] = React.useState(false);
+  const [loading3, setLoading3] = React.useState(false);
+  const [show, setShow] = React.useState(false);
+  const [processResult, setProcessResult] = React.useState();
+  
+  // 交办
+  const onAssigned = () => {
+    try {
+      warn(!formData.addr, '请填写地址')
+      warn(!formData.locId, '请选择点位')
+      warn(!formData.content, '请填写问题描述')
+      warn(!formData.typeId, '请选择问题分类')
+      warn(!formData.attachList || formData.attachList.length < 1, '请上传照片')
+      warn(!formData.orgId, '请选择交办单位')
+      warn(!formData.expireDate, '请选择办结时间')
+    } catch (e) {
+      return;
+    }
+
+    setLoading1(true)
+    postIssueAssigned({ ...issue, formData }).then(() => {
+      setLoading1(false);
+      Taro.navigateBack({delta: 1});
+    }).catch(() => {
+      setLoading1(false);
+    })
+  }
+
+  const onDelete = () => {
+    Taro.showModal({
+      title: '删除',
+      content: '确定进行删除操作?',
+      success (res) {
+        if (res.confirm) {
+          setLoading2(true)
+          deleteTaIssue(issue.issueId).then(() => {
+            setLoading2(false);
+            Taro.navigateBack({delta: 1});
+          }).catch(() => {
+            setLoading2(false);
+          })
+        }
+      }
+    })
+  }
+
+  const onReject = () => {
+    try {
+      warn(!processResult, '请填写退单理由')
+    } catch (e) {
+      return;
+    }
+
+    setShow(false);
+
+    const data = {
+      processResult,
+      issueId: issue.issueId,
+    }
+
+    setLoading3(true)
+    postIssueRejct(data).then(() => {
+      setLoading3(false);
+      Taro.navigateBack({delta: 1});
+    }).catch(() => {
+      setLoading3(false);
+    })
+  }
+  
+  return (
+    <View class={style['assigned-btn-wrapper']}>
+      <Popup position="bottom" show={show} onClose={() => setShow(false)}>
+        <CellGroup>
+          <Cell title="退单理由" />
+          <Field
+            type="textarea"
+            placeholder="请输入退单理由"
+            value={processResult}
+            autosize={{ minHeight: '240px' }}
+            onChange={e => setProcessResult(e.detail)}
+          />
+          <View style={{display: 'flex', justifyContent: 'space-around'}}>
+            <Button plain type="default" onClick={() => setShow(false)}>取消</Button>
+            <Button plain type="primary" onClick={onReject}>确定</Button>
+          </View>
+        </CellGroup>
+      </Popup>
+      <View>          
+        <Button
+          block
+          type="primary"
+          loading={loading1}
+          disabled={loading2 && loading3}
+          onClick={onAssigned}
+        >交办</Button>
+      </View>
+      <View style={{marginTop: '20px', display: 'flex'}}>
+        <Button
+          plain
+          hairline
+          type="danger"
+          loading={loading2}
+          disabled={loading1 && loading3}
+          style={{ flex: 1 }}
+          onClick={onDelete}
+        >删除</Button>
+        <Button
+          plain
+          hairline
+          type="info"
+          loading={loading3}
+          disabled={loading1 && loading2}
+          style={{ flex: 1, marginLeft: 'var(--main-space)' }}
+          onClick={() => setShow(true)}
+        >退单</Button>
+      </View>
+    </View>
+  )
+}

src/pages/issue/add/components/Form.jsx → src/pages/issue/edit/components/Form.jsx

@@ -2,8 +2,8 @@ import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
 import { Button, Notify, Field, Cell, CellGroup } from '@antmjs/vantui';
-import LocType from '@/components/locType';
-import IssueType from '@/components/issueType';
+import LocType from '@/components/LocType';
+import IssueType from '@/components/IssueType';
 import Map from '@/components/map';
 import Uploader from '@/components/Uploader/index';
 import mapIcon from '@/assets/icons/marker.png';

src/pages/issue/edit/components/style.module.less

@@ -0,0 +1,6 @@
+
+
+.assigned-btn-wrapper {
+  background: #fff;
+  padding: var(--main-space);  
+}

src/pages/issue/add/index.jsx → src/pages/issue/edit/index.jsx

@@ -1,12 +1,14 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
 import { Block } from '@tarojs/components';
+import { CellGroup, Cell } from '@antmjs/vantui';
 import Page from '@/layouts/index';
 import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
 import { getTaIssueById } from '@/services/taissue';
 import IssueForm from '../components/Issue';
 import Save from './components/Save';
 import Edit from './components/Edit';
+import Assigned from './components/Assigned';
 
 export default (props) => {
 
@@ -29,13 +31,17 @@ export default (props) => {
   }, [id]);
 
   return (
-    <Page roles={[ROLE_INSPECTOR, ROLE_MANAGER]}>
+    <Page roles={[ROLE_INSPECTOR, ROLE_MANAGER]} loading={loading}>
       <IssueForm
         issue={issue}
+        readOnly={id&&!act}
+        showOrg={act === 'assigned'}
+        showExpireDate={act === 'assigned'}
         renderAction={(formData) => (
           <Block>
             {!id && <Save formData={formData} />}
-            {id && !act && <Edit issue={issue} formData={formData} />}
+            {act === 'edit' && <Edit issue={issue} formData={formData} />}
+            {act === 'assigned' && <Assigned issue={issue} formData={formData} />}
           </Block>
         )}
       />

src/pages/issue/list/index.jsx

@@ -4,33 +4,48 @@ import { View } from '@tarojs/components';
 import { Tab, Tabs } from '@antmjs/vantui';
 import Page from '@/layouts/index';
 import PowerList from '@/components/PowerList';
+import Card from '@/components/IssueCard';
 import { getTaIssue } from '@/services/taissue';
-import { ROLE_INSPECTOR } from '@/utils/user';
-import Card from '../components/Card';
+import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
+import { useModel } from '@/store';
+import { getIssueStatus } from '@/utils/biz';
 
+// 只有督察员能看到当前页面
 export default (props) => {
+  const { user } = useModel('user');
 
-  const onClick = (item, act) => {
-    if (act) {
-      Taro.navigateTo({
-        url: `/pages/issue/detail/index?id=${item.issueId}&act=${act}`
-      })
-    } else {
-      Taro.navigateTo({
-        url: `/pages/issue/detail/index?id=${item.issueId}`
-      })
+  const onClick = (item) => {
+
+    let act = '';
+    const status = getIssueStatus(item);
+    
+    // 如果是管理员
+    if (user.dutyList.indexOf(ROLE_MANAGER) > -1) {
+      // 如果是待交办
+      if (status.value === 0) {
+        act = 'assigned';
+      }
+    } else if (user.dutyList.indexOf(ROLE_INSPECTOR) > -1) {
+      // 如果是待交办
+      if (status.value === 0) {
+        act = 'edit';
+      }
     }
+
+    Taro.navigateTo({
+      url: `/pages/issue/edit/index?id=${item.issueId}&act=${act}`
+    })
   }
   
   return (
-    <Page roles={[ROLE_INSPECTOR]}>
+    <Page>
       <Tabs sticky>
         <Tab title="全部">
           <PowerList
             request={getTaIssue}
             params={{mine: true}}
             renderItem={(item) => (
-              <Card key={item.issueId} detail={item} onClick={() => onClick(item, 'assigned')} />
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}
           />
         </Tab>

src/pages/issue/detail/index.config.js → src/pages/issue/list2/index.config.js

@@ -1,4 +1,4 @@
 // eslint-disable-next-line no-undef
 export default definePageConfig({
-  navigationBarTitleText: '问题单详情'
+  navigationBarTitleText: '问题列表'
 })

src/pages/issue/list2/index.jsx

@@ -0,0 +1,72 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Tab, Tabs } from '@antmjs/vantui';
+import Page from '@/layouts/index';
+import PowerList from '@/components/PowerList';
+import Card from '@/components/IssueCard';
+import { getTaIssue } from '@/services/taissue';
+import { ROLE_MANAGER } from '@/utils/user';
+import { useModel } from '@/store';
+import { getIssueStatus } from '@/utils/biz';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { title } = router.params;
+
+  React.useMemo(() => {
+    if (title) {
+      Taro.setNavigationBarTitle({ title });
+    } else {
+      Taro.setNavigationBarTitle({ title: '问题列表' });
+    }
+  }, [title]);
+
+  const { user } = useModel('user');
+
+  const onClick = (item) => {
+
+    let act = '';
+    const status = getIssueStatus(item);
+
+    // 如果是管理员
+    if (user.dutyList.indexOf(ROLE_MANAGER) > -1) {
+      // 如果是待交办
+      if (status.value === 0) {
+        act = 'assigned';
+      }
+    } else {
+      
+    }
+
+    Taro.navigateTo({
+      url: `/pages/issue/edit/index?id=${item.issueId}&act=${act}`
+    })
+  }
+  
+  return (
+    <Page>
+      <Tabs sticky>
+        <Tab title="监督员">
+          <PowerList
+            request={getTaIssue}
+            params={{mine: true}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+        <Tab title="市民">
+          <PowerList
+            request={getTaIssue}
+            params={{bizStatus: 'start', mine: true}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+      </Tabs>
+    </Page>
+  )
+}

src/pages/login/index.jsx

@@ -9,10 +9,6 @@ import './index.less'
 
 export default (props) => {
 
-  React.useMemo(() => {  
-    Taro.hideTabBar();
-  }, []);
-
   const onSuccess = () => {
     Taro.navigateBack({
       delta: 1,

src/pages/org/issue/detail/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '问题详情'
+})

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

@@ -0,0 +1,96 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
+import Page from '@/layouts/index';
+import Uploader from '@/components/Uploader/index';
+import { getTaIssueById } from '@/services/taissue';
+import { getTaOrgIssueByIssueId } from '@/services/taorgissue';
+
+const getDtStr = dt => !dt ? '' : dt.replace('T', ' ').substring(0, 16)
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { id } = router.params;
+
+  const [loading, setLoading] = React.useState(false);
+  const [issue, setIssue] = React.useState();
+  const [orgIssue, setOrgIssue] = React.useState();
+
+  const setFormData = (key, value) => {
+    setOrgIssue({
+      ...(orgIssue || {}),
+      [key]: value,
+    })
+  }
+
+  React.useEffect(() => {
+    if (id) {
+      setLoading(true)
+      getTaIssueById(id).then(res => {
+        setLoading(false);
+        setIssue(res);
+      }).catch(() => {
+        setLoading(false);
+      });
+
+      getTaOrgIssueByIssueId(id).then(res => setOrgIssue(res));
+    }
+  }, [id]);
+  
+  return (
+    <Page loading={loading}>
+      <CellGroup>
+        <Cell title="上报时间" value={getDtStr(issue?.createDate)} />
+        <Cell title="办结时间" value={issue?.expireDate} /> 
+      </CellGroup>
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell title="抽检位置" value={issue?.locName} />
+        <Cell title="定 位 点" value={issue?.addr} />
+        <Cell title="问题详情" />        
+        <Field
+          readonly
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={issue?.content}
+        /> 
+        <Cell
+          renderTitle={
+            <Uploader
+              disabled
+              value={issue?.attachList}
+            />
+          }
+        />
+      </CellGroup>
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell title="整改结果" />        
+        <Field
+          readonly
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={orgIssue?.result}
+          onChange={e => setFormData('result', e.detail)}
+        />
+        <Cell
+          renderTitle={
+            <Uploader
+              disabled
+              value={orgIssue?.attachList}
+              onChange={e => setFormData('attachList', e)}
+            />
+          }
+        />
+      </CellGroup>
+      <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
+        <View>
+          <Button block type="primary">通过审核</Button>
+        </View>
+        <View style={{marginTop: '20px'}}>
+          <Button block type="default">重新整改</Button>
+        </View>
+      </View>
+    </Page>
+  )
+}

src/pages/org/issue/list/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '问题列表'
+})

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

@@ -0,0 +1,67 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Tab, Tabs } from '@antmjs/vantui';
+import Page from '@/layouts/index';
+import PowerList from '@/components/PowerList';
+import Card from '@/components/IssueCard';
+import { getTaOrgIssue } from '@/services/taorgissue';
+import { ROLE_MANAGER } from '@/utils/user';
+import { useModel } from '@/store';
+import { getIssueStatus } from '@/utils/biz';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { title, bizStatus } = router.params;
+
+  React.useMemo(() => {
+    if (title) {
+      Taro.setNavigationBarTitle({ title });
+    } else {
+      Taro.setNavigationBarTitle({ title: '问题列表' });
+    }
+  }, [title]);
+
+  // const { user } = useModel('user');
+
+  const onClick = (item) => {
+
+    let act = '';
+    const status = getIssueStatus(item);
+
+    // 如果是待交办
+    if (status.value === 0) {
+      act = 'assigned';
+    }
+
+    Taro.navigateTo({
+      url: `/pages/issue/edit/index?id=${item.issueId}&act=${act}`
+    })
+  }
+  
+  return (
+    <Page>
+      <Tabs sticky>
+        <Tab title="监督员">
+          <PowerList
+            request={getTaOrgIssue}
+            params={{bizStatus, sourceType: 'inspector'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+        <Tab title="市民">
+          <PowerList
+            request={getTaOrgIssue}
+            params={{bizStatus, sourceType: 'feedback'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+      </Tabs>
+    </Page>
+  )
+}

src/services/sysorg.js

@@ -0,0 +1,30 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getSysOrg = (params) => request('/api/sysOrg', { params });
+
+/*
+ * 新增数据
+ */
+export const postSysOrg = (data) => request('/api/sysOrg', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getSysOrgById = (id) => request(`/api/sysOrg/${id}`);
+
+/** 
+ * 更新数据
+ * 
+ * @param {*} id
+ * @param {*} data
+ * @returns
+ */
+export const putSysOrg = (id, data) => request(`/api/sysOrg/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteSysOrg = (id) => request(`/api/sysOrg/${id}`, { method: 'delete' });

src/services/taissue.js

@@ -24,3 +24,13 @@ export const putTaIssue = (id, data) => request(`/api/taIssue/${id}`, { data, me
  * 通过主键删除数据
  */
 export const deleteTaIssue = (id) => request(`/api/taIssue/${id}`, { method: 'delete' });
+
+/*
+ * 交办
+ */
+export const postIssueAssigned = (data) => request('/api/taIssueProcess/assigned', { data, method: 'post' });
+
+/*
+ * 驳回
+ */
+export const postIssueRejct = (data) => request('/api/taIssueProcess/reject', { data, method: 'post' });

src/services/taorgissue.js

@@ -0,0 +1,30 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTaOrgIssue = (params) => request('/api/taOrgIssue', { params });
+
+/*
+ * 新增数据
+ */
+export const postTaOrgIssue = (data) => request('/api/taOrgIssue', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaOrgIssueById = (id) => request(`/api/taOrgIssue/${id}`);
+/*
+ * 通过ISSUE_ID查询单条数据
+ */
+export const getTaOrgIssueByIssueId = (issueId) => request(`/api/taIssue/${issueId}/orgIssue`);
+
+/*
+ * 更新数据
+ */
+export const putTaOrgIssue = (id, data) => request(`/api/taOrgIssue/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaOrgIssue = (id) => request(`/api/taOrgIssue/${id}`, { method: 'delete' });

src/utils/biz.js

@@ -6,11 +6,6 @@ export function getIssueStatus(taIssue) {
       value: 0,
       label: '未交办',
     }
-  } else if (taIssue.processNode === 'assigned') {
-    return {
-      value: 1,
-      label: '已交办',
-    };
   } else if (taIssue.processNode === 'end') {
     return {
       value: 2,
@@ -26,6 +21,11 @@ export function getIssueStatus(taIssue) {
       value: 4,
       label: '已打回',
     };
+  } else if (taIssue.processNode === 'assigned') {
+    return {
+      value: 1,
+      label: '已交办',
+    };
   }
 
   return {};

src/utils/date.js

@@ -0,0 +1,12 @@
+
+function fill0(n) {
+  return n > 9 ? `${n}` : `0${n}`
+}
+
+export function getDateStr(dt) {
+  const y = dt.getFullYear();
+  const m = dt.getMonth() + 1;
+  const d = dt.getDate();
+
+  return `${y}-${fill0(m)}-${fill0(d)}`
+}