F

src/app.config.js

@@ -7,7 +7,9 @@ export default defineAppConfig({
     "pages/issue/list2/index",
     "pages/issue/edit/index",
     "pages/org/issue/list/index",
+    "pages/org/issue/list2/index",
     "pages/org/issue/detail/index",
+    "pages/org/issue/detail2/index",
     "pages/apply/list/index",
     // 'pages/apply/apply/index',
     "pages/apply/verify/index",

src/pages/home/index.jsx

@@ -42,6 +42,7 @@ const menus = {
     },
     { icon: "icon11", text: "消息通知", link: "/pages/message/list/index" },
     { icon: "icon10", text: "模拟测评", link: "/pages/check/list/index" },
+  
   ],
 
   // 平台管理员
@@ -120,6 +121,12 @@ const menus = {
       text: "我的上报",
       link: `/pages/feedback/issuelist/index?title=我的上报&bizStatus=`,
     },
+    {
+      icon: "icon12",
+      text: "123456",
+      link: "/pages/org/issue/list2/index?mine=true",
+    },
+ 
   ],
 
   // 责任交办单位管理员
@@ -147,6 +154,11 @@ const menus = {
     },
     { icon: "icon11", text: "消息通知", link: "/pages/message/list/index" },
     { icon: "person", text: "人员管理", link: "/pages/user/list/index" },
+    {
+      icon: "icon12",
+      text: "123456",
+      link: "/pages/org/issue/list2/index?mine=true",
+    },
   ],
 
   // 查询人员

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

