liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '20220510-委托推送的标段名称包含特殊字符导致weboffice文件创建失败' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220413-zjl-公共服务平台

Browse Source
This commit is contained in:
jl-zhoujl2
2022-05-20 14:46:22 +08:00
parent 3aaa1bb36c 54335a40ac
commit aded57fbce
11 changed files with 67 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/Project/ProjectManage/PackageDivided/utils.ts
View File

@ -1,3 +1,4 @@
import { trim } from '@/utils/CommonUtils';
import { message } from 'antd';
import { updateForm } from './service';
@ -22,6 +23,7 @@ export const changeDict = (dictList: any[], code: any) => {
*/
export const handleUpdate = async (fields: any) => {
fields.bidSectName = trim(fields.bidSectName);
const success = await updateForm(fields).then((res) => {
if (res.code == 200) {
message.success('编辑成功');

15
src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod1.tsx
View File

@ -7,7 +7,7 @@ import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
import { getDicData } from '@/utils/session';
import '@/assets/lq_style.less';
import { isEmpty } from '@/utils/CommonUtils';
import { isEmpty, trim } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority';
const { Option } = Select;
@ -203,6 +203,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
}
values.regionDictName = regionDictName;
values.projectName = trim(values.projectName);
!isIPassDecode && (values['isIPassDecode'] = '1');
updateUtils(values);
//tab标段页解除禁用
@ -355,12 +356,12 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
<Form.Item
label="代理机构项目编号"
name="agencyCompanyProjectNum"
// rules={[
// {
// validator: (_, value) =>
// /[\u4E00-\u9FA5]/i.test(value) ? Promise.reject('不能输入汉字') : Promise.resolve()
// }
// ]}
// rules={[
// {
// validator: (_, value) =>
// /[\u4E00-\u9FA5]/i.test(value) ? Promise.reject('不能输入汉字') : Promise.resolve()
// }
// ]}
>
<Input maxLength={49} disabled={whetherReadonly} readOnly={whetherReadonly} />
</Form.Item>

3
src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod2.tsx
View File

@ -7,7 +7,7 @@ import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
import { getDicData } from '@/utils/session';
import '@/assets/lq_style.less';
import { isEmpty } from '@/utils/CommonUtils';
import { isEmpty, trim } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority';
const { Option } = Select;
@ -194,6 +194,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
}
values.regionDictName = regionDictName;
values.projectName = trim(values.projectName);
updateUtils(values);
//tab标段页解除禁用
setTabFlag(false);

3
src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod3.tsx
View File

@ -7,7 +7,7 @@ import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
import { getDicData } from '@/utils/session';
import '@/assets/lq_style.less';
import { isEmpty } from '@/utils/CommonUtils';
import { isEmpty, trim } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority';
const { Option } = Select;
@ -202,6 +202,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
}
values.regionDictName = regionDictName;
values.projectName = trim(values.projectName);
!isIPassDecode && (values['isIPassDecode'] = '1');
updateUtils(values);
//tab标段页解除禁用

3
src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod4.tsx
View File

@ -7,7 +7,7 @@ import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
import { getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
import { getDicData } from '@/utils/session';
import '@/assets/lq_style.less';
import { isEmpty } from '@/utils/CommonUtils';
import { isEmpty, trim } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority';
const { Option } = Select;
@ -200,6 +200,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
}
values.regionDictName = regionDictName;
values.projectName = trim(values.projectName);
!isIPassDecode && (values['isIPassDecode'] = '1');
updateUtils(values);
//tab标段页解除禁用

3
src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod5.tsx
View File

@ -7,7 +7,7 @@ import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
import { getDicData } from '@/utils/session';
import '@/assets/lq_style.less';
import { isEmpty } from '@/utils/CommonUtils';
import { isEmpty, trim } from '@/utils/CommonUtils';
import { btnAuthority } from '@/utils/authority';
const { Option } = Select;
@ -204,6 +204,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
}
values.regionDictName = regionDictName;
values.projectName = trim(values.projectName);
!isIPassDecode && (values['isIPassDecode'] = '1');
updateUtils(values);
//tab标段页解除禁用

3
src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod6.tsx
View File

@ -5,7 +5,7 @@ import React, { useEffect, useState } from 'react';
import { Form, Input, Button, Select, Radio, Col, Row, Modal } from 'antd';
import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
import { isEmpty } from '@/utils/CommonUtils';
import { isEmpty, trim } from '@/utils/CommonUtils';
import { getDicData } from '@/utils/session';
import '@/assets/lq_style.less';
import { btnAuthority } from '@/utils/authority';
@ -203,6 +203,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
}
values.regionDictName = regionDictName;
values.projectName = trim(values.projectName);
!isIPassDecode && (values['isIPassDecode'] = '1');
updateUtils(values);
//tab标段页解除禁用

3
src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod9.tsx
View File

@ -5,7 +5,7 @@
import { Form, Input, Button, Select, Radio, Col, Row, Modal } from 'antd';
import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
import { isEmpty } from '@/utils/CommonUtils';
import { isEmpty, trim } from '@/utils/CommonUtils';
import { getDicData } from '@/utils/session';
import '@/assets/lq_style.less';
import { btnAuthority } from '@/utils/authority';
@ -203,6 +203,7 @@ import { btnAuthority } from '@/utils/authority';
values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
}
values.regionDictName = regionDictName;
values.projectName = trim(values.projectName);
!isIPassDecode && (values['isIPassDecode'] = '1');
updateUtils(values);
//tab标段页解除禁用