|
@@ -104,6 +104,9 @@ const ContractModal = (props) => {
|
|
|
const project_name = Form.useWatch('project_name', form);
|
|
|
const archives_dep = Form.useWatch('archives_dep', form);
|
|
|
|
|
|
+ //处理分子公司创建合同直接已归档 作废合同直接作废
|
|
|
+ const [isFlag, setIsFlag] = useState();
|
|
|
+
|
|
|
// 当为审核拒绝状态时,点击编辑按钮可以时为强制修改状态
|
|
|
const [forceModify, setForceModify] = useState(false);
|
|
|
|
|
@@ -217,7 +220,7 @@ const ContractModal = (props) => {
|
|
|
});
|
|
|
|
|
|
//供应商列表
|
|
|
- const { data: supplierList = [], loading } = useRequest(querySupplierList, {
|
|
|
+ const { data: supplierList = [] } = useRequest(querySupplierList, {
|
|
|
defaultParams: [
|
|
|
{
|
|
|
project_id: 1,
|
|
@@ -288,8 +291,10 @@ const ContractModal = (props) => {
|
|
|
useEffect(() => {
|
|
|
//兼容之前选择的所属部门,用的现在的接口匹配不到部门显示数字的问题
|
|
|
if (data?.company_id) {
|
|
|
- const deps = getDepItemById(data?.company_id)?.children;
|
|
|
- deps ? setCompanyDepList(deps) : setCompanyDepList([]);
|
|
|
+ const deps = getDepItemById(data?.company_id);
|
|
|
+ deps?.children ? setCompanyDepList(deps.children) : setCompanyDepList([]);
|
|
|
+ //只有本部展示归档审批流和作废审批流
|
|
|
+ if (deps?.Flag == 1) setIsFlag(true);
|
|
|
}
|
|
|
}, [data, depList]);
|
|
|
|
|
@@ -379,9 +384,13 @@ const ContractModal = (props) => {
|
|
|
data?.status !== Status.CheckReject
|
|
|
)
|
|
|
return;
|
|
|
+ const item = companyData?.find((item) => item.ID == company);
|
|
|
+ //子公司不获取审批流
|
|
|
+ if (item?.Flag !== 1) return;
|
|
|
+
|
|
|
const param = { ...advance };
|
|
|
let formValues = [];
|
|
|
- const item = companyData?.find((item) => item.ID == company);
|
|
|
+
|
|
|
formValues.push({
|
|
|
...formData[0],
|
|
|
value: item?.Flag == 1 ? ['是'] : ['否'],
|
|
@@ -484,7 +493,6 @@ const ContractModal = (props) => {
|
|
|
if (values.attach_extend)
|
|
|
values.attach_extend = JSON.stringify(values.attach_extend);
|
|
|
values.party_c = values.party_c?.join(',');
|
|
|
-
|
|
|
const companyItem = companyData?.find(
|
|
|
(item) => item.ID == values.company_id,
|
|
|
);
|
|
@@ -494,7 +502,7 @@ const ContractModal = (props) => {
|
|
|
values.dep_name = depItem?.Name;
|
|
|
values.dep_code = depItem?.Code;
|
|
|
values.created_by = user?.ID;
|
|
|
- handleOk(values, Type.add, form, audit_list);
|
|
|
+ handleOk(values, Type.add, form, audit_list, companyItem.Flag !== 1); //分子公司不创建审批流,直接已归档
|
|
|
} else if (type == Type.cancel) {
|
|
|
const form = getAuditData(values, '2');
|
|
|
const audit_list = auditData?.OaAuditList?.map((item) => item?.auditor);
|
|
@@ -1087,7 +1095,7 @@ const ContractModal = (props) => {
|
|
|
</Col>
|
|
|
</Row>
|
|
|
|
|
|
- {data?.status >= Status.Checking && !forceModify && (
|
|
|
+ {isFlag && data?.status >= Status.Checking && !forceModify && (
|
|
|
<>
|
|
|
<ModuleTitle title="归档流程" />
|
|
|
<div className={styles.modelItem}>
|
|
@@ -1133,7 +1141,7 @@ const ContractModal = (props) => {
|
|
|
</span>
|
|
|
</Form.Item>
|
|
|
)}
|
|
|
- {data?.status >= Status.CalChecking && (
|
|
|
+ {isFlag && data?.status >= Status.CalChecking && (
|
|
|
<>
|
|
|
<ModuleTitle title="作废流程" />
|
|
|
<div className={styles.modelItem}>
|