审批

.umirc.ts

@@ -14,7 +14,7 @@ export default defineConfig({
   proxy: {
     '/api': {
       // target: 'http://47.96.12.136:8788/',
-      target: 'http://47.96.12.136:8888/',
+      target: 'http://47.96.12.136:8896/',
       // target: 'http://120.55.44.4:8900/',
       changeOrigin: true,
     },

src/pages/Flow/OaDetail.js

@@ -3,10 +3,12 @@ import { PageContainer, ProCard } from '@ant-design/pro-components';
 import { Button, Col, Empty, Row, message } from 'antd';
 import ApprovalProcess from './components/ApprovalProcess';
 import AuditDetailed from './components/AuditDetailed';
+import AliyunOSSUpload from '@/components/OssUpload/AliyunOssUploader';
 import {
   queryProcessFlows,
   createAduit,
   advanceSubmitNextNode,
+  queryOSSData,
 } from '@/services/boom';
 import { useParams, useRequest, useNavigate } from 'umi';
 
@@ -16,10 +18,15 @@ const OaDetail = () => {
   const formValueRef = useRef({
     form: '',
   });
+  const uploadList = useRef([]);
   const navigate = useNavigate();
   const { data, loading } = useRequest(queryProcessFlows, {
     defaultParams: [{ ids: oaId }],
   });
+  const { data: OSSData } = useRequest(queryOSSData, {
+    defaultParams: [{ ids: oaId }],
+  });
+  console.log(OSSData);
   const { loading: createLoadin, run: createRun } = useRequest(createAduit, {
     manual: true,
     onSuccess() {
@@ -81,9 +88,17 @@ const OaDetail = () => {
       flow_id: Number(oaId),
       form: JSON.stringify(form),
       audit_list,
-      files: '',
+      files: uploadList.current.join(','),
     });
   };
+  const OnModelFileDone = (file) => {
+    var path = OSSData.host + '/' + file.url;
+    uploadList.current = [...uploadList.current, path];
+    // const files = form.getFieldsValue('files');
+    // form.setFieldValue('files', files.concat(path));
+    // console.log(uploadList.current);
+    // setThumbnail(path);
+  };
 
   return (
     <PageContainer
@@ -97,6 +112,15 @@ const OaDetail = () => {
       <ProCard style={{ minHeight: '80vh' }}>
         <Row gutter={24}>
           <Col span={12}>
+            {OSSData && (
+              <AliyunOSSUpload
+                OSSData={OSSData}
+                onDone={OnModelFileDone}
+                directory={false}
+                noStyle={false}
+                label="上传文件"
+              />
+            )}
             <AuditDetailed
               items={data?.formData}
               onValuesChange={advanceSubmit}

src/pages/Flow/components/AuditDetailed.js

@@ -92,11 +92,6 @@ const AuditDetailed = (props) => {
       onFinish={onFinish}
     >
       {items.map((item) => GetComponent(item))}
-      <Form.Item>
-        <Button htmlType="submit" type="primary">
-          提交
-        </Button>
-      </Form.Item>
     </Form>
   );
 };

src/pages/Profile/index.js

@@ -88,7 +88,7 @@ function profile(props) {
         <Fragment>
           <>
             <a style={{ color: "#4096ff" }} onClick={() => {
-              navigate(`/oa/detail/${record.flow_id}/${record.id}`)
+              navigate(`/oa/audit/${record.flow_id}/${record.id}`)
             }}>审批</a>
           </>
         </Fragment>