Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop

src/pages/ContractManager/component/Modal.jsx

@@ -26,6 +26,7 @@ import {
   queryOAReCall,
   querySupplierList,
 } from '@/services/contract';
+import { queryDepsV2 } from '@/services/approval';
 import { useModel, useRequest } from '@umijs/max';
 import { CloudUploadOutlined } from '@ant-design/icons';
 import styles from '../index.less';
@@ -211,6 +212,12 @@ const ContractModal = (props) => {
 
   const { data: companyData, run: runCompany } = useRequest(queryCompany);
 
+  // 新建合同时，选择本部时，需要用另一个接口请求部门数据
+  const { data: companyDeps, run: runCompanyDeps } = useRequest(queryDepsV2, {
+    manual: true,
+    formatResult: (response) => response.data,
+  });
+
   //填写表单时计算审批流接口
   const { run: runAuditList } = useRequest(
     (data) => advanceSubmitNextNode(data),
@@ -308,6 +315,7 @@ const ContractModal = (props) => {
       userListRun();
       depListRun();
       runCompany();
+      runCompanyDeps();
     }
   }, [visible]);
 
@@ -367,6 +375,8 @@ const ContractModal = (props) => {
       setDealDisable(false);
       setArchivesDepList(archivesOptions);
       form.setFieldsValue({ deal_by: user?.CName });
+      // 公司为本部时，使用另一个接口获取部门数据
+      companyDeps ? setCompanyDepList(companyDeps) : setCompanyDepList([]);
     } else {
       //公司为分子公司 经办人为手动输入 合同存档部门从所选分子公司的子部门选择
       setDealDisable(true);

src/pages/ContractManager/index.jsx

@@ -568,7 +568,7 @@ const ConteactManager = (props) => {
           console.log(expanded, record);
           if (expanded) handleQueryChildren({ is_parent: record.id });
         }}
-        pagination={{ ...pagination, onChange: onPageChange }}
+        pagination={{ ...pagination, showSizeChanger: false, onChange: onPageChange }}
       />
       <ContractModal
         detail={detail}

src/pages/Profile/approve.js

@@ -93,7 +93,13 @@ function Approve(props) {
     run: conAuditRun,
     loading: conAduitLoading,
   } = useRequest(
-    (data) => queryGetContractList({ ...data, is_parent: -1, page_size: 999 }),
+    (data) =>
+      queryGetContractList({
+        ...data,
+        is_parent: -1,
+        multi_status: '1,4',
+        page_size: 999,
+      }),
     {
       // manual: true,
       formatResult: contractResult,

src/services/approval.js

@@ -1,4 +1,4 @@
-import {request }from 'umi';
+import { request } from 'umi';
 import { stringify } from 'qs';
 
 //获取部门结构
@@ -6,6 +6,10 @@ export async function queryDepV2(params) {
   return request(`/api/v2/dep?${stringify(params)}`);
 }
 
+// 选择公司为本部时获取部门使用这个接口
+export async function queryDepsV2(params) {
+  return request(`/api/v2/main/deps`);
+}
 // export async function queryType() {
 //   return request(`/api/v2/approval/type/dic`);
 // }
@@ -67,7 +71,6 @@ export async function queryDepV2(params) {
 //   });
 // }
 
-
 // //添加项目成员
 // export async function addMember(data) {
 //   return request(`/api/v2/project_code/user`, {