+
+
+
+
+
+
+
+
+ 已办工单
+ ALREADY WORKORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 共{limits}条信息
+
+ {
+ setQuery({ limit: pageSize, offset: currentPage - 1 });
+ backlogData({ ...params, limit: pageSize, offset: currentPage - 1 })
+ }}
+ />
+
+ {
+ setProcessInstanceId(record.processInstanceId)
+ setWorkflowModalVisible(true)
+
+ }}>查看详情
+ }]
return (
<>
-
-
+ { setWorkflowModalVisible(false) }}
+ successCallBack={() => { setWorkflowModalVisible(false) }}
+ />
)
}
@@ -24,7 +183,7 @@ function mapStateToProps (state) {
const { auth, global, members, webSocket } = state;
return {
// loading: members.isRequesting,
- // user: auth.user,
+ user: auth.user,
// actions: global.actions,
// members: members.data,
// socket: webSocket.socket
diff --git a/web/client/src/sections/workOrder/containers/receipt.jsx b/web/client/src/sections/workOrder/containers/receipt.jsx
index c116207..898f1b4 100644
--- a/web/client/src/sections/workOrder/containers/receipt.jsx
+++ b/web/client/src/sections/workOrder/containers/receipt.jsx
@@ -1,21 +1,186 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
import { connect } from 'react-redux';
+import { ApiTable, EmisApiTable, EmisRequest } from '$utils'
+import { Skeleton, Button, Pagination, Form, Popconfirm, Table, Toast } from '@douyinfe/semi-ui';
+import { IconSearch } from '@douyinfe/semi-icons';
+import { SkeletonScreen, WorkflowModal } from "$components";
+import moment from "moment";
-const SetControl = (props) => {
- const { dispatch, actions, user, loading, socket } = props
- useEffect(() => {
+const Rest = (props) => {
+ const { dispatch, actions, user, socket } = props
+
+ const [query, setQuery] = useState({ limit: 10, offset: 0 }); //页码信息
+ const [limits, setLimits] = useState(0)//每页实际条数
+ const [tableData, setTableData] = useState([]);
+ const [loading, setLoading] = useState(true);
+ const [workflowModalVisible, setWorkflowModalVisible] = useState(false)
+ const [processInstanceId, setProcessInstanceId] = useState(null)
+ const [params, setParams] = useState({})
+
+
+ useEffect(() => {
+ backlogData()
}, [])
+ let backlogData = (obj = { limit: 10, offset: 0 }) => {
+
+ setLoading(true)
+ EmisRequest.get(EmisApiTable.processInstancemMyDoneList,
+ { userId: user?.id, businessType: '', ...obj })
+ .then(res => {
+ setTableData(res?.data)
+ setLoading(false)
+ }, error => {
+ Toast.error({ content: '已办工单列表请求失败', duration: 1, })
+ setLoading(false)
+
+ });
+ EmisRequest.get(EmisApiTable.processInstancemMyDoneCount,
+ { userId: user?.id, businessType: '', ...obj, limit: "", offset: "" })
+ .then(res => {
+ setLimits(res.count || 0)
+ }, error => {
+ Toast.error({ content: '已办工单数量请求失败', duration: 1, })
+ });
+ }
+
+ let columns = [{
+ title: '序号',
+ dataIndex: 'index',
+ render: (text, record, index) => index + 1
+ }, {
+ title: '标题',
+ dataIndex: 'nae',
+ }, {
+ title: '关联项目',
+ dataIndex: 'nae',
+ }, {
+ title: '申请人',
+ dataIndex: 'applyerName',
+ }, {
+ title: '申请部门',
+ dataIndex: 'applyDepartmentName',
+ }, {
+ title: '审批状态',
+ dataIndex: 'apName',
+ }, {
+ title: '提交时间',
+ dataIndex: 'startTime',
+ render: (text, record, index) => text && moment(text).format('YYYY-MM-DD HH:mm:ss') || '--'
+ }, {
+ title: '期望完成时间',
+ dataIndex: 'nae',
+ }, {
+ title: '操作',
+ dataIndex: 'hadle',
+ render: (text, record, index) =>
+
+
+
+
+
+
+
+
+ 由我发起
+ LAUNCH WORKORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 共{limits}条信息
+
+ {
+ setQuery({ limit: pageSize, offset: currentPage - 1 });
+ backlogData({ ...params, limit: pageSize, offset: currentPage - 1 })
+ }}
+ />
+
+ {
+ setProcessInstanceId(record.processInstanceId)
+ setWorkflowModalVisible(true)
+
+ }}>查看详情
+ }]
return (
<>
-
-
+ { setWorkflowModalVisible(false) }}
+ successCallBack={() => { setWorkflowModalVisible(false) }}
+ />
)
}
@@ -24,11 +189,11 @@ function mapStateToProps (state) {
const { auth, global, members, webSocket } = state;
return {
// loading: members.isRequesting,
- // user: auth.user,
+ user: auth.user,
// actions: global.actions,
// members: members.data,
// socket: webSocket.socket
};
}
-export default connect(mapStateToProps)(SetControl);
+export default connect(mapStateToProps)(Rest);
diff --git a/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx b/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx
index ea72334..4f1493b 100644
--- a/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx
+++ b/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx
@@ -13,18 +13,8 @@ import moment from "moment";
const Rest = (props) => {
const { dispatch, actions, user, socket } = props
- const form = useRef();//表单
- const [setup, setSetup] = useState(false); //表格设置是否显现
- const [setupp, setSetupp] = useState([]);//实际显示的表格列表
const [query, setQuery] = useState({ limit: 10, page: 0 }); //页码信息
const [limits, setLimits] = useState(0)//每页实际条数
- const mylimits = useRef(); //每页实际条数
- const [pushModal, setPushModal] = useState(false) //信鸽弹框
- const [pushEdit, setPushEdit] = useState(false) //是否是修改
- const [change, setChange] = useState(false) //是否改变
- const [allTableData, setAllTableData] = useState([]) //获取到的所有表格信息
- const [editObj, setEditObj] = useState({});//管理员弹框修改内容
- const [projectStatus, setProjectStatus] = useState([]); //获取项目状态列表
const [tableData, setTableData] = useState([]); //获取项目状态列表
const [loading, setLoading] = useState(true); //获取项目状态列表
const [workflowModalVisible, setWorkflowModalVisible] = useState(false)
@@ -36,16 +26,15 @@ const Rest = (props) => {
backlogData()
}, [])
- let backlogData = () => {
+ let backlogData = (obj = {}) => {
+
setLoading(true)
EmisRequest.get(EmisApiTable.processInstancemMyAuditList,
- { userId: user?.id, businessType: '运维中台表单', })
+ { userId: user?.id, businessType: '', ...obj })
.then(res => {
- console.log(111, res);
setTableData(res)
setLimits(res.length || 0)
setLoading(false)
-
}, error => {
Toast.error({ content: '待办工单请求失败', duration: 1, })
setLoading(false)
@@ -101,7 +90,12 @@ const Rest = (props) => {
layout="horizontal"
style={{ position: "relative", width: "100%", flex: 1 }}
onSubmit={(values) => {
- console.log(values)
+ if (values?.applyTimes) {
+ values.applyTimes = [moment(values?.applyTimes[0]).format('YYYY-MM-DD HH:mm:ss'), moment(values?.applyTimes[1]).format('YYYY-MM-DD HH:mm:ss')]
+ }
+ backlogData(values)
+ setQuery({ limit: 10, page: 0 });
+ setLimits(0)
}}
>
{
/>
+
+
+
+
+
+
+
+
+ 已办工单
+ ALREADY WORKORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 共{limits}条信息
+
+ {
+ setQuery({ limit: pageSize, offset: currentPage - 1 });
+ backlogData({ ...params, limit: pageSize, offset: currentPage - 1 })
+ }}
+ />
+
+