@@ -133,11 +133,12 @@ export default (props) => {
   };
 
   React.useEffect(() => {
+    console.log("issue******************",issue)
     if (issue) {
       fmRef.current = issue;
       setFormData(issue);
       // console.log('---------issue-------->', issue)
-      getTaOrgIssueByIssueId(issue.issueId, issue.orgId).then((r) => {
+      getTaOrgIssueByIssueId(issue.issueId, issue.orgId,issue.status).then((r) => {
         setOrgIssue(r);
       });
     }
@@ -148,7 +149,6 @@ export default (props) => {
     setFieldChange("content", value);
   };
   
-      console.log('---------issue---issue----->')
 
   return (
     <View>

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

@@ -0,0 +1,141 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Cell, CellGroup, Field, Button, Popup } from '@antmjs/vantui';
+import DatePicker from '@/components/DatePicker';
+import { getDateStr } from '@/utils/date';
+import { postTaIssueApply } from '@/services/taissueapply';
+import { putTaOrgIssue } from '@/services/taorgissue';
+import { warn } from '@/utils/message';
+import {
+  PROCESS_APPLY_DELAY,
+  PROCESS_APPLY_END,
+  PROCESS_APPLY_REJECT,
+  PROCESS_APPLY_VERIFY
+} from '@/utils/biz';
+
+const today = new Date();
+export default (props) => {
+
+  const { orgIssue, applyType, ...leftProps } = props;
+
+  const [show, setShow] = React.useState(false);
+  const [submitting, setSubmitting] = React.useState(false);
+  const [showDatePicker, setShowDatePicker] = React.useState(false);
+
+  // 申请表记录
+  const [formData, setFormData] = React.useState({});
+
+  const setFieldValue = (key, value) => {
+    setFormData({
+      ...formData,
+      [key]: value,
+    })
+  }
+
+  const onDateClick = () => {
+    setShow(false);
+    setShowDatePicker(true);
+  }
+  
+  const onDateChange = (dt) => {
+    const date = getDateStr(dt);
+    setFieldValue('content', date);
+    setShowDatePicker(false);
+    setShow(true);
+  }
+
+  const onClick = () => {
+    if (applyType == PROCESS_APPLY_VERIFY || applyType == PROCESS_APPLY_END) {
+      onSubmit();
+    } else {
+      setShow(true);
+    }
+  }
+
+  const onSubmit = () => {
+    try {
+      warn(!orgIssue || !orgIssue.issueId, '未找到问题单');
+
+      if (applyType == PROCESS_APPLY_VERIFY || applyType == PROCESS_APPLY_END) {
+        warn(!orgIssue.attachList || !orgIssue.attachList.length, '请上传照片');
+        warn(!orgIssue.result, '请填写整改结果');
+      }
+
+      warn(applyType == PROCESS_APPLY_DELAY && !formData.content, '请设置延期时间');
+      warn(applyType == PROCESS_APPLY_REJECT && !formData.remark, '请填写驳回理由');
+    } catch (e) {
+      return ;
+    }
+
+    const data = {
+      applyType,
+      issueId: orgIssue.issueId,
+      ...formData
+    }
+
+    if (applyType == PROCESS_APPLY_VERIFY || applyType == PROCESS_APPLY_END) {
+      // 先保存数据
+      setSubmitting(true);
+      putTaOrgIssue(orgIssue.orgIssueId, orgIssue).then(() => {
+        // 再调用申请接口
+        postTaIssueApply(data).then(() => {
+          Taro.navigateBack({delta: 1});
+          setSubmitting(false);
+        }).catch(() => {
+          setSubmitting(false);
+        })
+      }).catch(() => {
+        setSubmitting(false);
+      })
+    } else {
+      // 直接调用申请接口
+      postTaIssueApply(data).then(() => {
+        Taro.navigateBack({delta: 1});
+        setSubmitting(false);
+      }).catch(() => {
+        setSubmitting(false);
+      })
+    }
+  }
+
+  
+  return (
+    <>
+      <DatePicker
+        type="date"
+        minDate={today}
+        show={showDatePicker}
+        value={formData.content}
+        onCancel={() => setShowDatePicker(false)}
+        onChange={onDateChange}
+      />
+      <Popup position="bottom" show={show} onClose={() => setShow(false)}>
+        <CellGroup>
+          {
+            applyType == PROCESS_APPLY_DELAY && (
+              <Cell
+                isLink
+                title="延期时间"
+                value={formData.content}
+                onClick={onDateClick}
+              />
+            )
+          }
+          <Cell title="理由说明" />
+          <Field
+            type="textarea"
+            autosize={{ minHeight: '120px' }}
+            value={formData.remark}
+            onChange={e => setFieldValue('remark', e.detail)}
+          />
+          <View style={{display: 'flex'}}>
+            <Button block plain type="default" onClick={() => setShow(false)}>取消</Button>
+            <Button block plain type="primary" loading={submitting} onClick={onSubmit}>确定</Button>
+          </View>
+        </CellGroup>
+      </Popup>
+      <Button {...leftProps} onClick={onClick}>{props.children}</Button>
+    </>
+  )
+}

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

@@ -0,0 +1,80 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button, Dialog } from '@antmjs/vantui';
+import OrgPicker from "@/components/OrgPicker";
+import { postIssueAssignedAgain, putTaIssue, copyTaIssue } from '@/services/taissue';
+import { warn } from '@/utils/message';
+
+export default (props) => {
+
+  const { issue } = props;
+  const formDataRef = React.useRef();
+
+  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 [showOrgPicker, setShowOrgPicker] = React.useState(false);
+
+  // 交办
+  const onAssigned = () => {
+    try {
+      // warn(!formData.addr, '请填写地址')
+      // warn(!formData.locId, '请选择点位')
+      // warn(!formData.content, '请填写问题描述')
+      // warn(!formData.typeId, '请选择问题分类')
+      // warn(!formData.attachList || formData.attachList.length < 1, '请上传照片')
+      warn(!formDataRef.current?.orgId, '请选择交办单位')
+      // warn(!formData.expireDate, '请选择办结时间')
+    } catch (e) {
+      return;
+    }
+
+    setLoading1(true)
+
+    const data = { ...issue, ...(formDataRef.current || {}) };
+    // 先提交修改
+    putTaIssue(issue.issueId, data).then(() => {
+      // 再提交交办
+      postIssueAssignedAgain({ ...data, nextOrg: data.orgId }).then(() => {
+        setLoading1(false);
+        Taro.navigateBack({ delta: 1 });
+      }).catch(() => {
+        setLoading1(false);
+      })
+    }).catch(() => {
+      setLoading1(false);
+    })
+  }
+
+  
+  const onOrgChange = (_, it) => {
+    const data = {
+      ...(formDataRef.current || {}),
+      orgId: it.orgId,
+      orgName: it.name,
+    };
+    formDataRef.current = data;
+    setShowOrgPicker(false);
+    onAssigned();
+  };
+
+  return (
+    <View style={{ marginTop: '20px', display: 'flex' }}>
+      <Dialog id={dialogId} />
+      <OrgPicker
+        parentId={issue.orgId}
+        show={showOrgPicker}
+        value={formDataRef.current?.orgName}
+        onCancel={() => setShowOrgPicker(false)}
+        onChange={onOrgChange}
+      />
+      <Button
+        block
+        type="primary"
+        loading={loading1}
+        onClick={() => setShowOrgPicker(true)}
+      >交办</Button>
+    </View>
+  )
+}

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

@@ -0,0 +1,41 @@
+import React from 'react';
+import { Field, Cell } from '@antmjs/vantui';
+import { getIssueStatus } from '@/utils/biz';
+import { getIssueProcess } from '@/services/taissue';
+
+export default (props) => {
+
+  const { issue } = props;
+  const [bizStatus, setBizStatus] = React.useState();
+  const [issueProcess, setIssueProcess] = React.useState();
+
+  React.useEffect(() => {
+    if (issue) {
+      setBizStatus(getIssueStatus(issue));
+
+      // 取最新的流程日志记录
+      getIssueProcess({ pageSize: 1, issueId: issue.issueId }).then(res => {
+        setIssueProcess((res.records || [])[0]);
+      })
+    }
+  }, [issue]);
+
+  return (
+    <>
+      <Cell title="状态" value={bizStatus?.label}></Cell>
+      {
+        issueProcess?.processResult && (
+          <>
+            <Cell title="审核意见" />
+            <Field
+              readonly
+              type="textarea"
+              autosize={{ minHeight: '120px' }}
+              value={issueProcess.processResult}
+            />
+          </>
+        )
+      }
+    </>
+  )
+}

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

@@ -0,0 +1,42 @@
+import { getTaOrgIssueId } from "@/services/taorgissue";
+import { Cell, CellGroup, Steps } from "@antmjs/vantui";
+import { View } from "@tarojs/components";
+import React, { useEffect, useState } from "react";
+import dayjs from "dayjs";
+import styles from "../index.module.less";
+
+export default (props) => {
+  const { id } = props;
+  const [steps, setSteps] = useState([]);
+
+  useEffect(() => {
+    if (id) {
+      getTaOrgIssueId(id).then((res) => {
+        console.log(res);
+        const data = res.map((x) => {
+          return { ...x, text: x.orgName };
+        });
+        setSteps(data);
+      });
+    }
+  }, [id]);
+
+  return (
+    <CellGroup style={{ marginTop: "20px" }}>
+      <Cell title="交办历史" />
+
+      <View className={styles["page_order"]}>
+        {(steps || []).map((x) => {
+          return (
+            <View key={x.orgIssueId} className={styles["org_order"]}>
+              <View>单位：{x.orgName}</View>
+              <View>
+                时间：{dayjs(x.createDate).format("YYYY-MM-DD HH:mm:ss")}
+              </View>
+            </View>
+          );
+        })}
+      </View>
+    </CellGroup>
+  );
+};

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

@@ -0,0 +1,34 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button } from '@antmjs/vantui';
+import { putTaOrgIssue } from '@/services/taorgissue';
+import { warn } from '@/utils/message';
+
+export default (props) => {
+  const { orgIssue } = props;
+  
+  const [submitting, setSubmitting] = React.useState(false);
+  
+  const onSubmit = () => {
+    try {
+      warn(!orgIssue || !orgIssue.issueId, '未找打问题单');
+      warn(!orgIssue.result, '请填写整改结果');
+      warn(!orgIssue.attachList || !orgIssue.attachList, '请上传照片或视频');
+    } catch (e) {
+      return ;
+    }
+
+    setSubmitting(true);
+    putTaOrgIssue(orgIssue.orgIssueId, orgIssue).then(() => {
+      Taro.navigateBack({delta: 1});
+      setSubmitting(false);
+    }).catch(() => {
+      setSubmitting(false);
+    })
+  }
+
+  return (
+    <Button block type="primary" loading={submitting} onClick={onSubmit}>保存修改</Button>
+  )
+}

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

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

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

@@ -0,0 +1,157 @@
+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';
+import {
+  getIssueStatus,
+  PROCESS_APPLY_END,
+  PROCESS_END,
+  PROCESS_APPLY_VERIFY,
+  PROCESS_APPLY_DELAY,
+  PROCESS_APPLY_REJECT,
+  PROCESS_ASSIGNED,
+  APPLY_READY,
+} from '@/utils/biz';
+import { ROLE_ORG_MANAGER } from '@/utils/user';
+import { useModel } from '@/store';
+import IssueStatus from './components/IssueStatus';
+import IssueInfo from '../../components/issue-info';
+import Apply from './components/Apply';
+import Assigned from './components/Assigned';
+import StepsInfo from './components/Order';
+import Order from './components/Order';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { id, act } = router.params;
+  const { duty, user } = useModel('user');
+
+  const [loading, setLoading] = React.useState(false);
+  const [issue, setIssue] = React.useState();
+  const [orgIssue, setOrgIssue] = React.useState({});
+
+  const [
+    readOnly,
+    showApplyVerify,
+    showApplyEnd,
+    showAssign,
+  ] = React.useMemo(() => {
+    if (!orgIssue.issueId) return [];
+
+    return [
+      orgIssue?.processStatus == APPLY_READY || orgIssue?.processNode == PROCESS_END,
+      orgIssue.processNode == PROCESS_ASSIGNED && duty != ROLE_ORG_MANAGER,
+      orgIssue.processNode != PROCESS_END && orgIssue.processNode != PROCESS_APPLY_END ,
+      orgIssue.processNode == PROCESS_ASSIGNED && duty == ROLE_ORG_MANAGER,
+    ]
+
+  }, [orgIssue, duty]);
+
+  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, user?.orgId ).then(res => setOrgIssue(res || {}));
+    }
+  }, [id, user]);
+  
+  return (
+    <Page loading={loading}>
+      <IssueInfo issue={issue} />
+
+    <Order id={id}/>
+
+      {/* <CellGroup style={{marginTop: '20px'}}>
+        <Cell title="整改结果" />
+        <Field
+          type="textarea"
+          readonly={readOnly}
+          autosize={{ minHeight: '120px' }}
+          value={orgIssue.result}
+          onChange={e => setFormData('result', e.detail)}
+        />
+      </CellGroup>
+      <CellGroup style={{marginTop: '20px'}}>        
+        <Cell title="拍照或视频" border={false} />
+
+        <Cell
+          renderTitle={
+            <Uploader
+              disabled={readOnly}
+              value={orgIssue.attachList}
+              onChange={e => setFormData('attachList',e)}
+            />
+          }
+        />
+      </CellGroup>
+      
+      <CellGroup style={{marginTop: '20px'}}>
+        <IssueStatus issue={issue} />
+      </CellGroup>
+
+      {
+        !readOnly && (
+          <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
+            <View>
+              {
+                showApplyEnd &&
+                  <Apply block type="primary" applyType={PROCESS_APPLY_END} orgIssue={orgIssue}>申请办结</Apply>
+              }
+            </View>
+            {
+              showApplyVerify && (
+                <View style={{marginTop: '20px'}}>
+                  <Apply block type="primary" applyType={PROCESS_APPLY_VERIFY} orgIssue={orgIssue}>申请审核</Apply>
+                </View>
+              )
+            }
+            <View style={{marginTop: '20px', display: 'flex' }}>
+              <Apply
+                block
+                plain
+                hairline
+                type="info"
+                applyType={PROCESS_APPLY_DELAY}
+                orgIssue={orgIssue}
+              >申请延期</Apply>
+              <Apply
+                block
+                plain
+                hairline
+                type="danger"
+                applyType={PROCESS_APPLY_REJECT}
+                orgIssue={orgIssue}
+                style={{marginLeft: 'var(--main-space)'}}
+              >申请驳回</Apply>
+            </View>
+            {
+              showAssign && (
+                <View style={{ marginTop: '20px' }}>
+                  <Assigned issue={issue} />
+                </View>
+              )
+            }
+          </View>
+        )
+      } */}
+    </Page>
+  )
+}

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

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

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

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

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

