Merge remote-tracking branch 'origin/master'

FormInsertDiy/ExportComponent/ActiveMenuComponent.js

@@ -4,12 +4,13 @@ import Apply from "@/webPublic/FormInsertDiy/AffairPage/ApplyPage"; // 申请
 import BatchAudit from "@/webPublic/FormInsertDiy/AffairPage/AuditPage/BatchAudit"; // 批量审批
 import Audit from "@/webPublic/FormInsertDiy/AffairPage/AuditPage/index.js"; // 审批
 import Detail from "@/webPublic/FormInsertDiy/AffairPage/Detail"; //详情
-import { Modal, message, notification } from 'antd';
+import { Modal, message, notification, Popconfirm } from 'antd';
 
 window.iframeParentComponent = {
   Modal,
   message,
   notification,
+  Popconfirm
 };
 
 export default function ActiveMenuComponent({

FormInsertDiy/ExportComponent/ActiveMenuComponent2.0.js

@@ -6,6 +6,14 @@ import Audit from "@/webPublic/FormInsertDiy/AffairPage/AuditPage/index.js"; //
 import Detail from "@/webPublic/FormInsertDiy/AffairPage/Detail"; //详情
 import { getToken } from "@/utils/authority";
 import config from "@/config/config";
+import { message, Modal, notification, Popconfirm } from "antd";
+
+window.iframeParentComponent = {
+  Modal,
+  message,
+  notification,
+  Popconfirm,
+};
 
 export default function ActiveMenuComponent2({
                                                routerConfig,