修改dingUserId

config/config.js

@@ -140,8 +140,8 @@ export default {
   chainWebpack: webpackPlugin,
   proxy: {
     '/api': {
-      target: 'http://192.168.20.152:8888/',
-      // target: 'http://47.96.12.136:8896/',
+      // target: 'http://192.168.20.152:8888/',
+      target: 'http://47.96.12.136:8888/',
       // target: 'http://oraysmart.com:8889/',
       // target: 'http://oraysmart.com:8888/api',
       // changeOrigin: true,

src/pages/PurchaseAdmin/PurchaseList/Detail/CommitAuditModal.js

@@ -9,6 +9,7 @@ import AuditDetailed from './AuditDetailed';
 import AuditFlow from './AuditFlow';
 import { queryDingSchema } from '@/services/boom';
 import { Form as Form3x } from '@ant-design/compatible';
+import { getCurrentUser } from '@/utils/authority';
 
 const { TextArea } = Input;
 const { Option } = Select;
@@ -16,7 +17,7 @@ const { TabPane } = Tabs;
 
 // 提交
 function CommitAuditModal(props) {
-  const { visible, onClose, onOk, loading, version, versionList, flowDetail } = props;
+  const { visible, onClose, onOk, loading, version, versionList, flowDetail, currentUser } = props;
   const [auditId, setAuditId] = useState();
   const [data, setData] = useState([]);
   const [length, setLength] = useState(1);
@@ -211,8 +212,8 @@ function CommitAuditModal(props) {
       let approvalNode = flowDetail.nodes.find?.(item => item.Id == id);
       const formItem = {
         processCode: approvalNode.process_code,
-        originatorUserId: '16569001414345099',
-        deptId: '14169890',
+        originatorUserId: currentUser.DingUserId || getCurrentUser()?.DingUserId, //'16569001414345099',
+        deptId: '14237557', //currentUser.DingDepId || getCurrentUser()?.DingDepId,
         template_node_id: `${approvalNode.Id}`,
         formComponentValues: data[approvalNode.Id],
       };
@@ -305,16 +306,8 @@ function CommitAuditModal(props) {
       message.error('当前存在审批节点未绑定审批流程!请联系管理员。');
       return;
     }
-
-    console.log(JSON.stringify(params));
-    console.log(params);
     onOk(params);
   };
-
-  const onTabChange = key => {
-    console.log('=====================', key);
-  };
-
   const CascaderNode = index => {
     return (
       <Form.Item
@@ -360,7 +353,7 @@ function CommitAuditModal(props) {
           <Input.TextArea />
         </Form.Item>
       </Form>
-      <Tabs defaultActiveKey="1" onChange={onTabChange}>
+      <Tabs defaultActiveKey="1">
         {auditList.map((item, idx) => (
           // <TabPane tab={item.label} key={`${item.Id}_${item.label}`}>
           //   <AuditDetailed />
@@ -387,7 +380,8 @@ function CommitAuditModal(props) {
   );
 }
 
-export default connect(({ xflow, detail }) => ({
+export default connect(({ xflow, detail, user }) => ({
   flowDetail: xflow.flowDetail,
   versionList: detail.versionList,
+  currentUser: user.currentUser,
 }))(CommitAuditModal);

src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

@@ -23,6 +23,7 @@ import { GetTokenFromUrl, getToken } from '@/utils/utils';
 import { queryDetail } from '@/services/boom';
 import HistoryDrawer from './HistoryDrawer';
 import AuditFlow from './AuditFlow';
+import { getCurrentUser } from '@/utils/authority';
 const LocalData = localStorage.luckysheet;
 
 const { Option } = Select;
@@ -84,7 +85,9 @@ function Detail(props) {
     let data = {
       processCode: '',
       deptId: '14169890',
-      userId: '16569001414345099',
+      // userId: '16569001414345099',
+      // deptId: currentUser.DingDepId || getCurrentUser()?.DingDepId,
+      userId: currentUser.DingUserId || getCurrentUser()?.DingUserId,
       formComponentValues: [],
       activityId: '',
       status: version.audit_status,
@@ -97,7 +100,6 @@ function Detail(props) {
       data.activityId = tasks[tasks.length - 1]?.activity_id;
       data.formComponentValues = form_component_values?.filter(item => item.name);
     }
-    console.log('====================auditDetail ', data);
     return data;
   }, [instanceDetail, version]);
 
@@ -953,8 +955,8 @@ function Detail(props) {
         <AuditFlow
           status={auditDetail.status}
           processCode={auditDetail.processCode}
-          deptId="14169890"
-          userId="16569001414345099"
+          deptId={auditDetail.deptId}
+          userId={auditDetail.userId}
           activityId={auditDetail.activityId}
           formComponentValues={auditDetail.formComponentValues}
         />