From 0444a1553300387343ecef2a3db69865baddf883 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Thu, 15 Jun 2023 10:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=B5=81=E7=A8=8B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/workflow/approval.jsx      | 12 +++----
 web/client/src/components/workflow/index.jsx  | 34 +++++++++++--------
 .../workOrder/containers/jobOrder.jsx         | 22 ++++++------
 3 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/web/client/src/components/workflow/approval.jsx b/web/client/src/components/workflow/approval.jsx
index e6e7eef..6040e19 100644
--- a/web/client/src/components/workflow/approval.jsx
+++ b/web/client/src/components/workflow/approval.jsx
@@ -10,12 +10,12 @@ import './index.less'
 const WorkFlowApprovalModal = (props) => {
    const { visible, onCancel, webEmis, user, processAuditList, checkProcessInstanceId, successCallBack, type } = props;
    const ifreamUrlMap = useRef({
-      approval: 'approval/info',
-      myApply: 'process/my-apply',
-      notice: 'process/my-apply',
-      hasDone: 'process/my-apply',
-      draft: 'process/{processId}/draft',
-      submit: 'process/{processId}/apply'
+      approval: 'approval/info', // 审批
+      myApply: 'process/my-apply', // 我发起的
+      notice: 'process/my-apply', // 抄送我的
+      hasDone: 'process/my-apply', // 已办的
+      draft: 'process/{processId}/draft', // 草稿
+      submit: 'process/{processId}/apply' // 重新提交
    })
    const [loading, setLoading] = useState(true);
    const [ifreamUrl, setIfreamUrl] = useState('');
diff --git a/web/client/src/components/workflow/index.jsx b/web/client/src/components/workflow/index.jsx
index c315760..859c26d 100644
--- a/web/client/src/components/workflow/index.jsx
+++ b/web/client/src/components/workflow/index.jsx
@@ -79,7 +79,6 @@ const WorkFlowModal = (props) => {
          if (event && event.data && typeof (event.data) == 'string') {
             let data = JSON.parse(event.data);
             const { type, isSaveDraft, setIntervalSave, draftId, msg } = data;
-            console.log(data, msg);
             if (msg) {
                Notification.success({ title: msg })
             }
@@ -142,20 +141,25 @@ const WorkFlowModal = (props) => {
                      <Spin
                         spinning={loading}
                      >
-                        {webEmis && processId ? <iframe
-                           id='workflowFrame'
-                           onLoad={() => {
-                              let frameWin = document.getElementById('workflowFrame');
-                              frameWin.contentWindow.postMessage(JSON.stringify(postData), '*');
-                              setLoading(false);
-                           }}
-                           allowTransparency="true"
-                           ref={iframeRef}
-                           src={`${webEmis}/process/${processId}/apply?token=${user.token}`}
-                           width={'100%'}
-                           style={{ height: '100vh' }}
-                           frameBorder="0"
-                        ></iframe> : ''}
+                        {
+                           webEmis && processId ?
+                              <iframe
+                                 id='workflowFrame'
+                                 onLoad={() => {
+                                    let frameWin = document.getElementById('workflowFrame');
+                                    frameWin.contentWindow.postMessage(JSON.stringify(postData), '*');
+                                    setLoading(false);
+                                 }}
+                                 allowTransparency="true"
+                                 ref={iframeRef}
+                                 src={`${webEmis}/process/${processId}/apply?token=${user.token}`}
+                                 width={'100%'}
+                                 style={{ height: '100vh' }}
+                                 frameBorder="0"
+                              >
+
+                              </iframe> : ''
+                        }
                      </Spin>
                   </div>
                </div>
diff --git a/web/client/src/sections/workOrder/containers/jobOrder.jsx b/web/client/src/sections/workOrder/containers/jobOrder.jsx
index cdc83e5..c4ba7a9 100644
--- a/web/client/src/sections/workOrder/containers/jobOrder.jsx
+++ b/web/client/src/sections/workOrder/containers/jobOrder.jsx
@@ -46,17 +46,17 @@ const JobOrder = (props) => {
                            }).then(res => {
                               setFormStateRequestingIndex(false)
                               if (res) {
-                                 // if (res.deleted) {
-                                 //    Notification.error({ title: '该表单流程已删除，请尝试退出账号重新登录或联系项企管理员' })
-                                 // } else if (res.isEdited) {
-                                 //    Notification.error({ title: '该表单流程已修改，请尝试退出账号重新登录或联系项企管理员' })
-                                 // } else if (!res.isEnable) {
-                                 //    Notification.error({ title: '该表单流程已停用，请尝试退出账号重新登录或联系项企管理员' })
-                                 // } else 
-                                 if (res.id) {
-                                    setLaunchProcessId(res.id)
-                                    setWorkflowModalVisible(true)
-                                 }
+                                 if (res.deleted) {
+                                    Notification.error({ title: '该表单流程已删除，请尝试退出账号重新登录或联系项企管理员' })
+                                 } else if (res.isEdited) {
+                                    Notification.error({ title: '该表单流程已修改，请尝试退出账号重新登录或联系项企管理员' })
+                                 } else if (!res.isEnable) {
+                                    Notification.error({ title: '该表单流程已停用，请尝试退出账号重新登录或联系项企管理员' })
+                                 } else
+                                    if (res.id) {
+                                       setLaunchProcessId(res.id)
+                                       setWorkflowModalVisible(true)
+                                    }
                               } else {
                                  Notification.error({ title: `获取指定流程失败` });
                               }