xjj 2 жил өмнө
parent
commit
d46196077a

+ 5 - 5
.umirc.ts

@@ -126,11 +126,11 @@ export default defineConfig({
       component: './Profile/index',
       hideInMenu: true
     },
-    {
-      name: '供应商管理',
-      path: '/manufacturer',
-      component: './ManufacturerMng/Firm',
-    },
+    // {
+    //   name: '供应商管理',
+    //   path: '/manufacturer',
+    //   component: './ManufacturerMng/Firm',
+    // },
   ],
   npmClient: 'yarn',
 });

+ 2 - 1
src/pages/Flow/OaAuditDetail.js

@@ -6,7 +6,7 @@ import { useModel } from 'umi';
 import AuditModal from './components/AuditModal';
 import FormAndFilesNode from './components/FormAndFilesNode';
 import { PageContainer, ProCard } from '@ant-design/pro-components';
-import { queryAuditDetail } from '@/services/boom';
+import { queryAuditDetail, audit } from '@/services/boom';
 
 function OaAuditDetail(props) {
   const [auditVisible, setAuditVisible] = useState(false);
@@ -74,6 +74,7 @@ function OaAuditDetail(props) {
       </ProCard>
 
       <AuditModal
+        id={id}
         visible={auditVisible}
         onClose={() => setAuditVisible(false)}
         onOk={refresh}

+ 23 - 17
src/pages/Flow/components/AuditModal.js

@@ -1,21 +1,25 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useState } from 'react';
 import { Form } from 'antd';
 import { Modal, Input } from 'antd';
+import { audit } from '@/services/boom';
 
 // 审批意见
 function AuditModal(props) {
-  const { visible, onClose, onOk, loading } = props;
+  const { visible, onClose, onOk, id } = props;
+  const [loading, setLoading] = useState(false);
   const [form] = Form.useForm();
 
-  const handleOk = () => {
-    form.validateFields((err, fieldsValue) => {
-      if (err) return;
-      onOk({
+  const handleOk = async () => {
+    const fieldsValue = await form.validateFields();
+    setLoading(true);
+    try {
+      await audit({
+        id,
+        status: visible,
         ...fieldsValue,
-        // 3 通过审批   2 拒绝审批
-        audit_status: visible == 1 ? 3 : 2,
       });
-    });
+    } catch (error) {}
+    setLoading(false);
   };
 
   return (
@@ -27,14 +31,16 @@ function AuditModal(props) {
       onCancel={onClose}
       onOk={handleOk}
     >
-      <Form.Item
-        labelCol={{ span: 5 }}
-        wrapperCol={{ span: 15 }}
-        name="audit_comment"
-        label="审批意见"
-      >
-        <Input.TextArea />
-      </Form.Item>
+      <Form form={form}>
+        <Form.Item
+          labelCol={{ span: 5 }}
+          wrapperCol={{ span: 15 }}
+          name="desc"
+          label="审批意见"
+        >
+          <Input.TextArea />
+        </Form.Item>
+      </Form>
     </Modal>
   );
 }

+ 12 - 3
src/services/boom.js

@@ -18,6 +18,13 @@ export async function addAudit(data) {
   });
 }
 
+export async function audit(data) {
+  return request(`/api/v1/oa/audit/status`, {
+    method: 'GET',
+    params: data,
+  });
+}
+
 export async function queryAuditDetail(params) {
   return request(`/api/v1/oa/audit/detail`, {
     method: 'GET',
@@ -201,14 +208,16 @@ export async function advanceSubmitNextNode(params) {
 export async function queryProfileList() {
   let profileList = await request(`/api/v1/oa/audit/list`, { method: 'GET' });
   let auditList = await request(`/api/v1/purchase/flow/info?flow_type=1`);
-  profileList?.data?.list.map(item => {
-    var audit = auditList?.data?.find(child => item.flow_id === child?.list.id)
+  profileList?.data?.list.map((item) => {
+    var audit = auditList?.data?.find(
+      (child) => item.flow_id === child?.list.id,
+    );
     if (audit) {
       item.table_name = item.AuthorInfo?.CName + audit.list.name;
       item.table_desc = audit.list.desc;
       item.status = '待审批';
     }
-  })
+  });
   console.log(profileList);
   return profileList;
 }