F

src/components/IssueCard/index.jsx

@@ -6,7 +6,7 @@ import { APPLY_READY, getIssueStatus } from '@/utils/biz';
 import icon from '@/assets/icons/marker.png';
 import style from './style.module.less';
 
-const colors = [
+export const colors = [
   ['rgba(130, 176, 254, 0.08)', 'rgba(52, 121, 237, 1)'], // 未交办
   ['rgba(51, 218, 156, 0.08)', 'rgba(26, 117, 101, 1)'], // 已交办
   ['rgba(251, 157, 75, 0.08)', 'rgba(232, 116, 16, 1)'], // 已办结
@@ -27,7 +27,7 @@ export default (props) => {
     statusTxt,
   ] = React.useMemo(() => {
     if (!detail) return [];
-
+console.log(detail)
     // detail 有可能是申请信息
     const { value: bizStatus = 0, label: statusText } = getIssueStatus({
       ...detail || {},

src/components/MenuIcon.jsx

@@ -27,7 +27,7 @@ const txtStyle = {
 
 export default (props) => {
   
-  const { icon, text, link, request } = props;
+  const { icon, text, link, request ,user} = props;
 
   const [info, setInfo] = React.useState();
 
@@ -38,14 +38,14 @@ export default (props) => {
   }
 
   React.useEffect(() => {
-    if (request) {
+    if (request&&user) {
       request().then(res => {
         if (res) {
           res > 99 ? setInfo('99+') : setInfo(res);
         }
       });
     }
-  }, [request]);
+  }, [request,user]);
 
   return (
     <RatioView>

src/pages/apply/detail/index.jsx

@@ -10,6 +10,7 @@ import Issue from '../components/Issue';
 import useTitle from '../useTitle';
 
 const getVerifyStatus = (st) => {
+  console.log("***************st******************",st)
   if (!st || st == 'ready') return '未审批';
   return st == 'pass' ? '通过' : '驳回';
 }

src/pages/apply/list/index.jsx

@@ -1,11 +1,11 @@
-import React, { useState } from "react";
+import React, { useMemo, useRef, useState } from "react";
 import Taro from "@tarojs/taro";
 import { Tab, Tabs, Search } from "@antmjs/vantui";
 import Page from "@/layouts/index";
 import PowerList from "@/components/PowerList";
 import Card from "@/components/IssueCard";
 import { getTaIssueApply } from "@/services/taissueapply";
-import { ROLE_MANAGER, ROLE_ORG_MANAGER } from "@/utils/user";
+import { ROLE_INSPECTOR, ROLE_MANAGER, ROLE_ORG_MANAGER } from "@/utils/user";
 import { useModel } from "@/store";
 
 const tabStyle = {
@@ -20,9 +20,9 @@ const sid2 = Math.random().toString(36).substring(2, 8);
 export default (props) => {
   const router = Taro.useRouter();
   const { title, applyType = "" } = router.params;
+  const { user, duty } = useModel("user");
   const [issueId, setIssueId] = useState("");
-
-  const { duty } = useModel("user");
+const dutys=Taro.getStorageSync("duty")
 
   React.useMemo(() => {
     if (title) {
@@ -32,20 +32,26 @@ export default (props) => {
     }
   }, [title]);
 
-  const { user } = useModel("user");
-
+  
   const [param1, param2] = React.useMemo(() => {
+
     return [
-      { applyType, sourceType: "inspector", duty, issueId },
-      { applyType, sourceType: "feedback", duty }
-    ]
-  }, [applyType, issueId, duty]);
+      { applyType, sourceType: "inspector", duty:dutys, issueId },
+      { applyType, sourceType: "feedback", duty:dutys },
+    ];
+  }, [applyType, issueId, dutys]);
+
+
 
   const onClick = (item) => {
     if (!user) return;
 
     if (!item.verifyDate) {
-      if (duty != ROLE_MANAGER && duty != ROLE_ORG_MANAGER) {
+      if (
+        duty != ROLE_MANAGER &&
+        duty != ROLE_ORG_MANAGER &&
+        duty != ROLE_INSPECTOR
+      ) {
         Taro.navigateTo({
           url: `/pages/apply/detail/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`,
         });

src/pages/home/index.jsx

@@ -1,4 +1,5 @@
-import React from "react";
+import React, { useMemo } from "react";
+import Taro from "@tarojs/taro";
 import { View, Text, Image } from "@tarojs/components";
 import Page from "@/layouts/index";
 import { useModel } from "@/store";
@@ -30,188 +31,195 @@ import "./index.less";
 const getRejctApply = () => getApplyNum({ applyType: PROCESS_APPLY_REJECT });
 const getDelayApply = () => getApplyNum({ applyType: PROCESS_APPLY_DELAY });
 const getVerifyApply = () => getApplyNum({ applyType: PROCESS_APPLY_VERIFY });
-const getEdnApply = () => getApplyNum({ applyType: PROCESS_APPLY_END });
+const getEdnApply = (duty) =>
+  getApplyNum({ applyType: PROCESS_APPLY_END, duty });
 
-const menus = {
-  // 督查员
-  [ROLE_INSPECTOR]: [
-    {
-      icon: "icon9",
-      text: "我的上报",
-      link: "/pages/issue/list/index?mine=true",
-    },
-    { icon: "icon11", text: "消息通知", link: "/pages/message/list/index" },
-    { icon: "icon10", text: "模拟测评", link: "/pages/check/list/index" },
-  
-  ],
+export default (props) => {
+  const userModel = useModel("user");
+  const { user, duty, signOut, changePwd } = userModel || {};
+  const menus = useMemo(() => {
+    return {
+      // 督查员
+      [ROLE_INSPECTOR]: [
+        {
+          icon: "icon9",
+          text: "我的上报",
+          link: "/pages/issue/list/index?mine=true",
+        },
+        { icon: "icon11", text: "消息通知", link: "/pages/message/list/index" },
+        { icon: "icon10", text: "模拟测评", link: "/pages/check/list/index" },
+        {
+          icon: "icon4",
+          text: "消单申请",
+          request: () => getEdnApply(duty),
+          link: `/pages/apply/list/index?title=消单申请&applyType=${PROCESS_APPLY_END}`,
+        },
+      ],
 
-  // 平台管理员
-  [ROLE_MANAGER]: [
-    {
-      icon: "icon1",
-      text: "待 交 办",
-      link: `/pages/issue/list2/index?title=待交办&bizStatus=${PROCESS_START}`,
-    },
-    {
-      icon: "icon2",
-      text: "已 交 办",
-      link: `/pages/issue/list2/index?title=已交办&bizStatus=${PROCESS_ASSIGNED}`,
-    },
-    {
-      icon: "icon3",
-      text: "已 办 结",
-      link: `/pages/issue/list2/index?title=已办结&bizStatus=${PROCESS_END}`,
-    },
-    {
-      icon: "icon4",
-      text: "消单申请",
-      request: getEdnApply,
-      link: `/pages/apply/list/index?title=消单申请&applyType=${PROCESS_APPLY_END}`,
-    },
-    {
-      icon: "icon5",
-      text: "逾期警告",
-      link: `/pages/issue/list2/index?title=逾期警告&bizStatus=expired`,
-    },
-    {
-      icon: "icon6",
-      text: "延期申请",
-      request: getDelayApply,
-      link: `/pages/apply/list/index?title=延期申请&applyType=${PROCESS_APPLY_DELAY}`,
-    },
-    {
-      icon: "icon12",
-      text: "驳回申请",
-      request: getRejctApply,
-      link: `/pages/apply/list/index?title=驳回申请&applyType=${PROCESS_APPLY_REJECT}`,
-    },
-    {
-      icon: "icon7",
-      text: "统计查询",
-      link: "/subpkg1/pages/statistics/index",
-    },
-    {
-      icon: "icon9",
-      text: "我的上报",
-      link: "/pages/issue/list2/index?title=我的上报&mine=true",
-    },
-    { icon: "icon11", text: "消息通知", link: "/pages/message/list/index" },
-  ],
+      // 平台管理员
+      [ROLE_MANAGER]: [
+        {
+          icon: "icon1",
+          text: "待 交 办",
+          link: `/pages/issue/list2/index?title=待交办&bizStatus=${PROCESS_START}`,
+        },
+        {
+          icon: "icon2",
+          text: "已 交 办",
+          link: `/pages/issue/list2/index?title=已交办&bizStatus=${PROCESS_ASSIGNED}`,
+        },
+        {
+          icon: "icon3",
+          text: "已 办 结",
+          link: `/pages/issue/list2/index?title=已办结&bizStatus=${PROCESS_END}`,
+        },
+        {
+          icon: "icon4",
+          text: "消单申请",
+          request: getEdnApply,
+          link: `/pages/apply/list/index?title=消单申请&applyType=${PROCESS_APPLY_END}`,
+        },
+        {
+          icon: "icon5",
+          text: "逾期警告",
+          link: `/pages/issue/list2/index?title=逾期警告&bizStatus=expired`,
+        },
+        {
+          icon: "icon6",
+          text: "延期申请",
+          request: getDelayApply,
+          link: `/pages/apply/list/index?title=延期申请&applyType=${PROCESS_APPLY_DELAY}`,
+        },
+        {
+          icon: "icon12",
+          text: "驳回申请",
+          request: getRejctApply,
+          link: `/pages/apply/list/index?title=驳回申请&applyType=${PROCESS_APPLY_REJECT}`,
+        },
+        {
+          icon: "icon7",
+          text: "统计查询",
+          link: "/subpkg1/pages/statistics/index",
+        },
+        {
+          icon: "icon9",
+          text: "我的上报",
+          link: "/pages/issue/list2/index?title=我的上报&mine=true",
+        },
+        { icon: "icon11", text: "消息通知", link: "/pages/message/list/index" },
+      ],
 
-  // 责任单位用户
-  [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: "icon11", text: "消息通知", link: "/pages/message/list/index" },
-    {
-      icon: "icon10",
-      text: "我的上报",
-      link: `/pages/feedback/issuelist/index?title=我的上报&bizStatus=`,
-    },
-    {
-      icon: "icon12",
-      text: "交办历史",
-      link: "/pages/org/issue/list2/index?mine=true",
-    },
- 
-  ],
+      // 责任单位用户
+      [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: "icon11", text: "消息通知", link: "/pages/message/list/index" },
+        {
+          icon: "icon10",
+          text: "我的上报",
+          link: `/pages/feedback/issuelist/index?title=我的上报&bizStatus=`,
+        },
+        {
+          icon: "icon12",
+          text: "交办历史",
+          link: "/pages/org/issue/list2/index?mine=true",
+        },
+      ],
 
-  // 责任交办单位管理员
-  [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: "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" },
-    {
-      icon: "icon12",
-      text: "交办历史",
-      link: "/pages/org/issue/list2/index?mine=true",
-    },
-  ],
+      // 责任交办单位管理员
+      [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: "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" },
+        {
+          icon: "icon12",
+          text: "交办历史",
+          link: "/pages/org/issue/list2/index?mine=true",
+        },
+      ],
 
-  // 查询人员
-  [ROLE_QUERY_PERSON]: [
-    {
-      icon: "icon1",
-      text: "未 处 理",
-      link: `/pages/issue/list2/index?title=未处理&bizStatus=${PROCESS_START}`,
-    },
-    {
-      icon: "icon2",
-      text: "处 理 中",
-      link: `/pages/issue/list2/index?title=处理中&bizStatus=${PROCESS_ASSIGNED}`,
-    },
-    {
-      icon: "icon3",
-      text: "已 办 结",
-      link: `/pages/issue/list2/index?title=已办结&bizStatus=${PROCESS_END}`,
-    },
-    {
-      icon: "icon5",
-      text: "逾期警告",
-      link: `/pages/issue/list2/index?title=逾期警告&bizStatus=expired`,
-    },
-    {
-      icon: "icon7",
-      text: "统计查询",
-      link: "/subpkg1/pages/statistics/index",
-    },
-  ],
+      // 查询人员
+      [ROLE_QUERY_PERSON]: [
+        {
+          icon: "icon1",
+          text: "未 处 理",
+          link: `/pages/issue/list2/index?title=未处理&bizStatus=${PROCESS_START}`,
+        },
+        {
+          icon: "icon2",
+          text: "处 理 中",
+          link: `/pages/issue/list2/index?title=处理中&bizStatus=${PROCESS_ASSIGNED}`,
+        },
+        {
+          icon: "icon3",
+          text: "已 办 结",
+          link: `/pages/issue/list2/index?title=已办结&bizStatus=${PROCESS_END}`,
+        },
+        {
+          icon: "icon5",
+          text: "逾期警告",
+          link: `/pages/issue/list2/index?title=逾期警告&bizStatus=expired`,
+        },
+        {
+          icon: "icon7",
+          text: "统计查询",
+          link: "/subpkg1/pages/statistics/index",
+        },
+      ],
 
-  // 市民
-  [ROLE_CITIZEN]: [
-    {
-      icon: "icon1",
-      text: "未处理",
-      link: `/pages/feedback/issuelist/index?title=未处理&bizStatus=${PROCESS_START}`,
-    },
-    {
-      icon: "icon2",
-      text: "已处理",
-      link: `/pages/feedback/issuelist/index?title=已处理&bizStatus=${PROCESS_ASSIGNED}`,
-    },
-    {
-      icon: "icon12",
-      text: "已打回",
-      link: `/pages/feedback/issuelist/index?title=已打回&bizStatus=${APPLY_REJECT}`,
-    },
-  ],
-};
-export default (props) => {
-  const userModel = useModel("user");
-  const { user, duty, signOut, changePwd } = userModel || {};
+      // 市民
+      [ROLE_CITIZEN]: [
+        {
+          icon: "icon1",
+          text: "未处理",
+          link: `/pages/feedback/issuelist/index?title=未处理&bizStatus=${PROCESS_START}`,
+        },
+        {
+          icon: "icon2",
+          text: "已处理",
+          link: `/pages/feedback/issuelist/index?title=已处理&bizStatus=${PROCESS_ASSIGNED}`,
+        },
+        {
+          icon: "icon12",
+          text: "已打回",
+          link: `/pages/feedback/issuelist/index?title=已打回&bizStatus=${APPLY_REJECT}`,
+        },
+      ],
+    };
+  }, [duty]);
 
   const menuArr = React.useMemo(() => {
     if (!duty) return [];
@@ -227,7 +235,7 @@ export default (props) => {
 
       <View className="menu-icons">
         {menuArr.map((x) => (
-          <MenuIcon key={x.text} {...x} />
+          <MenuIcon user={user} key={x.text} {...x} />
         ))}
       </View>
     </Page>

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

@@ -81,7 +81,7 @@ export default (props) => {
           readonly={readOnly}
           autosize={{ minHeight: '120px' }}
           value={orgIssue.result}
-          onChange={e => setFormData('result', e.detail)}
+          onChange={e =>{console.log(e); setFormData('result', e.detail.value||e.target.value||e.detail)}}
         />
       </CellGroup>
       <CellGroup style={{marginTop: '20px'}}>        

src/pages/org/issue/detail2/components/Order.jsx

@@ -1,9 +1,13 @@
 import { getTaOrgIssueId } from "@/services/taorgissue";
-import { Cell, CellGroup, Steps } from "@antmjs/vantui";
+import { Cell, CellGroup, Steps, Tag } from "@antmjs/vantui";
 import { View } from "@tarojs/components";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import dayjs from "dayjs";
 import styles from "../index.module.less";
+import { APPLY_READY, getIssueStatus } from "@/utils/biz";
+import Icon from "@/components/Icon";
+import { color } from "echarts";
+import { colors } from "@/components/IssueCard";
 
 export default (props) => {
   const { id } = props;
@@ -21,22 +25,58 @@ export default (props) => {
     }
   }, [id]);
 
-  return (
-    <CellGroup style={{ marginTop: "20px" }}>
-      <Cell title="交办历史" />
+  function SorySteps(params) {
+    const { steps } = params;
+
+    const sortedSteps = steps.sort((a, b) => {
+      if (a.createDate < b.createDate) return -1;
+      if (a.createDate > b.createDate) return 1;
+      return 0;
+    });
+    return sortedSteps.map((it, index, array) => {
+      const { value: bizStatus = 0, label: statusText } = getIssueStatus({
+        ...(it || {}),
+        expireDate: it?.createDate,
+        processNode: it?.processNode || it?.applyType,
+        processStatus: it?.processStatus || it?.verifyStatus || APPLY_READY,
+      });
+      const [bg1, bg2] = colors[bizStatus];
 
-      <View className={styles["page_order"]}>
-        {(steps || []).map((x) => {
-          return (
-            <View key={x.orgIssueId} className={styles["org_order"]}>
-              <View>单位：{x.orgName}</View>
+      let nextOrgName = null;
+      if (index == 0) {
+        nextOrgName = "平台管理员";
+      } else if (index <= array.length - 1) {
+        nextOrgName = array[index - 1].orgName;
+      }
+      return (
+        <View key={it.orgIssueId} className={styles["page_order"]}>
+          <Cell
+            value={dayjs(it.createDate).format("YYYY-MM-DD HH:mm:ss")}
+            renderTitle={
               <View>
-                时间：{dayjs(x.createDate).format("YYYY-MM-DD HH:mm:ss")}
+                
+
+                <View className="title">
+                  {nextOrgName} {"---->"} {it.orgName}
+                  <Tag plain={true} style={{ color: bg2 }}>{statusText}</Tag>
+                </View>
               </View>
-            </View>
-          );
-        })}
-      </View>
+            }
+          />
+          {/* <View className={styles["org_order"]}>
+            <div>
+              {nextOrgName} ----{it.orgName}
+            </div>
+            <div>{dayjs(it.createDate).format("YYYY-MM-DD HH:mm:ss")}</div>
+          </View> */}
+        </View>
+      );
+    });
+  }
+  return (
+    <CellGroup style={{ marginTop: "20px" }}>
+      <Cell title="交办历史" />
+      <SorySteps steps={steps} />
     </CellGroup>
   );
 };

src/pages/org/issue/detail2/index.module.less

@@ -1,13 +1,14 @@
 .page_order {
-    max-height: 200px;
+    max-height: 300px;
     width: 100%;
     background-color: #FFFFFF;
     overflow-y: scroll;
-    padding: 0 2.963vh;
+    padding: 0 0;
     .org_order {
         display: flex;
         justify-content: space-between;
         width: 100%;
         margin-top: 10px;
+        padding: 5px 0.725rem;
     }
 }

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

@@ -4,7 +4,7 @@ import { Tab, Tabs, Search } from "@antmjs/vantui";
 import Page from "@/layouts/index";
 import PowerList from "@/components/PowerList";
 import Card from "@/components/IssueCard";
-import { getTaOrgIssue, getTaOrgIssues } from "@/services/taorgissue";
+import {  getTaOrgIssues } from "@/services/taorgissue";
 import { ROLE_MANAGER } from "@/utils/user";
 import { useModel } from "@/store";
 import { getIssueStatus } from "@/utils/biz";

src/store/user.js

@@ -31,23 +31,35 @@ export default function useUser() {
   };
 
   const updateDuty = (d = ROLE_CITIZEN) => {
-    setDuty(d);
-    Taro.setStorageSync("duty", d);
+    try {
+      setDuty(d);
+      Taro.setStorageSync("duty", d);
+    } catch (e) {
+      console.log(e);
+    }
   };
 
   const initDuty = (u) => {
     console.log(u);
-    const d = Taro.getStorageSync("duty");
-    console.log(d);
+    let d;
+    try {
+      d = Taro.getStorageSync("duty");
+    } catch (error) {
+      console.error("读取存储中'duty'失败:", error);
+      // 根据业务需求考虑是否需要进行错误处理或通知用户
+    }
     const dutyList = u?.dutyList || [];
+    const firstDuty = dutyList[0];
+
     if (d) {
       if (dutyList.indexOf(d) < 0) {
-        updateDuty(dutyList[0]);
+        console.log(firstDuty);
+        updateDuty(firstDuty);
       } else {
         updateDuty(d);
       }
     } else {
-      updateDuty(dutyList[0]);
+      updateDuty(firstDuty);
     }
   };
 
@@ -65,14 +77,16 @@ export default function useUser() {
 
   const maSignup = (data) => {
     return new Promise((resolve, reject) => {
-      signup(data).then(res => {
-        setPerson(res.person);
-        setUser(res.user);
-        initDuty(res.user);
-        resolve(res);
-      }).catch(reject);
+      signup(data)
+        .then((res) => {
+          setPerson(res.person);
+          setUser(res.user);
+          initDuty(res.user);
+          resolve(res);
+        })
+        .catch(reject);
     });
-  }
+  };
 
   const current = () => {
     return new Promise((resolve, reject) => {
@@ -109,7 +123,7 @@ export default function useUser() {
   };
 
   const signOut = () => {
-    console.log(111111)
+    console.log(111111);
     setPerson(null);
     setUser(null);
     initDuty(null);
@@ -127,8 +141,7 @@ export default function useUser() {
 
     changePassword(data)
       .then((res) => {
-        signOut()
-
+        signOut();
       })
       .catch((e) => {
         console.error(e);