Browse Source

对于流程表单的筛选

dev
巴林闲侠 2 years ago
parent
commit
02762b7d2d
  1. 2
      api/.vscode/launch.json
  2. 2
      api/app/lib/controllers/workOrder/index.js
  3. 2
      web/client/src/components/workflow/index.jsx
  4. 2
      web/client/src/sections/workOrder/containers/jobOrder.jsx

2
api/.vscode/launch.json

@ -61,7 +61,7 @@
// "--clickHouseIot iot", // "--clickHouseIot iot",
// //
"--clickHouseAnxincloud Anxinyun101", "--clickHouseAnxincloud Anxinyun101",
"--clickHousePepEmis pepca8", "--clickHousePepEmis pepca9",
"--clickHouseProjectManage peppm8", "--clickHouseProjectManage peppm8",
"--clickHouseVcmp video_access_dev", "--clickHouseVcmp video_access_dev",
"--clickHouseDataAlarm default", "--clickHouseDataAlarm default",

2
api/app/lib/controllers/workOrder/index.js

@ -17,7 +17,7 @@ async function getEnabledWorkflowProcess (ctx) {
workflow_process workflow_process
RIGHT JOIN workflow_group RIGHT JOIN workflow_group
ON workflow_process.group_id = workflow_group.id ON workflow_process.group_id = workflow_group.id
AND workflow_group.name = '竞聘考核' AND workflow_group.name = '运维中台表单'
WHERE WHERE
workflow_process.deleted = 0 workflow_process.deleted = 0
AND workflow_process.is_enable = 1 AND workflow_process.is_enable = 1

2
web/client/src/components/workflow/index.jsx

@ -91,7 +91,7 @@ const WorkFlowModal = (props) => {
Notification.success(<span>保存草稿成功可在<a onClick={() => handelApprovalCenter("save")}>审批中心/保存待发</a>查看详情</span>, 10); Notification.success(<span>保存草稿成功可在<a onClick={() => handelApprovalCenter("save")}>审批中心/保存待发</a>查看详情</span>, 10);
} }
} else { } else {
Notification.success({ title: '提交成功,可在【审批中心/由我发起】查看详情' }); Notification.success({ title: '提交成功,可在【工单列表/我发起的】查看详情' });
successCallBack(); successCallBack();
} }
// //

2
web/client/src/sections/workOrder/containers/jobOrder.jsx

@ -44,7 +44,7 @@ const JobOrder = (props) => {
name: decodeURIComponent(p.name), name: decodeURIComponent(p.name),
resource: p.id resource: p.id
}).then(res => { }).then(res => {
setFormStateRequestingIndex(false) setFormStateRequestingIndex(false)
if (res) { if (res) {
// if (res.deleted) { // if (res.deleted) {
// Notification.error({ title: '退' }) // Notification.error({ title: '退' })

Loading…
Cancel
Save