@@ -0,0 +1,79 @@
+import React, { 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 { getTaOrgIssue } from "@/services/taorgissue";
+import { ROLE_MANAGER } from "@/utils/user";
+import { useModel } from "@/store";
+import { getIssueStatus } from "@/utils/biz";
+
+const tabStyle = {
+  overflow: "hidden",
+  height: "calc(100vh - 45px)",
+  overflow: "hidden",
+};
+
+const sid1 = Math.random().toString(36).substring(2, 8);
+const sid2 = Math.random().toString(36).substring(2, 8);
+
+export default (props) => {
+  const router = Taro.useRouter();
+  const { title, bizStatus, color } = router.params;
+  const [issueId, setIssueId] = useState("");
+
+  React.useMemo(() => {
+    if (title) {
+      Taro.setNavigationBarTitle({ title });
+    } else {
+      Taro.setNavigationBarTitle({ title: "问题列表" });
+    }
+  }, [title]);
+
+  // const { user } = useModel('user');
+
+  const param = React.useMemo(() => {
+    return { bizStatus, sourceType: "inspector", issueId };
+  }, [bizStatus, issueId]);
+
+  const onClick = (item) => {
+    Taro.navigateTo({
+      url: `/pages/org/issue/detail2/index?id=${item.issueId}`,
+    });
+  };
+  const onSearch = (e) => {
+    const { value } = e.target;
+    console.log(value);
+    setIssueId(value);
+  };
+  // const searchAction = (e) => {
+  //   console.log("搜索");
+  //   console.log(e)
+  //   // setIssueId(e.target.value)
+  // };
+  return (
+    <Page>
+      <Search
+        // onChange={(e) => setIssueId(e.detail)}
+        placeholder="请输入问题单号"
+        onSearch={onSearch}
+        // clearable
+      />
+      <PowerList
+        sid={sid1}
+        request={getTaOrgIssue}
+        params={param}
+        renderItem={(item) => (
+          <Card
+            key={item.issueId}
+            issue={item}
+            stText={title}
+            color={color}
+            onClick={() => onClick(item)}
+          />
+        )}
+      />
+    </Page>
+  );
+};

src/services/taorgissue.js

@@ -4,6 +4,10 @@ import request from '@/utils/request';
  * 分页查询
  */
 export const getTaOrgIssue = (params) => request('/api/taOrgIssue', { params });
+/*
+ * 分页查询
+ */
+export const getTaOrgIssueWx = (params) => request('/api/wx/taOrgIssue', { params });
 
 /*
  * 新增数据
@@ -14,6 +18,12 @@ export const postTaOrgIssue = (data) => request('/api/taOrgIssue', { data, metho
  * 通过ID查询单条数据
  */
 export const getTaOrgIssueById = (id) => request(`/api/taOrgIssue/${id}`);
+
+
+/*
+ * 通过IssueId查询单条数据
+ */
+export const getTaOrgIssueId = (id) => request(`/api/taOrgIssueId/${id}`);
 /*
  * 通过ISSUE_ID查询单条数据
  */

src/utils/biz.js

@@ -18,6 +18,10 @@ export const PROCESS_APPLY_VERIFY = "0203";
 // 办结申请
 export const PROCESS_APPLY_END = "0204";
 
+// 过程信息
+export const PROCESS_APPLY_INFO = "-2";
+
+
 /**
  * 审核结果
  */